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.

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

Support conversion for glam 0.27 #1390

Merged
merged 1 commit into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).

## Unreleased

### Added

- Add the `glam-0.27` feature to enable conversion from/to types from `glam` v0.27.

### Removed

- The `cuda` feature has been removed, as the toolchain it depends on
Expand Down
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ convert-glam022 = [ "glam022" ]
convert-glam023 = [ "glam023" ]
convert-glam024 = [ "glam024" ]
convert-glam025 = [ "glam025" ]
convert-glam027 = [ "glam027" ]

# Serialization
## To use serde in a #[no-std] environment, enable the
Expand Down Expand Up @@ -105,6 +106,7 @@ glam022 = { package = "glam", version = "0.22", optional = true }
glam023 = { package = "glam", version = "0.23", optional = true }
glam024 = { package = "glam", version = "0.24", optional = true }
glam025 = { package = "glam", version = "0.25", optional = true }
glam027 = { package = "glam", version = "0.27", optional = true }
rayon = { version = "1.6", optional = true }

[dev-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions src/third_party/glam/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ mod v023;
mod v024;
#[cfg(feature = "glam025")]
mod v025;
#[cfg(feature = "glam027")]
mod v027;
18 changes: 18 additions & 0 deletions src/third_party/glam/v027/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#[path = "../common/glam_isometry.rs"]
mod glam_isometry;
#[path = "../common/glam_matrix.rs"]
mod glam_matrix;
#[path = "../common/glam_point.rs"]
mod glam_point;
#[path = "../common/glam_quaternion.rs"]
mod glam_quaternion;
#[path = "../common/glam_rotation.rs"]
mod glam_rotation;
#[path = "../common/glam_similarity.rs"]
mod glam_similarity;
#[path = "../common/glam_translation.rs"]
mod glam_translation;
#[path = "../common/glam_unit_complex.rs"]
mod glam_unit_complex;

pub(self) use glam027 as glam;
Loading