From 1078f756eb38852d437fc13fc5b4fab6abb045e7 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 26 May 2019 10:25:56 -0400 Subject: [PATCH] tweaking quadrupedmedium Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d --- voxygen/src/anim/mod.rs | 2 +- voxygen/src/scene/figure.rs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs index 6908d9b002..c7fe9b120d 100644 --- a/voxygen/src/anim/mod.rs +++ b/voxygen/src/anim/mod.rs @@ -1,7 +1,7 @@ -pub mod QuadrupedMedium; pub mod character; pub mod fixture; pub mod quadruped; +pub mod quadrupedmedium; // Library use vek::*; diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 171c7b09d2..66d23f22b9 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -2,9 +2,8 @@ use crate::{ anim::{ character::{self, CharacterSkeleton}, quadruped::{self, QuadrupedSkeleton}, - Animation, - QuadrupedMedium::{self, QuadrupedMediumSkeleton}, - Skeleton, + quadrupedmedium::{self, QuadrupedMediumSkeleton}, + Animation, Skeleton, }, mesh::Meshable, render::{ @@ -561,20 +560,20 @@ impl FigureMgr { }); let target_skeleton = match animation_history.current { - comp::Animation::Run => QuadrupedMedium::RunAnimation::update_skeleton( + comp::Animation::Run => quadrupedmedium::RunAnimation::update_skeleton( state.skeleton_mut(), (vel.0.magnitude(), time), animation_history.time, ), comp::Animation::Idle => { - QuadrupedMedium::IdleAnimation::update_skeleton( + quadrupedmedium::IdleAnimation::update_skeleton( state.skeleton_mut(), time, animation_history.time, ) } comp::Animation::Jump => { - QuadrupedMedium::JumpAnimation::update_skeleton( + quadrupedmedium::JumpAnimation::update_skeleton( state.skeleton_mut(), (vel.0.magnitude(), time), animation_history.time,