Skip to content

Commit

Permalink
Merge pull request #1175 from devil-ira/glam-0.22
Browse files Browse the repository at this point in the history
Support conversion for glam 0.22
  • Loading branch information
sebcrozet authored Nov 5, 2022
2 parents 30ed929 + 8601c65 commit 6ded8db
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ convert-glam018 = [ "glam018" ]
convert-glam019 = [ "glam019" ]
convert-glam020 = [ "glam020" ]
convert-glam021 = [ "glam021" ]
convert-glam022 = [ "glam022" ]

# Serialization
## To use serde in a #[no-std] environment, enable the
Expand Down Expand Up @@ -98,6 +99,7 @@ glam018 = { package = "glam", version = "0.18", optional = true }
glam019 = { package = "glam", version = "0.19", optional = true }
glam020 = { package = "glam", version = "0.20", optional = true }
glam021 = { package = "glam", version = "0.21", optional = true }
glam022 = { package = "glam", version = "0.22", optional = true }
cust_core = { version = "0.1", optional = true }


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 @@ -14,3 +14,5 @@ mod v019;
mod v020;
#[cfg(feature = "glam021")]
mod v021;
#[cfg(feature = "glam022")]
mod v022;
18 changes: 18 additions & 0 deletions src/third_party/glam/v022/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 glam022 as glam;

0 comments on commit 6ded8db

Please sign in to comment.