Skip to content

Commit

Permalink
Merge pull request #1242 from Dig-Doug/glam-024
Browse files Browse the repository at this point in the history
Adds support for glam 0.24
  • Loading branch information
sebcrozet committed Jun 18, 2023
2 parents 1a271ac + 06782da commit 5baf86b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Expand Up @@ -48,6 +48,7 @@ convert-glam020 = [ "glam020" ]
convert-glam021 = [ "glam021" ]
convert-glam022 = [ "glam022" ]
convert-glam023 = [ "glam023" ]
convert-glam024 = [ "glam024" ]

# Serialization
## To use serde in a #[no-std] environment, enable the
Expand Down Expand Up @@ -103,6 +104,7 @@ glam020 = { package = "glam", version = "0.20", optional = true }
glam021 = { package = "glam", version = "0.21", optional = true }
glam022 = { package = "glam", version = "0.22", optional = true }
glam023 = { package = "glam", version = "0.23", optional = true }
glam024 = { package = "glam", version = "0.24", optional = true }
cust_core = { version = "0.1", optional = true }
rayon = { version = "1.6", optional = true }

Expand Down
2 changes: 2 additions & 0 deletions src/third_party/glam/mod.rs
Expand Up @@ -18,3 +18,5 @@ mod v021;
mod v022;
#[cfg(feature = "glam023")]
mod v023;
#[cfg(feature = "glam024")]
mod v024;
18 changes: 18 additions & 0 deletions src/third_party/glam/v024/mod.rs
@@ -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 glam024 as glam;

0 comments on commit 5baf86b

Please sign in to comment.