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

animation minor fixes

Browse Source 
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
This commit is contained in:
jshipsey 2019-04-20 18:08:56 -04:00
parent 0137a83dd8
commit 6fd783e6eb
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ impl Animation for RunAnimation {
let wavecos_slow = (time as f32 * 8.0 + PI).cos();
let wave_dip = (wave_slow.abs() - 0.5).abs();
<<<<<<< HEAD
next.head.offset = Vec3::unit_z() * (12.0 + fuzzwave *0.4)/ SCALE;
next.chest.offset = Vec3::unit_z() * (8.0 + fuzzwave * 0.3) / SCALE;
@ -41,15 +42,34 @@ impl Animation for RunAnimation {
next.shorts.offset = Vec3::unit_z() * (3.0 + fuzzwave * 0.3) / SCALE;
next.shorts.ori = Quaternion::rotation_z(wave * 0.1);
=======
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);
next.belt.offset = Vec3::unit_z() * (6.0 + fuzzwave * 0.8)/ 11.0;
next.belt.ori = Quaternion::rotation_z(wave * 0.3);
next.shorts.offset = Vec3::unit_z() * (3.0 + fuzzwave * 0.8) / 11.0;
next.shorts.ori = Quaternion::rotation_z(wave * 0.2);
>>>>>>> animation minor fixes
next.l_hand.offset = Vec3::new(0.0 - wavecos * 1.0, 7.5, 11.0 - wave * 1.0) / SCALE;
next.l_hand.ori = Quaternion::rotation_y(wave * -1.8);
next.r_hand.offset = Vec3::new(0.0 + wavecos * 1.0, -7.5, 11.0 + wave * 1.0) / SCALE;
next.r_hand.ori = Quaternion::rotation_y(wave * 1.8);
<<<<<<< HEAD
next.l_foot.offset = Vec3::new(2.5 - wavecos * 4.0, 3.4, 6.0 + wave * 2.5) / SCALE;
next.l_foot.ori = Quaternion::rotation_y(wave * -1.0);
next.r_foot.offset = Vec3::new(2.5 + wavecos * 4.0, -3.4, 6.0 - wave * 2.5) / SCALE;
=======
next.l_foot.offset = Vec3::new(2.5 - wavecos * 4.0, 3.4, 6.0 + wave * 2.9) / 11.0;
next.l_foot.ori = Quaternion::rotation_y(wave * -1.0);
next.r_foot.offset = Vec3::new(2.5 + wavecos * 4.0, -3.4, 6.0 - wave * 2.9) / 11.0;
>>>>>>> animation minor fixes
next.r_foot.ori = Quaternion::rotation_y(wave * 1.0);
next.back.offset = Vec3::new(-6.0, 16.0, 15.0);