Resolved rebase problems

This commit is contained in:
Joshua Barretto 2020-04-01 23:40:59 +01:00
parent 966f96c588
commit 8c73ec982c

View File

@ -17,12 +17,6 @@ impl Animation for RunAnimation {
) -> Self::Skeleton {
let mut next = (*skeleton).clone();
let anim = assets::load::<Animation<QuadrupedSmallState>>("anims.quadruped_small.run");
let slow = (anim_time as f32 * 14.0).sin();
let fast = (anim_time as f32 * 20.0).sin();
let fast_alt = (anim_time as f32 * 20.0 + PI / 2.0).sin();