Updated glam dependency to 0.25

urholaukkarinen · Feb 1, 2024 · bcc8378 · bcc8378
1 parent d09ddbc
commit bcc8378
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ members = ["demo"]
 
 [dependencies]
 egui = "0.25.0"
-glam = { version = "0.24", features = ["mint"] }
+glam = { version = "0.25.0", features = ["mint"] }
 mint = "0.5"
 
 [profile.release]

diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -13,6 +13,10 @@ egui-gizmo = { path = ".." }
 [dependencies.bevy]
 version = "0.12.1"
 
+[dependencies.bevy_math]
+version = "0.12.1"
+features = ["mint"]
+
 [dependencies.bevy_egui]
 git = "https://github.com/urholaukkarinen/bevy_egui.git"
 rev="bc3dd1559e24ca0178ed1d2dfef07cb784437505"

diff --git a/src/lib.rs b/src/lib.rs
@@ -188,7 +188,7 @@ impl Gizmo {
 
         if let Some((_, result)) = active_subgizmo.zip(result) {
             self.config.translation = Vec3::from(result.translation).as_dvec3();
-            self.config.rotation = Quat::from(result.rotation).as_f64();
+            self.config.rotation = Quat::from(result.rotation).as_dquat();
             self.config.scale = Vec3::from(result.scale).as_dvec3();
         }
 

diff --git a/src/subgizmo/arcball.rs b/src/subgizmo/arcball.rs
@@ -63,7 +63,7 @@ impl SubGizmo for ArcballSubGizmo {
 
         Some(GizmoResult {
             scale: self.config.scale.as_vec3().into(),
-            rotation: new_rotation.as_f32().into(),
+            rotation: new_rotation.as_quat().into(),
             translation: self.config.translation.as_vec3().into(),
             mode: GizmoMode::Rotate,
             value: None,

diff --git a/src/subgizmo/rotation.rs b/src/subgizmo/rotation.rs
@@ -107,7 +107,7 @@ impl SubGizmo for RotationSubGizmo {
 
         Some(GizmoResult {
             scale: self.config.scale.as_vec3().into(),
-            rotation: new_rotation.as_f32().into(),
+            rotation: new_rotation.as_quat().into(),
             translation: self.config.translation.as_vec3().into(),
             mode: GizmoMode::Rotate,
             value: Some(

diff --git a/src/subgizmo/scale.rs b/src/subgizmo/scale.rs
@@ -86,7 +86,7 @@ impl SubGizmo for ScaleSubGizmo {
 
         Some(GizmoResult {
             scale: new_scale.as_vec3().into(),
-            rotation: self.config.rotation.as_f32().into(),
+            rotation: self.config.rotation.as_quat().into(),
             translation: self.config.translation.as_vec3().into(),
             mode: GizmoMode::Scale,
             value: Some(offset.as_vec3().to_array()),

diff --git a/src/subgizmo/translation.rs b/src/subgizmo/translation.rs
@@ -92,7 +92,7 @@ impl SubGizmo for TranslationSubGizmo {
 
         Some(GizmoResult {
             scale: self.config.scale.as_vec3().into(),
-            rotation: self.config.rotation.as_f32().into(),
+            rotation: self.config.rotation.as_quat().into(),
             translation: new_translation.as_vec3().into(),
             mode: GizmoMode::Translate,
             value: Some(state.current_delta.as_vec3().to_array()),