changelog

voxygen/src/anim/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 name = "voxygen_anim"
 # Uncomment to use animation hot reloading
 # Note: this breaks `cargo test`
-crate-type = ["lib", "cdylib"]
+# crate-type = ["lib", "cdylib"]
 
 [features]
 use-dyn-lib = ["libloading", "notify", "lazy_static", "tracing", "find_folder"]

voxygen/src/anim/src/character/mod.rs

@@ -32,8 +32,8 @@ pub use self::{
     glidewield::GlideWieldAnimation, gliding::GlidingAnimation, idle::IdleAnimation,
     jump::JumpAnimation, leapmelee::LeapAnimation, roll::RollAnimation, run::RunAnimation,
     shoot::ShootAnimation, sit::SitAnimation, sneak::SneakAnimation, spin::SpinAnimation,
-    spinmelee::SpinMeleeAnimation, stand::StandAnimation, swim::SwimAnimation, swimwield::SwimWieldAnimation,
-    wield::WieldAnimation,
+    spinmelee::SpinMeleeAnimation, stand::StandAnimation, swim::SwimAnimation,
+    swimwield::SwimWieldAnimation, wield::WieldAnimation,
 };
 
 use super::{Bone, FigureBoneData, Skeleton};

voxygen/src/anim/src/character/swim.rs

@@ -127,8 +127,8 @@ impl Animation for SwimAnimation {
             1.5 + skeleton_attr.hand.1 - foot * 2.0 * intensity,
             5.0 + skeleton_attr.hand.2 + foot * -5.0 * intensity,
         );
-        next.l_hand.ori =
-            Quaternion::rotation_x(1.5 + foot * -1.2 * intensity) * Quaternion::rotation_y(0.4+foot*-0.35);
+        next.l_hand.ori = Quaternion::rotation_x(1.5 + foot * -1.2 * intensity)
+            * Quaternion::rotation_y(0.4 + foot * -0.35);
         next.l_hand.scale = Vec3::one();
 
         next.r_hand.offset = Vec3::new(
@@ -136,8 +136,8 @@ impl Animation for SwimAnimation {
             1.5 + skeleton_attr.hand.1 + foot * 2.0 * intensity,
             5.0 + skeleton_attr.hand.2 + foot * 5.0 * intensity,
         );
-        next.r_hand.ori =
-            Quaternion::rotation_x(1.5 + foot * 1.2 * intensity) * Quaternion::rotation_y(-0.4+foot*-0.35);
+        next.r_hand.ori = Quaternion::rotation_x(1.5 + foot * 1.2 * intensity)
+            * Quaternion::rotation_y(-0.4 + foot * -0.35);
         next.r_hand.scale = Vec3::one();
 
         next.l_foot.offset = Vec3::new(

voxygen/src/scene/figure/mod.rs

@@ -831,8 +831,7 @@ impl FigureMgr {
                                     &mut state_animation_rate,
                                     skeleton_attr,
                                 )
-                            }
-                            else{
+                            } else {
                                 anim::character::WieldAnimation::update_skeleton(
                                     &target_base,
                                     (active_tool_kind, second_tool_kind, vel.0.magnitude(), time),
@@ -841,7 +840,6 @@ impl FigureMgr {
                                     skeleton_attr,
                                 )
                             }
-
                         },
                         CharacterState::Glide { .. } => {
                             anim::character::GlidingAnimation::update_skeleton(