Skip to content

Commit 0085044

Browse files
authored
feat: add conversion from/to glam 0.31and 0.32 (#1597)
1 parent 4478a99 commit 0085044

4 files changed

Lines changed: 48 additions & 0 deletions

File tree

Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ std = [
4747
"glam028?/std",
4848
"glam029?/std",
4949
"glam030?/std",
50+
"glam031?/std",
51+
"glam032?/std",
5052
]
5153
sparse = []
5254
debug = ["approx/num-complex", "rand"]
@@ -71,6 +73,8 @@ libm = [
7173
"glam028?/libm",
7274
"glam029?/libm",
7375
"glam030?/libm",
76+
"glam031?/libm",
77+
"glam032?/libm",
7478
]
7579
libm-force = ["simba/libm_force"]
7680
macros = ["nalgebra-macros"]
@@ -94,6 +98,8 @@ convert-glam027 = ["glam027"]
9498
convert-glam028 = ["glam028"]
9599
convert-glam029 = ["glam029"]
96100
convert-glam030 = ["glam030"]
101+
convert-glam031 = ["glam031"]
102+
convert-glam032 = ["glam032"]
97103

98104
# Serialization
99105
## To use serde in a #[no-std] environment, enable the
@@ -155,6 +161,8 @@ glam027 = { package = "glam", version = "0.27", optional = true, default-feature
155161
glam028 = { package = "glam", version = "0.28", optional = true, default-features = false }
156162
glam029 = { package = "glam", version = "0.29", optional = true, default-features = false }
157163
glam030 = { package = "glam", version = "0.30", optional = true, default-features = false }
164+
glam031 = { package = "glam", version = "0.31", optional = true, default-features = false }
165+
glam032 = { package = "glam", version = "0.32", optional = true, default-features = false }
158166
rayon = { version = "1.6", optional = true }
159167
defmt = { version = "1.0.1", optional = true }
160168
encase = { version = "0.12", optional = true }

src/third_party/glam/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ mod v028;
3030
mod v029;
3131
#[cfg(feature = "glam030")]
3232
mod v030;
33+
#[cfg(feature = "glam031")]
34+
mod v031;
35+
#[cfg(feature = "glam032")]
36+
mod v032;

src/third_party/glam/v031/mod.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#[path = "../common/glam_isometry.rs"]
2+
mod glam_isometry;
3+
#[path = "../common/glam_matrix.rs"]
4+
mod glam_matrix;
5+
#[path = "../common/glam_point.rs"]
6+
mod glam_point;
7+
#[path = "../common/glam_quaternion.rs"]
8+
mod glam_quaternion;
9+
#[path = "../common/glam_rotation.rs"]
10+
mod glam_rotation;
11+
#[path = "../common/glam_similarity.rs"]
12+
mod glam_similarity;
13+
#[path = "../common/glam_translation.rs"]
14+
mod glam_translation;
15+
#[path = "../common/glam_unit_complex.rs"]
16+
mod glam_unit_complex;
17+
18+
pub(self) use glam031 as glam;

src/third_party/glam/v032/mod.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#[path = "../common/glam_isometry.rs"]
2+
mod glam_isometry;
3+
#[path = "../common/glam_matrix.rs"]
4+
mod glam_matrix;
5+
#[path = "../common/glam_point.rs"]
6+
mod glam_point;
7+
#[path = "../common/glam_quaternion.rs"]
8+
mod glam_quaternion;
9+
#[path = "../common/glam_rotation.rs"]
10+
mod glam_rotation;
11+
#[path = "../common/glam_similarity.rs"]
12+
mod glam_similarity;
13+
#[path = "../common/glam_translation.rs"]
14+
mod glam_translation;
15+
#[path = "../common/glam_unit_complex.rs"]
16+
mod glam_unit_complex;
17+
18+
pub(self) use glam032 as glam;

0 commit comments

Comments
 (0)