M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1242 from Dig-Doug/glam-024 

Adds support for glam 0.24
This commit is contained in:
Sébastien Crozet 2023-06-18 12:37:25 +02:00 committed by GitHub
parent 1a271ac541 06782da13e
commit 5baf86b311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -48,6 +48,7 @@ convert-glam020 = [ "glam020" ]
convert-glam021 = [ "glam021" ] convert-glam021 = [ "glam021" ]
convert-glam022 = [ "glam022" ] convert-glam022 = [ "glam022" ]
convert-glam023 = [ "glam023" ] convert-glam023 = [ "glam023" ]
convert-glam024 = [ "glam024" ]
# Serialization # Serialization
## To use serde in a #[no-std] environment, enable the ## To use serde in a #[no-std] environment, enable the
@ -103,6 +104,7 @@ glam020 = { package = "glam", version = "0.20", optional = true }
glam021 = { package = "glam", version = "0.21", optional = true } glam021 = { package = "glam", version = "0.21", optional = true }
glam022 = { package = "glam", version = "0.22", optional = true } glam022 = { package = "glam", version = "0.22", optional = true }
glam023 = { package = "glam", version = "0.23", 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 } cust_core = { version = "0.1", optional = true }
rayon = { version = "1.6", optional = true } rayon = { version = "1.6", optional = true }

2
src/third_party/glam/mod.rs vendored
View File

@ -18,3 +18,5 @@ mod v021;
mod v022; mod v022;
#[cfg(feature = "glam023")] #[cfg(feature = "glam023")]
mod v023; mod v023;
#[cfg(feature = "glam024")]
mod v024;

18
src/third_party/glam/v024/mod.rs vendored Normal file
View File

@ -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;