Minor improvements & fixes to Shuttle Console UI #31623
Open
+104
−91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove lots of sketchy transforms-of-transforms, which should have been as single matrix multiply. Assign proper names to matrices. Remove some redundant calculations.
github-actions
bot
added
Status: Needs Review
github-actions
bot
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Comment on lines
298
to
+300
| public void Execute(int index) | ||
| { | ||
| var vert = Vertices[index]; | ||
| var adjustedVert = Vector2.Transform(vert, Matrix); | ||
| adjustedVert = adjustedVert with { Y = -adjustedVert.Y }; | ||
|
|
||
| var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint); | ||
| ScaledVertices[index] = scaledVert; | ||
| ScaledVertices[index] = Vector2.Transform(Vertices[index], Matrix); |
There was a problem hiding this comment.
You'll probably want to bump the batch size to like 64 with reduced stuff happening.
github-actions
bot
removed
the
Merge Conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Fixes a couple of bugs in the shuttle console:
Added a minor usability improvement - when operating the shuttle from a remote location, draws the location of the controlling console. Helps players in cargo to locate where they should be attempting to dock to.
Tidied up the math - code was previously doing a bunch of redundant, inefficient calculations. To help future readers of this code, I gave useful names to variables, instead of names like "matty."
Why / Balance
Technical details
For the inconsistent culling, code was previously just using an AABB overlap test, but didn't account for relative rotation between the shuttle and the other grid/docks.
For the optimizations, the code was transforming geometry twice, once via a Vector2.Transform(), then a hacky "flip y coordinate, scale, and transform" by hand. This can all be done with a single Transform(). Also removed some sqrt() calls.
Media
New cyan dot to show the location of your controlling console:
Grids disappearing/appearing prematurely (this behaviour is fixed, and no longer occurs):
https://github.com/user-attachments/assets/4e7511b9-ee45-463a-919c-4a4225b03195
Docks disappearing/appearing prematurely (this behavriour is fixed and no longer occurs):
https://github.com/user-attachments/assets/772ede5d-b3fb-4753-9afd-0e6cc7456ddd
Undock buttons inconsistently disabled, depending on what order the docs were disconnected (also fixed, you can now always undock):
https://github.com/user-attachments/assets/f3a9de2d-0241-4506-a1d1-3e6bebc2d6aa
Requirements
Breaking changes
BaseShuttleControl.DrawGrid() now takes a transform which directly converts from grid space into view space.
Changelog