Skip to content

[Merged by Bors] - Correctly use as_hsla_f32 in Add<Color> and AddAssign<Color>, fixes #5543#5546

Closed
vertesians wants to merge 2 commits intobevyengine:mainfrom
vertesians:fix-color-add
Closed

[Merged by Bors] - Correctly use as_hsla_f32 in Add<Color> and AddAssign<Color>, fixes #5543#5546
vertesians wants to merge 2 commits intobevyengine:mainfrom
vertesians:fix-color-add

Conversation

@vertesians
Copy link
Contributor

Probably a copy-paste error, but Add<Color> and AddAssign<Color> should use rhs.as_hlsa_f32() instead of rhs.as_linear_rgba_f32() when the LHS is a Color::Hsla. Fixes #5543.

@alice-i-cecile alice-i-cecile added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen labels Aug 2, 2022
@alice-i-cecile alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Aug 2, 2022
@cart
Copy link
Member

cart commented Aug 5, 2022

bors r+

@alice-i-cecile
Copy link
Member

@mockersf, bors appears to be stuck.

@alice-i-cecile
Copy link
Member

bors r+

@cart
Copy link
Member

cart commented Aug 8, 2022

bors r-

@cart
Copy link
Member

cart commented Aug 8, 2022

Looks like this is stalled out because of the following bors error message:

  {:error, :create_commit,
   "{\"message\":\"Validation Failed\",\"errors\":[{\"resource\":\"author\",\"code\":\"missing_field\",\"field\":\"email\"}],\"documentation_url\":\"https://docs.github.com/rest/reference/git#create-a-commit\"}",

@cart
Copy link
Member

cart commented Aug 8, 2022

Note that the commit doesn't link to the author's github account / you can't click on the author like you normally could.
@vertesians: make sure you've configured git to link to your github account: https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address#setting-your-commit-email-address-in-git.

@cart
Copy link
Member

cart commented Aug 8, 2022

@vertesians try setting the author of this commit using the instructions here: https://www.git-tower.com/learn/git/faq/change-author-name-email.
Then force push to this branch.

@cart
Copy link
Member

cart commented Aug 16, 2022

bors r+

@cart
Copy link
Member

cart commented Aug 16, 2022

bors r-

@cart
Copy link
Member

cart commented Aug 16, 2022

I was hoping now that the commit has my authorship attached to it that it would stop failing. Sadly that did not play out.

@vertesians
Copy link
Contributor Author

Really really sorry for the trouble — I didn't even think that it could be an issue. :(

Hopefully it'll work now.

@mockersf
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Aug 17, 2022
…5543 (#5546)

Probably a copy-paste error, but `Add<Color>` and `AddAssign<Color>` should use `rhs.as_hlsa_f32()` instead of `rhs.as_linear_rgba_f32()` when the LHS is a `Color::Hsla`. Fixes #5543.



Co-authored-by: Verte <105466627+vertesians@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Aug 17, 2022

@bors bors bot changed the title Correctly use as_hsla_f32 in Add<Color> and AddAssign<Color>, fixes #5543 [Merged by Bors] - Correctly use as_hsla_f32 in Add<Color> and AddAssign<Color>, fixes #5543 Aug 17, 2022
@bors bors bot closed this Aug 17, 2022
inodentry pushed a commit to BroovyJammy/bevy that referenced this pull request Aug 19, 2022
…evyengine#5543 (bevyengine#5546)

Probably a copy-paste error, but `Add<Color>` and `AddAssign<Color>` should use `rhs.as_hlsa_f32()` instead of `rhs.as_linear_rgba_f32()` when the LHS is a `Color::Hsla`. Fixes bevyengine#5543.



Co-authored-by: Verte <105466627+vertesians@users.noreply.github.com>
maccesch pushed a commit to Synphonyte/bevy that referenced this pull request Sep 28, 2022
…evyengine#5543 (bevyengine#5546)

Probably a copy-paste error, but `Add<Color>` and `AddAssign<Color>` should use `rhs.as_hlsa_f32()` instead of `rhs.as_linear_rgba_f32()` when the LHS is a `Color::Hsla`. Fixes bevyengine#5543.



Co-authored-by: Verte <105466627+vertesians@users.noreply.github.com>
james7132 pushed a commit to james7132/bevy that referenced this pull request Oct 28, 2022
…evyengine#5543 (bevyengine#5546)

Probably a copy-paste error, but `Add<Color>` and `AddAssign<Color>` should use `rhs.as_hlsa_f32()` instead of `rhs.as_linear_rgba_f32()` when the LHS is a `Color::Hsla`. Fixes bevyengine#5543.



Co-authored-by: Verte <105466627+vertesians@users.noreply.github.com>
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
…evyengine#5543 (bevyengine#5546)

Probably a copy-paste error, but `Add<Color>` and `AddAssign<Color>` should use `rhs.as_hlsa_f32()` instead of `rhs.as_linear_rgba_f32()` when the LHS is a `Color::Hsla`. Fixes bevyengine#5543.



Co-authored-by: Verte <105466627+vertesians@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Color's Add and AddAssign impls add RGBA values to HSLA

5 participants