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

Fix combat animations for non humanoids

Browse Source
This commit is contained in:
timokoesters 2019-08-02 22:50:19 +02:00 committed by Joshua Barretto
parent 3a43150bc5
commit 6f598681fb
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -767,24 +767,30 @@ impl FigureMgr {
};
let target_skeleton = match animation_info.animation {
comp::Animation::Run => anim::quadruped::RunAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_info.time,
skeleton_attr,
),
comp::Animation::Idle => anim::quadruped::IdleAnimation::update_skeleton(
state.skeleton_mut(),
time,
animation_info.time,
skeleton_attr,
),
comp::Animation::Jump => anim::quadruped::JumpAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_info.time,
skeleton_attr,
),
comp::Animation::Run | comp::Animation::Crun => {
anim::quadruped::RunAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_info.time,
skeleton_attr,
)
}
comp::Animation::Idle | comp::Animation::Cidle => {
anim::quadruped::IdleAnimation::update_skeleton(
state.skeleton_mut(),
time,
animation_info.time,
skeleton_attr,
)
}
comp::Animation::Jump | comp::Animation::Cjump => {
anim::quadruped::JumpAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
animation_info.time,
skeleton_attr,
)
}
// TODO!
_ => state.skeleton_mut().clone(),
@ -807,7 +813,7 @@ impl FigureMgr {
};
let target_skeleton = match animation_info.animation {
comp::Animation::Run => {
comp::Animation::Run | comp::Animation::Crun => {
anim::quadrupedmedium::RunAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),
@ -815,7 +821,7 @@ impl FigureMgr {
skeleton_attr,
)
}
comp::Animation::Idle => {
comp::Animation::Idle | comp::Animation::Cidle => {
anim::quadrupedmedium::IdleAnimation::update_skeleton(
state.skeleton_mut(),
time,
@ -823,7 +829,7 @@ impl FigureMgr {
skeleton_attr,
)
}
comp::Animation::Jump => {
comp::Animation::Jump | comp::Animation::Cjump => {
anim::quadrupedmedium::JumpAnimation::update_skeleton(
state.skeleton_mut(),
(vel.0.magnitude(), time),