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

rebase

Browse Source
This commit is contained in:
jshipsey 2019-06-30 17:57:19 -04:00
parent e5bdace124
commit b42c6dba61
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,6 @@ impl<'a> System<'a> for Sys {
warn!("{}", message); warn!("{}", message);
Animation::Idle Animation::Idle
} }
<<<<<<< HEAD
let animation = match (a.on_ground, a.moving, a.attacking, a.gliding, a.rolling) { 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("Attack while gliding"),
(_, _, true, _, true) => impossible_animation("Roll while attacking"), (_, _, true, _, true) => impossible_animation("Roll while attacking"),

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

@ -581,7 +581,6 @@ impl FigureMgr {
}) })
.unwrap_or(Rgba::broadcast(1.0)); .unwrap_or(Rgba::broadcast(1.0));
<<<<<<< HEAD
let skeleton_attr = &self let skeleton_attr = &self
.model_cache .model_cache
.get_or_create_model(renderer, *body, tick) .get_or_create_model(renderer, *body, tick)
@ -613,7 +612,8 @@ impl FigureMgr {
animation_info.time, animation_info.time,
skeleton_attr, skeleton_attr,
), ),
comp::Animation::Attack => anim::character::AttackAnimation::update_skeleton( comp::Animation::Attack => {
anim::character::AttackAnimation::update_skeleton(
state.skeleton_mut(), state.skeleton_mut(),
time, time,
animation_info.time, animation_info.time,
@ -644,7 +644,8 @@ impl FigureMgr {
animation_info.time, animation_info.time,
skeleton_attr, skeleton_attr,
), ),
comp::Animation::Gliding => anim::character::GlidingAnimation::update_skeleton( comp::Animation::Gliding => {
anim::character::GlidingAnimation::update_skeleton(
state.skeleton_mut(), state.skeleton_mut(),
(vel.0.magnitude(), time), (vel.0.magnitude(), time),
animation_info.time, animation_info.time,