From b42c6dba613b4ed9cd140baf1cccccc8d7180daf Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 30 Jun 2019 17:57:19 -0400 Subject: [PATCH] rebase --- common/src/sys/animation.rs | 2 -- voxygen/src/scene/figure.rs | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/src/sys/animation.rs b/common/src/sys/animation.rs index 53234f0773..5f429512b0 100644 --- a/common/src/sys/animation.rs +++ b/common/src/sys/animation.rs @@ -20,8 +20,6 @@ impl<'a> System<'a> for Sys { warn!("{}", message); Animation::Idle } - -<<<<<<< HEAD let animation = match (a.on_ground, a.moving, a.attacking, a.gliding, a.rolling) { (_, _, true, true, _) => impossible_animation("Attack while gliding"), (_, _, true, _, true) => impossible_animation("Roll while attacking"), diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 27873a1988..dd21b3b548 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -581,7 +581,6 @@ impl FigureMgr { }) .unwrap_or(Rgba::broadcast(1.0)); -<<<<<<< HEAD let skeleton_attr = &self .model_cache .get_or_create_model(renderer, *body, tick) @@ -613,7 +612,8 @@ impl FigureMgr { animation_info.time, skeleton_attr, ), - comp::Animation::Attack => anim::character::AttackAnimation::update_skeleton( + comp::Animation::Attack => { + anim::character::AttackAnimation::update_skeleton( state.skeleton_mut(), time, animation_info.time, @@ -644,7 +644,8 @@ impl FigureMgr { animation_info.time, skeleton_attr, ), - comp::Animation::Gliding => anim::character::GlidingAnimation::update_skeleton( + comp::Animation::Gliding => { + anim::character::GlidingAnimation::update_skeleton( state.skeleton_mut(), (vel.0.magnitude(), time), animation_info.time,