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

Fixed quadruped animation selection

Browse Source 
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
This commit is contained in:
Joshua Barretto 2019-05-14 12:37:05 +01:00
parent 2a2b873f56
commit 49cc422dfa
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use crate::{
anim::{
character::{CharacterSkeleton, IdleAnimation, JumpAnimation, RunAnimation},
quadruped::{QuadrupedSkeleton,},
character::{self, CharacterSkeleton},
quadruped::{self, QuadrupedSkeleton},
Animation, Skeleton,
},
mesh::Meshable,
@ -334,17 +334,17 @@ impl FigureMgr {
});
let target_skeleton = match animation_history.current {
comp::Animation::Idle => IdleAnimation::update_skeleton(
comp::Animation::Idle => character::IdleAnimation::update_skeleton(
state.skeleton_mut(),
time,
animation_history.time,
),
comp::Animation::Run => RunAnimation::update_skeleton(
comp::Animation::Run => character::RunAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_history.time,
),
comp::Animation::Jump => JumpAnimation::update_skeleton(
comp::Animation::Jump => character::JumpAnimation::update_skeleton(
state.skeleton_mut(),
time,
animation_history.time,
@ -361,13 +361,17 @@ impl FigureMgr {
});
let target_skeleton = match animation_history.current {
comp::Animation::Run => RunAnimation::update_skeleton(
comp::Animation::Run => quadruped::RunAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_history.time,
),
// TODO!
_ => state.skeleton_mut().clone(),
};
state.skeleton.interpolate(&target_skeleton);
state.update(renderer, pos.0, dir.0);
},
},