Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update glam, encase and hexasphere #11082

Merged
merged 7 commits into from
Jan 8, 2024
Merged

Update glam, encase and hexasphere #11082

merged 7 commits into from
Jan 8, 2024

Conversation

tim-blackbird
Copy link
Contributor

@tim-blackbird tim-blackbird commented Dec 24, 2023 •
edited
Loading

Update to glam 0.25, encase 0.7 and hexasphere to 10.0

Changelog

Added the FloatExt trait to the bevy_math prelude which adds lerp, inverse_lerp and remap methods to the f32 and f64 types.

@alice-i-cecile alice-i-cecile added C-Dependencies A change to the crates that Bevy depends on A-Math Fundamental domain-agnostic mathematical operations labels Dec 24, 2023
@MarijnS95 MarijnS95 mentioned this pull request Dec 25, 2023
Open
atlv24
atlv24 approved these changes Dec 29, 2023
View reviewed changes
Copy link
Contributor

@atlv24 atlv24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's also a lerp in bevy_animation/src/lib.rs::728

.map(|(a, b)| *a + lerp * (*b - *a));

could be

.map(|(a, b)| a.lerp(b, lerp));

@tim-blackbird tim-blackbird changed the title Update glam to 0.25 Update glam to 0.25 and encase to 0.7 Jan 5, 2024
hymm
hymm approved these changes Jan 7, 2024
View reviewed changes
Copy link
Contributor

@hymm hymm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs the merge conflicts to fixed.

@hymm hymm 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 Jan 7, 2024
laundmo
laundmo approved these changes Jan 7, 2024
View reviewed changes
Copy link
Contributor

@laundmo laundmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only replacing manual lerp formulas with calls to the FloatExt trait, and all of them look good.

@tim-blackbird
Copy link
Contributor Author

Fixed the merged conflict.
Check the latest commit for one more switch to the lerp method and an inverse_lerp I noticed.
I checked that the animated_fox example still behaves as it did.

@mockersf
Copy link
Member

mockersf commented Jan 7, 2024

https://github.com/OptimisticPeach/hexasphere dependency on glam need to be updated first

@mockersf mockersf added the S-Blocked This cannot move forward until something else changes label Jan 7, 2024
@tim-blackbird
Copy link
Contributor Author

OptimisticPeach/hexasphere#18

@tim-blackbird tim-blackbird changed the title Update glam to 0.25 and encase to 0.7 Update glam, encase and hexasphere Jan 8, 2024
@tim-blackbird
Copy link
Contributor Author

@mockersf, hexasphere has been updated

@alice-i-cecile alice-i-cecile removed the S-Blocked This cannot move forward until something else changes label Jan 8, 2024
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Jan 8, 2024
Merged via the queue into bevyengine:main with commit ec14e94 Jan 8, 2024
26 checks passed
@tim-blackbird tim-blackbird deleted the update-glam branch January 9, 2024 13:52
@rparrett rparrett mentioned this pull request Feb 17, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Feb 17, 2024
@rparrett
Fix duplicate encase_derive_impl dependency (#11915)
e6e25de 
# Objective

Another PR failed CI due to duplicate deps, and I noticed this one in
particular while scanning through the error messages.

I think this was missed in #11082.

## Solution

Bump `encase_derive_impl` dep in `bevy_encase_derive` to same version as
`encase` dep for `bevy_render`.

I spot-checked a few examples, and glanced at the
[changelog](<https://github.com/teoxoy/encase/blob/main/CHANGELOG.md#v070-2024-01-02>)
and I don't think there's anything to be concerned about, but I barely
know what this thing does.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laundmo laundmo laundmo approved these changes

@atlv24 atlv24 atlv24 approved these changes

@hymm hymm hymm approved these changes

Assignees
No one assigned
Labels
A-Math Fundamental domain-agnostic mathematical operations C-Dependencies A change to the crates that Bevy depends on 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tim-blackbird @mockersf @hymm @atlv24 @laundmo @alice-i-cecile