Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaking quadrupedmedium

Browse Source 
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
This commit is contained in:
jshipsey 2019-05-26 10:25:56 -04:00
parent 9a4e663ef9
commit fa07323083
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/anim/mod.rs
View File

@ -1,7 +1,7 @@
pub mod QuadrupedMedium;
pub mod character;
pub mod fixture;
pub mod quadruped;
pub mod quadrupedmedium;
// Library
use vek::*;

11
voxygen/src/scene/figure.rs
View File

@ -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::{
@ -564,20 +563,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,