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

tidying up code

Browse Source 
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
This commit is contained in:
jshipsey 2019-04-20 18:12:45 -04:00
parent d6981f8f54
commit b57d0061a9
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/anim/character/idle.rs
View File

@ -27,11 +27,9 @@ impl Animation for IdleAnimation {
let wave = (time as f32 * 12.0).sin(); let wave = (time as f32 * 12.0).sin();
let wavecos = (time as f32 * 12.0).cos(); let wavecos = (time as f32 * 12.0).cos();
let wave_slow = (time as f32 * 6.0 + PI).sin(); let wave_slow = (time as f32 * 6.0 + PI).sin();
let wave_slower = (time as f32 * 2.0 + PI).sin(); let wavecos_slow = (time as f32 * 6.0 + PI).cos();
let wavecos_slower = (time as f32 * 2.0 + PI).cos();
let waveultra_slow = (time as f32 * 1.0 + PI).sin(); let waveultra_slow = (time as f32 * 1.0 + PI).sin();
let waveultracos_slow = (time as f32 * 1.0 + PI).cos(); 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(); let wave_dip = (wave_slow.abs() - 0.5).abs();
next.head.offset = Vec3::new(0.0, 0.0, 12.0 + waveultra_slow * 0.4) / SCALE; next.head.offset = Vec3::new(0.0, 0.0, 12.0 + waveultra_slow * 0.4) / SCALE;

2
voxygen/src/anim/character/run.rs
View File

@ -27,7 +27,6 @@ impl Animation for RunAnimation {
let fuzzwave = (time as f32 * 12.0).sin(); let fuzzwave = (time as f32 * 12.0).sin();
let wavecos = (time as f32 * 14.0).cos(); let wavecos = (time as f32 * 14.0).cos();
let wave_slow = (time as f32 * 8.0 + PI).sin(); 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 wavecos_slow = (time as f32 * 8.0 + PI).cos();
let wave_dip = (wave_slow.abs() - 0.5).abs(); let wave_dip = (wave_slow.abs() - 0.5).abs();
@ -44,7 +43,6 @@ impl Animation for RunAnimation {
next.shorts.ori = Quaternion::rotation_z(wave * 0.1); next.shorts.ori = Quaternion::rotation_z(wave * 0.1);
======= =======
next.head.offset = Vec3::unit_z() * (12.0 + fuzzwave *1.0)/ 11.0; 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.offset = Vec3::unit_z() * (8.0 + fuzzwave * 0.8) / 11.0;
next.chest.ori = Quaternion::rotation_z(wave * 0.3); next.chest.ori = Quaternion::rotation_z(wave * 0.3);