diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs index caf1554b06..ab8e7bf109 100644 --- a/voxygen/src/anim/character/attack.rs +++ b/voxygen/src/anim/character/attack.rs @@ -18,33 +18,12 @@ impl Animation for AttackAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 4.0).sin(); let wave_quicken = 1.0 - (anim_time as f32 * 16.0).cos(); let wave_quicken_slow = 1.0 - (anim_time as f32 * 12.0).cos(); let wave_quicken_double = 1.0 - (anim_time as f32 * 24.0).cos(); let wave_quick = (anim_time as f32 * 0.5).sin(); - let wave_cos = (anim_time as f32 * 12.0).cos(); - let wave_slow = (anim_time as f32 * 10.0 + PI).cos(); - let wave_slow_cos = (anim_time as f32 * 12.0 + PI).cos(); - let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let wave_stop = (anim_time as f32 * 6.0).min(PI / 2.0).sin(); - let wave_stop_alt = (anim_time as f32 * 28.0).min(PI / 2.0).sin(); let wave_stop_quick = (anim_time as f32 * 16.0).min(PI / 2.0).sin(); - let peak_wave = 1.0 - (anim_time as f32 * 1.0).cos(); - let head_look = Vec2::new( - ((global_time + anim_time) as f32 / 8.0) - .floor() - .mul(7331.0) - .sin() - * 0.5, - ((global_time + anim_time) as f32 / 8.0) - .floor() - .mul(1337.0) - .sin() - * 0.25, - ); next.head.offset = Vec3::new(0.0, 2.0, 11.0); next.head.ori = Quaternion::rotation_z(wave_stop_quick * -0.25) * Quaternion::rotation_x(0.0 + wave_stop_quick * -0.1) diff --git a/voxygen/src/anim/character/gliding.rs b/voxygen/src/anim/character/gliding.rs index fbc88a6db5..8c21326638 100644 --- a/voxygen/src/anim/character/gliding.rs +++ b/voxygen/src/anim/character/gliding.rs @@ -14,15 +14,9 @@ impl Animation for GlidingAnimation { anim_time: f64, ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 14.0).sin(); let wave_slow = (anim_time as f32 * 7.0).sin(); let wave_slow_cos = (anim_time as f32 * 7.0).cos(); - let arc_wave = (1.0f32.ln_1p() - 1.5).abs(); - let wave_test = wave.cbrt(); - let fuzz_wave = (anim_time as f32 * 12.0).sin(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_stop = (anim_time as f32 * 1.5).min(PI / 2.0).sin(); - let wave_stop_alt = (anim_time as f32 * 5.0).min(PI / 2.0).sin(); let wave_very_slow = (anim_time as f32 * 3.0).sin(); let wave_very_slow_alt = (anim_time as f32 * 2.5).sin(); let wave_very_slow_cos = (anim_time as f32 * 3.0).cos(); diff --git a/voxygen/src/anim/quadruped/idle.rs b/voxygen/src/anim/quadruped/idle.rs index 0296e74e7b..63c82e8a0a 100644 --- a/voxygen/src/anim/quadruped/idle.rs +++ b/voxygen/src/anim/quadruped/idle.rs @@ -16,14 +16,8 @@ impl Animation for IdleAnimation { let mut next = (*skeleton).clone(); let wave = (anim_time as f32 * 14.0).sin(); - let wave_test = wave.cbrt(); - let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let fuzz_wave = (anim_time as f32 * 12.0).sin(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_slow = (anim_time as f32 * 3.5 + PI).sin(); let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); - let wave_dip = (wave_slow.abs() - 0.5).abs(); let pig_head_look = Vec2::new( ((global_time + anim_time) as f32 / 8.0) diff --git a/voxygen/src/anim/quadruped/jump.rs b/voxygen/src/anim/quadruped/jump.rs index c658eaf000..2c08e3eeed 100644 --- a/voxygen/src/anim/quadruped/jump.rs +++ b/voxygen/src/anim/quadruped/jump.rs @@ -15,13 +15,7 @@ impl Animation for JumpAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 14.0).sin(); - let wave_test = wave.cbrt(); - let fuzz_wave = (anim_time as f32 * 12.0).sin(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_slow = (anim_time as f32 * 7.0 + PI).sin(); - let wave_slow_cos = (anim_time as f32 * 8.0 + PI).cos(); - let wave_dip = (wave_slow.abs() - 0.5).abs(); let wave_stop = (anim_time as f32 * 4.5).min(PI / 2.0).sin(); next.pig_head.offset = Vec3::new(0.0, 0.0, -1.5) / 11.0; diff --git a/voxygen/src/anim/quadruped/run.rs b/voxygen/src/anim/quadruped/run.rs index 53cd1fd055..eca624e79a 100644 --- a/voxygen/src/anim/quadruped/run.rs +++ b/voxygen/src/anim/quadruped/run.rs @@ -18,12 +18,7 @@ impl Animation for RunAnimation { let wave = (anim_time as f32 * 14.0).sin(); let wave_quick = (anim_time as f32 * 20.0).sin(); let wave_quick_cos = (anim_time as f32 * 20.0).cos(); - let wave_test = wave.cbrt(); - let fuzz_wave = (anim_time as f32 * 12.0).sin(); let wave_cos = (anim_time as f32 * 14.0).cos(); - let wave_slow = (anim_time as f32 * 7.0 + PI).sin(); - let wave_slow_cos = (anim_time as f32 * 8.0 + PI).cos(); - let wave_dip = (wave_slow.abs() - 0.5).abs(); next.pig_head.offset = Vec3::new(0.0, 0.0, -1.5 + wave * 1.5) / 11.0; next.pig_head.ori = diff --git a/voxygen/src/anim/quadrupedmedium/idle.rs b/voxygen/src/anim/quadrupedmedium/idle.rs index 1a99b92d03..bc6578d498 100644 --- a/voxygen/src/anim/quadrupedmedium/idle.rs +++ b/voxygen/src/anim/quadrupedmedium/idle.rs @@ -15,13 +15,10 @@ impl Animation for IdleAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 14.0).sin(); let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_slow = (anim_time as f32 * 3.5 + PI).sin(); let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); - let wave_dip = (wave_slow.abs() - 0.5).abs(); let wolf_look = Vec2::new( ((global_time + anim_time) as f32 / 8.0) diff --git a/voxygen/src/anim/quadrupedmedium/jump.rs b/voxygen/src/anim/quadrupedmedium/jump.rs index 8f9a22423d..9813b5f16c 100644 --- a/voxygen/src/anim/quadrupedmedium/jump.rs +++ b/voxygen/src/anim/quadrupedmedium/jump.rs @@ -16,11 +16,7 @@ impl Animation for JumpAnimation { let mut next = (*skeleton).clone(); let wave = (anim_time as f32 * 14.0).sin(); - let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_slow = (anim_time as f32 * 3.5 + PI).sin(); - let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); let wave_stop = (anim_time as f32 * 5.0).min(PI / 2.0).sin(); next.wolf_head_upper.offset = Vec3::new(0.0, 7.5, 15.0 + wave_stop * 4.8) / 11.0; diff --git a/voxygen/src/anim/quadrupedmedium/run.rs b/voxygen/src/anim/quadrupedmedium/run.rs index e954295260..bd06aefd9c 100644 --- a/voxygen/src/anim/quadrupedmedium/run.rs +++ b/voxygen/src/anim/quadrupedmedium/run.rs @@ -16,16 +16,11 @@ impl Animation for RunAnimation { let mut next = (*skeleton).clone(); let wave = (anim_time as f32 * 14.0).sin(); - let wave_ultra_slow = (anim_time as f32 * 1.0 + PI).sin(); - let wave_ultra_slow_cos = (anim_time as f32 * 1.0 + PI).cos(); - let wave_cos = (anim_time as f32 * 14.0).cos(); let wave_slow = (anim_time as f32 * 3.5 + PI).sin(); let wave_slow_cos = (anim_time as f32 * 3.5 + PI).cos(); - let wave_dip = (wave_slow.abs() - 0.5).abs(); let wave_quick = (anim_time as f32 * 18.0).sin(); let wave_med = (anim_time as f32 * 12.0).sin(); let wave_med_cos = (anim_time as f32 * 12.0).cos(); - let wave_quick_cos = (anim_time as f32 * 18.0).cos(); let wolf_look = Vec2::new(