Apply draw colour to segmented graph #22285
Merged
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
EVAST9919
reviewed
Jan 18, 2023
Comment on lines
159
to
170
| private ColourInfo getSegmentColour(SegmentInfo segment) | ||
| { | ||
| var tierColour = segment.Tier >= 0 ? tierColours[segment.Tier] : new Colour4(0, 0, 0, 0); | ||
| var ourColour = DrawColourInfo.Colour; | ||
|
|
||
| return new ColourInfo | ||
| { | ||
| TopLeft = tierColour * Interpolation.ValueAt<Colour4>(segment.Start, ourColour.TopLeft, ourColour.TopRight, 0, 1), | ||
| TopRight = tierColour * Interpolation.ValueAt<Colour4>(segment.End, ourColour.TopLeft, ourColour.TopRight, 0, 1), | ||
| BottomLeft = tierColour * Interpolation.ValueAt<Colour4>(segment.Start, ourColour.BottomLeft, ourColour.BottomRight, 0, 1), | ||
| BottomRight = tierColour * Interpolation.ValueAt<Colour4>(segment.End, ourColour.BottomLeft, ourColour.BottomRight, 0, 1) | ||
| }; |
There was a problem hiding this comment.
Similar function (getting a colour quad out of source colour) exists in TrianglesV2, probably would be useful to create one in the framework level
There was a problem hiding this comment.
Sure. I'm looking to get this out the door for a release tomorrow for now though.
There was a problem hiding this comment.
Here's a simplified version
Suggested change
| private ColourInfo getSegmentColour(SegmentInfo segment) | |
| { | |
| var tierColour = segment.Tier >= 0 ? tierColours[segment.Tier] : new Colour4(0, 0, 0, 0); | |
| var ourColour = DrawColourInfo.Colour; | |
| return new ColourInfo | |
| { | |
| TopLeft = tierColour * Interpolation.ValueAt<Colour4>(segment.Start, ourColour.TopLeft, ourColour.TopRight, 0, 1), | |
| TopRight = tierColour * Interpolation.ValueAt<Colour4>(segment.End, ourColour.TopLeft, ourColour.TopRight, 0, 1), | |
| BottomLeft = tierColour * Interpolation.ValueAt<Colour4>(segment.Start, ourColour.BottomLeft, ourColour.BottomRight, 0, 1), | |
| BottomRight = tierColour * Interpolation.ValueAt<Colour4>(segment.End, ourColour.BottomLeft, ourColour.BottomRight, 0, 1) | |
| }; | |
| private ColourInfo getSegmentColour(SegmentInfo segment) | |
| { | |
| var subQuad = new ColourInfo | |
| { | |
| TopLeft = DrawColourInfo.Colour.Interpolate(new Vector2(segment.Start, 0f)), | |
| TopRight = DrawColourInfo.Colour.Interpolate(new Vector2(segment.End, 0f)), | |
| BottomLeft = DrawColourInfo.Colour.Interpolate(new Vector2(segment.Start, 1f)), | |
| BottomRight = DrawColourInfo.Colour.Interpolate(new Vector2(segment.End, 1f)) | |
| }; | |
| subQuad.ApplyChild(segment.Tier >= 0 ? tierColours[segment.Tier] : new Colour4(0, 0, 0, 0)); | |
| return subQuad; | |
| } |
There was a problem hiding this comment.
Applied with minor variations, thanks.
peppy
approved these changes
Jan 19, 2023
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.
This fixes the issue mentioned in #22144 (review), wherein the new argon song progress bar would not hide along with the rest of the HUD.
The segmented graph entirely ignored
DrawColourInfo, which meant that the drawable's draw colour did not change how it was drawn at all. In particular, this meant that if the graph was hidden at a higher level, therefore having a transparent draw colour - which is the case with gameplay HUD - it would still continue to draw the exact same way regardless.The fix is rather self-explanatory and easy. I even made it fully support gradiented colours because I could:
2023-01-18.23-09-50.mp4