Skip to content

Commit bbac38b

Browse files
committed
Support Glam 0.25 type conversion
1 parent 0b89950 commit bbac38b

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
2222
- Add the methods `Matrix1::as_scalar`, `::as_scalar_mut`, `::to_scalar`, `::into_scalar`.
2323
- Add `Rotation3::euler_angles_ordered`, a generalized euler angles calculation.
2424
- Add the `glam-0.24` feature to enable conversion from/to types from `glam` v0.24.
25+
- Add the `glam-0.25` feature to enable conversion from/to types from `glam` v0.25.
2526
- Add the `lerp` method to points.
2627
- Implement `Clone` for `MatrixIter`.
2728

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ convert-glam021 = [ "glam021" ]
4848
convert-glam022 = [ "glam022" ]
4949
convert-glam023 = [ "glam023" ]
5050
convert-glam024 = [ "glam024" ]
51+
convert-glam025 = [ "glam025" ]
5152

5253
# Serialization
5354
## To use serde in a #[no-std] environment, enable the
@@ -103,6 +104,7 @@ glam021 = { package = "glam", version = "0.21", optional = true }
103104
glam022 = { package = "glam", version = "0.22", optional = true }
104105
glam023 = { package = "glam", version = "0.23", optional = true }
105106
glam024 = { package = "glam", version = "0.24", optional = true }
107+
glam025 = { package = "glam", version = "0.25", optional = true }
106108
rayon = { version = "1.6", optional = true }
107109

108110
[dev-dependencies]

src/third_party/glam/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ mod v022;
2020
mod v023;
2121
#[cfg(feature = "glam024")]
2222
mod v024;
23+
#[cfg(feature = "glam025")]
24+
mod v025;

src/third_party/glam/v025/mod.rs

+18
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 glam025 as glam;

0 commit comments

Comments
 (0)