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

Remove animation warnings

Browse Source
This commit is contained in:
timokoesters 2019-08-24 10:57:47 +02:00
parent 799c73d43a
commit 5ab03abbdd
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/sys/animation.rs
View File

@ -1,6 +1,7 @@
use crate::{
comp::{
ActionState::*, Animation, AnimationInfo, CharacterState, MovementState::*, PhysicsState,
Stats,
},
state::DeltaTime,
};
@ -13,6 +14,7 @@ impl<'a> System<'a> for Sys {
type SystemData = (
Entities<'a>,
Read<'a, DeltaTime>,
ReadStorage<'a, Stats>,
ReadStorage<'a, CharacterState>,
ReadStorage<'a, PhysicsState>,
WriteStorage<'a, AnimationInfo>,
@ -20,12 +22,13 @@ impl<'a> System<'a> for Sys {
fn run(
&mut self,
(entities, dt, character_states, physics_states, mut animation_infos): Self::SystemData,
(entities, dt, stats, character_states, physics_states, mut animation_infos): Self::SystemData,
) {
for (entity, character, physics) in (&entities, &character_states, &physics_states).join() {
fn impossible_animation(physics: PhysicsState, character: CharacterState) -> Animation {
warn!("Impossible animation: {:?} {:?}", physics, character);
Animation::Roll
for (entity, stats, character, physics) in
(&entities, &stats, &character_states, &physics_states).join()
{
if stats.is_dead {
continue;
}
let animation = match (physics.on_ground, &character.movement, &character.action) {
@ -38,7 +41,8 @@ impl<'a> System<'a> for Sys {
(false, Jump, Wield { .. }) => Animation::Cjump,
(_, Glide, Idle) => Animation::Gliding,
(_, _, Attack { .. }) => Animation::Attack,
_ => impossible_animation(physics.clone(), character.clone()),
// Impossible animation (Caused by missing animations or syncing delays)
_ => Animation::Roll,
};
let new_time = animation_infos