From 3d318a85e46b1992d4f467b4382746975e13c247 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 20 Apr 2019 18:12:45 -0400 Subject: [PATCH] tidying up code Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541 --- voxygen/src/anim/character/idle.rs | 4 +--- voxygen/src/anim/character/run.rs | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs index b61ac2135c..9138ed56ef 100644 --- a/voxygen/src/anim/character/idle.rs +++ b/voxygen/src/anim/character/idle.rs @@ -26,11 +26,9 @@ impl Animation for IdleAnimation { let wave = (time as f32 * 12.0).sin(); let wavecos = (time as f32 * 12.0).cos(); let wave_slow = (time as f32 * 6.0 + PI).sin(); - let wave_slower = (time as f32 * 2.0 + PI).sin(); - let wavecos_slower = (time as f32 * 2.0 + PI).cos(); + let wavecos_slow = (time as f32 * 6.0 + PI).cos(); let waveultra_slow = (time as f32 * 1.0 + PI).sin(); let waveultracos_slow = (time as f32 * 1.0 + PI).cos(); - let wavecos_slow = (time as f32 * 6.0 + PI).cos(); let wave_dip = (wave_slow.abs() - 0.5).abs(); next.head.offset = Vec3::new(0.0, 0.0, 12.0 + waveultra_slow * 0.4) / 11.0; diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs index 8db66c439d..90bd0d91d7 100644 --- a/voxygen/src/anim/character/run.rs +++ b/voxygen/src/anim/character/run.rs @@ -26,12 +26,10 @@ impl Animation for RunAnimation { let fuzzwave = (time as f32 * 12.0).sin(); let wavecos = (time as f32 * 14.0).cos(); let wave_slow = (time as f32 * 8.0 + PI).sin(); - let waveultra_slow = (time as f32 * 0.5 + PI).sin(); let wavecos_slow = (time as f32 * 8.0 + PI).cos(); let wave_dip = (wave_slow.abs() - 0.5).abs(); next.head.offset = Vec3::unit_z() * (12.0 + fuzzwave *1.0)/ 11.0; - //next.head.ori = Quaternion::rotation_z(); next.chest.offset = Vec3::unit_z() * (8.0 + fuzzwave * 0.8) / 11.0; next.chest.ori = Quaternion::rotation_z(wave * 0.3);