Go back to glam 0.27

SlimeYummy · Aug 29, 2024 · fb10a6d · fb10a6d
1 parent 6a74dce
commit fb10a6d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7  23,7 @@ nodejs = ["wasm", "dep:js-sys", "dep:wasm-bindgen"]
 [dependencies]
 bimap = { version = "0.6" }
 bytecheck = { version = "0.6", optional = true, default-features = false }
-glam = { version = "0.29", features = [ "core-simd", "libm" ] }
 glam = { version = "0.27", features = [ "core-simd", "libm" ] }
 js-sys = { version = "0.3", optional = true }
 rkyv = { version = "0.7", optional = true, features = [ "validation" ] }
 serde = { version= "1.0", optional = true, features = [ "serde_derive" ] }

diff --git a/demo/src/playback.rs b/demo/src/playback.rs
@@ -113,22  113,22 @@ impl OzzExample for OzzPlayback {
             let bone_rot = Quat::from_mat3(&Mat3::from_cols(bone_dir, bone_rot_y, bone_rot_z));
 
             self.bone_trans.push(OzzTransform {
-                scale: scale,
                 scale,
                 rotation: bone_rot,
                 position: parent_pos,
             });
 
             let parent_rot = Quat::from_mat4(parent);
             self.spine_trans.push(OzzTransform {
-                scale: scale,
                 scale,
                 rotation: parent_rot,
                 position: parent_pos,
             });
 
             if self.skeleton.is_leaf(i as i16) {
                 let current_rot = Quat::from_mat4(current);
                 self.spine_trans.push(OzzTransform {
-                    scale: scale,
                     scale,
                     rotation: current_rot,
                     position: current_pos,
                 });

diff --git a/demo/src/two_bone_ik.rs b/demo/src/two_bone_ik.rs
@@ -169,22  169,22 @@ impl OzzExample for OzzTwoBoneIK {
             let bone_rot = Quat::from_mat3(&Mat3::from_cols(bone_dir, bone_rot_y, bone_rot_z));
 
             self.bone_trans.push(OzzTransform {
-                scale: scale,
                 scale,
                 rotation: bone_rot,
                 position: parent_pos,
             });
 
             let parent_rot = Quat::from_mat4(parent);
             self.spine_trans.push(OzzTransform {
-                scale: scale,
                 scale,
                 rotation: parent_rot,
                 position: parent_pos,
             });
 
             if self.skeleton.is_leaf(i as i16) {
                 let current_rot = Quat::from_mat4(current);
                 self.spine_trans.push(OzzTransform {
-                    scale: scale,
                     scale,
                     rotation: current_rot,
                     position: current_pos,
                 });

diff --git a/src/ik_two_bone_job.rs b/src/ik_two_bone_job.rs
@@ -487,7  487,7 @@ impl IKTwoBoneJob {
 #[cfg(test)]
 mod ik_two_bone_tests {
     use core::f32::consts;
-    use glam::Vec3;
     use glam::{Vec3, Vec4};
     use wasm_bindgen_test::*;
 
     use super::*;
@@ -504,6  504,11 @@ mod ik_two_bone_tests {
         assert!(job.validate());
     }
 
     #[inline(always)]
     fn vec4_to_vec3a(v: Vec4) -> Vec3A {
         Vec3A::new(v[0], v[1], v[2])
     }
 
     #[test]
     #[wasm_bindgen_test]
     fn test_start_joint_correction() {
@@ -512,8  517,8 @@ mod ik_two_bone_tests {
             Mat4::from_rotation_translation(Quat::from_axis_angle(Vec3::Z, core::f32::consts::FRAC_PI_2), Vec3::Y);
         let base_end = Mat4::from_translation(Vec3::X   Vec3::Y);
         let mid_axis = Vec3A::cross(
-            Vec3A::from_vec4(base_start.col(3)) - Vec3A::from_vec4(base_mid.col(3)),
-            Vec3A::from_vec4(base_end.col(3)) - Vec3A::from_vec4(base_mid.col(3)),
             vec4_to_vec3a(base_start.col(3)) - vec4_to_vec3a(base_mid.col(3)),
             vec4_to_vec3a(base_end.col(3)) - vec4_to_vec3a(base_mid.col(3)),
         );
 
         let parents = [
@@ -586,8  591,8 @@ mod ik_two_bone_tests {
         let mid = Mat4::from_rotation_translation(Quat::from_axis_angle(Vec3::Z, consts::FRAC_PI_2), Vec3::Y);
         let end = Mat4::from_translation(Vec3::X   Vec3::Y);
         let mid_axis = Vec3A::cross(
-            Vec3A::from_vec4(start.col(3)) - Vec3A::from_vec4(mid.col(3)),
-            Vec3A::from_vec4(end.col(3)) - Vec3A::from_vec4(mid.col(3)),
             vec4_to_vec3a(start.col(3)) - vec4_to_vec3a(mid.col(3)),
             vec4_to_vec3a(end.col(3)) - vec4_to_vec3a(mid.col(3)),
         );
 
         let mut job = IKTwoBoneJob::default();
@@ -975,7  980,7 @@ mod ik_two_bone_tests {
         let end = Mat4::from_translation(Vec3::X   Vec3::Y);
 
         let mut job = IKTwoBoneJob::default();
-        job.set_target(Vec3A::from_vec4(start.col(3)));
         job.set_target(vec4_to_vec3a(start.col(3)));
         job.set_start_joint(start);
         job.set_mid_joint(mid);
         job.set_end_joint(end);