-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Race background colors implementation #21
Open
SlightPersimmon1
wants to merge
3
commits into
rayfowler:master
Choose a base branch
from
SlightPersimmon1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
Comment on lines
+700
to
+724
private Color blendColor( Color c1, Color c2, float ratio ) { | ||
if ( ratio > 1f ) ratio = 1f; | ||
else if ( ratio < 0f ) ratio = 0f; | ||
float iRatio = 1.0f - ratio; | ||
|
||
int i1 = c1.getRGB(); | ||
int i2 = c2.getRGB(); | ||
|
||
int a1 = (i1 >> 24 & 0xff); | ||
int r1 = ((i1 & 0xff0000) >> 16); | ||
int g1 = ((i1 & 0xff00) >> 8); | ||
int b1 = (i1 & 0xff); | ||
|
||
int a2 = (i2 >> 24 & 0xff); | ||
int r2 = ((i2 & 0xff0000) >> 16); | ||
int g2 = ((i2 & 0xff00) >> 8); | ||
int b2 = (i2 & 0xff); | ||
|
||
int a = (int)((a1 * iRatio) + (a2 * ratio)); | ||
int r = (int)((r1 * iRatio) + (r2 * ratio)); | ||
int g = (int)((g1 * iRatio) + (g2 * ratio)); | ||
int b = (int)((b1 * iRatio) + (b2 * ratio)); | ||
|
||
return new Color( a << 24 | r << 16 | g << 8 | b ); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course, if the "blending" option is used, this method really should not be here
This reverts commit 12b98bb.
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.
I included two solutions: one is simply darkening and brightening the race color to form the gradient. The other is to blend the race color with the gradient that was already there (with some color adjustments).