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

Merge branch 'slipped/shadowfix' into 'master'

Browse Source 
shadow bug fix

See merge request
This commit is contained in:
Justin Shipsey 2019-10-12 18:51:43 +00:00
commit 99fb1ceef6
4 changed files with 5 additions and 5 deletions
voxygen/src/anim/character
jump.rsroll.rsrun.rsstand.rs

2
voxygen/src/anim/character/jump.rs

@ -90,7 +90,7 @@ impl Animation for JumpAnimation {
next.draw.ori = Quaternion::rotation_y(0.0);
next.draw.scale = Vec3::one() * 0.0;
next.torso.offset = Vec3::new(0.0, -0.2, 0.0) * skeleton_attr.scaler;
next.torso.offset = Vec3::new(0.0, 0.0, 0.0) * skeleton_attr.scaler;
next.torso.ori = Quaternion::rotation_x(-0.2);
next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;

4
voxygen/src/anim/character/roll.rs

@ -96,8 +96,8 @@ impl Animation for RollAnimation {
next.draw.scale = Vec3::one() * 0.0;
next.torso.offset =
Vec3::new(0.0, -2.2, 0.1 + wave_dub * 16.0) / 11.0 * skeleton_attr.scaler;
next.torso.ori = Quaternion::rotation_x(wave_slow * 6.0);
Vec3::new(0.0, 11.0, 0.1 + wave_dub * 16.0) / 11.0 * skeleton_attr.scaler;
next.torso.ori = Quaternion::rotation_x(wave_slow * 6.5);
next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
next
}

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

@ -136,7 +136,7 @@ impl Animation for RunAnimation {
next.draw.ori = Quaternion::rotation_y(0.0);
next.draw.scale = Vec3::one() * 0.0;
next.torso.offset = Vec3::new(0.0, -0.2 + wave * -0.08, 0.4) * skeleton_attr.scaler;
next.torso.offset = Vec3::new(0.0, 0.3 + wave * -0.08, 0.4) * skeleton_attr.scaler;
next.torso.ori =
Quaternion::rotation_x(wave_stop * speed * -0.06 + wave_diff * speed * -0.005)
* Quaternion::rotation_y(tilt);

2
voxygen/src/anim/character/stand.rs

@ -102,7 +102,7 @@ impl Animation for StandAnimation {
next.draw.ori = Quaternion::rotation_y(0.0);
next.draw.scale = Vec3::one() * 0.0;
next.torso.offset = Vec3::new(0.0, -0.2, 0.1) * skeleton_attr.scaler;
next.torso.offset = Vec3::new(0.0, -0.1, 0.1) * skeleton_attr.scaler;
next.torso.ori = Quaternion::rotation_x(0.0);
next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;