Update glam 0.22, hexasphere 8.0, encase 0.4 (bevyengine#6427)

# Objective - Update glam to 0.22, hexasphere to 8.0, encase to 0.4 ## Solution - Update glam to 0.22, hexasphere to 8.0, encase to 0.4 - ~~waiting on teoxoy/encase#17 and OptimisticPeach/hexasphere#13
ItsDoot · Feb 1, 2023 · 44929b4 · 44929b4
1 parent 6164b9e
commit 44929b4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 license = "MIT OR Apache-2.0"
 
 [dev-dependencies]
-glam = "0.21"
+glam = "0.22"
 rand = "0.8"
 rand_chacha = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }

diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml
@@ -13,4 +13,4 @@ proc-macro = true
 
 [dependencies]
 bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.9.0-dev" }
-encase_derive_impl = "0.3.0"
+encase_derive_impl = "0.4.0"
diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
 [dependencies]
-glam = { version = "0.21", features = ["bytemuck"] }
+glam = { version = "0.22", features = ["bytemuck"] }
 serde = { version = "1", features = ["derive"], optional = true }
 
 [features]

diff --git a/crates/bevy_mikktspace/Cargo.toml b/crates/bevy_mikktspace/Cargo.toml
@@ -11,7 +11,7 @@ license = "Zlib AND (MIT OR Apache-2.0)"
 keywords = ["bevy", "3D", "graphics", "algorithm", "tangent"]
 
 [dependencies]
-glam = "0.21"
+glam = "0.22"
 
 [[example]]
 name = "generate"
diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
@@ -31,7 +31,7 @@ thiserror = "1.0"
 once_cell = "1.11"
 serde = "1"
 smallvec = { version = "1.6", features = ["serde", "union", "const_generics"], optional = true }
-glam = { version = "0.21", features = ["serde"], optional = true }
+glam = { version = "0.22", features = ["serde"], optional = true }
 
 [dev-dependencies]
 ron = "0.8.0"

diff --git a/crates/bevy_reflect/src/impls/glam.rs b/crates/bevy_reflect/src/impls/glam.rs
@@ -237,11 +237,5 @@ impl_from_reflect_value!(Quat);
 impl_from_reflect_value!(DQuat);
 
 impl_reflect_value!(EulerRot(Debug, Default));
-
-// glam type aliases these to the non simd versions when there is no support (this breaks wasm builds for example)
-// ideally it shouldn't do that and there's an issue on glam for this
-// https://github.com/bitshifter/glam-rs/issues/306
-#[cfg(any(target_feature = "sse2", target_feature = "simd128"))]
-impl_reflect_value!(BVec3A(Debug, PartialEq, Default));
-#[cfg(any(target_feature = "sse2", target_feature = "simd128"))]
-impl_reflect_value!(BVec4A(Debug, PartialEq, Default));
+impl_reflect_value!(BVec3A(Debug, Default));
+impl_reflect_value!(BVec4A(Debug, Default));
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
@@ -62,7 +62,7 @@ thiserror = "1.0"
 futures-lite = "1.4.0"
 anyhow = "1.0"
 hex = "0.4.2"
-hexasphere = "7.2"
+hexasphere = "8.0"
 parking_lot = "0.12.1"
 regex = "1.5"
 ddsfile = { version = "0.5.0", optional = true }
@@ -72,6 +72,6 @@ flate2 = { version = "1.0.22", optional = true }
 ruzstd = { version = "0.2.4", optional = true }
 # For transcoding of UASTC/ETC1S universal formats, and for .basis file support
 basis-universal = { version = "0.2.0", optional = true }
-encase = { version = "0.3", features = ["glam"] }
+encase = { version = "0.4", features = ["glam"] }
 # For wgpu profiling using tracing. Use `RUST_LOG=info` to also capture the wgpu spans.
 profiling = { version = "1", features = ["profile-with-tracing"], optional = true }