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

Merge pull request #1175 from devil-ira/glam-0.22 

Support conversion for glam 0.22
This commit is contained in:
Sébastien Crozet 2022-11-05 11:25:37 +01:00 committed by GitHub
parent 30ed929c5c 8601c655de
commit 6ded8db479
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

@ -45,6 +45,7 @@ convert-glam018 = [ "glam018" ]
convert-glam019 = [ "glam019" ] convert-glam019 = [ "glam019" ]
convert-glam020 = [ "glam020" ] convert-glam020 = [ "glam020" ]
convert-glam021 = [ "glam021" ] convert-glam021 = [ "glam021" ]
convert-glam022 = [ "glam022" ]
# Serialization # Serialization
## To use serde in a #[no-std] environment, enable the ## To use serde in a #[no-std] environment, enable the
@ -98,6 +99,7 @@ glam018 = { package = "glam", version = "0.18", optional = true }
glam019 = { package = "glam", version = "0.19", optional = true } glam019 = { package = "glam", version = "0.19", optional = true }
glam020 = { package = "glam", version = "0.20", optional = true } 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 }
cust_core = { version = "0.1", optional = true } cust_core = { version = "0.1", optional = true }

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

@ -14,3 +14,5 @@ mod v019;
mod v020; mod v020;
#[cfg(feature = "glam021")] #[cfg(feature = "glam021")]
mod v021; mod v021;
#[cfg(feature = "glam022")]
mod v022;

18
src/third_party/glam/v022/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 glam022 as glam;