Skip to content

Commit 4563e69

Browse files
committed
Update glam (0.15.1) and hexasphere (3.4) (#2199)
This is a version of #2195 which addresses the `glam` breaking changes. Also update hexasphere to ensure versions of `glam` are matching
1 parent 2fcac67 commit 4563e69

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

crates/bevy_gltf/src/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ async fn load_gltf<'a, 'b>(
214214
scale,
215215
} => Transform {
216216
translation: bevy_math::Vec3::from(translation),
217-
rotation: bevy_math::Quat::from(rotation),
217+
rotation: bevy_math::Quat::from_vec4(rotation.into()),
218218
scale: bevy_math::Vec3::from(scale),
219219
},
220220
},

crates/bevy_math/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ license = "MIT"
1313
keywords = ["bevy"]
1414

1515
[dependencies]
16-
glam = { version = "0.14.0", features = ["serde", "bytemuck"] }
16+
glam = { version = "0.15.1", features = ["serde", "bytemuck"] }
1717
bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = ["bevy"] }

crates/bevy_reflect/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parking_lot = "0.11.0"
2828
thiserror = "1.0"
2929
serde = "1"
3030
smallvec = { version = "1.6", features = ["serde", "union", "const_generics"], optional = true }
31-
glam = { version = "0.14.0", features = ["serde"], optional = true }
31+
glam = { version = "0.15.1", features = ["serde"], optional = true }
3232

3333
[dev-dependencies]
3434
ron = "0.6.2"

crates/bevy_render/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ downcast-rs = "1.2.0"
3737
thiserror = "1.0"
3838
anyhow = "1.0"
3939
hex = "0.4.2"
40-
hexasphere = "3.3"
40+
hexasphere = "3.4"
4141
parking_lot = "0.11.0"
4242

4343
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

crates/bevy_transform/src/components/global_transform.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl GlobalTransform {
207207
let forward = Vec3::normalize(self.translation - target);
208208
let right = up.cross(forward).normalize();
209209
let up = forward.cross(right);
210-
self.rotation = Quat::from_rotation_mat3(&Mat3::from_cols(right, up, forward));
210+
self.rotation = Quat::from_mat3(&Mat3::from_cols(right, up, forward));
211211
}
212212
}
213213

crates/bevy_transform/src/components/transform.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ impl Transform {
221221
let forward = Vec3::normalize(self.translation - target);
222222
let right = up.cross(forward).normalize();
223223
let up = forward.cross(right);
224-
self.rotation = Quat::from_rotation_mat3(&Mat3::from_cols(right, up, forward));
224+
self.rotation = Quat::from_mat3(&Mat3::from_cols(right, up, forward));
225225
}
226226
}
227227

0 commit comments

Comments
 (0)