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 not yet done NPC animations.

Browse Source 
This forces them all to be the idle animation if not specified.

This fixes issues where you'd have giant NPCs in water.
This commit is contained in:
Joshua Yanovski 2020-08-13 22:34:43 +02:00
parent bc83360f2a
commit 7204cc8a7a
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1482,7 +1482,13 @@ impl FigureMgr {
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::fish_medium::IdleAnimation::update_skeleton(
&FishMediumSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);
@ -1557,7 +1563,13 @@ impl FigureMgr {
skeleton_attr, skeleton_attr,
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::dragon::IdleAnimation::update_skeleton(
&DragonSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);
@ -1633,7 +1645,13 @@ impl FigureMgr {
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::critter::IdleAnimation::update_skeleton(
&CritterSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);
@ -1712,7 +1730,13 @@ impl FigureMgr {
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::bird_small::IdleAnimation::update_skeleton(
&BirdSmallSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);
@ -1791,7 +1815,13 @@ impl FigureMgr {
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::fish_small::IdleAnimation::update_skeleton(
&FishSmallSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);
@ -1963,7 +1993,13 @@ impl FigureMgr {
), ),
// TODO! // TODO!
_ => state.skeleton_mut().clone(), _ => anim::golem::IdleAnimation::update_skeleton(
&GolemSkeleton::default(),
time,
state.state_time,
&mut state_animation_rate,
skeleton_attr,
),
}; };
state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt); state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt);