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

comments

Browse Source
This commit is contained in:
jshipsey 2021-04-22 00:04:22 -04:00
parent 2f523f5aa0
commit 19ce4ad531
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ impl Animation for RunAnimation {
) -> Self::Skeleton {
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
let mixed_vel = acc_vel + anim_time * 2.0;
let mixed_vel = acc_vel + anim_time * 2.0; //sets run frequency using speed, with anim_time setting a floor
let lab: f32 = 0.45 * s_a.tempo;
let speednorm = (speed / 7.0).powf(0.6);

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

@ -25,7 +25,7 @@ impl Animation for RunAnimation {
let speed = (Vec2::<f32>::from(velocity).magnitude()).min(15.0);
let speednorm = (speed / 15.0).powf(0.25);
let mixed_vel = acc_vel + anim_time * 6.0;
let mixed_vel = acc_vel + anim_time * 6.0; //sets run frequency using speed, with anim_time setting a floor
let lab: f32 = 0.8 * s_a.tempo;
let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()).max(-0.7) * speednorm;

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

@ -30,7 +30,7 @@ impl Animation for RunAnimation {
let amplitude3 = (speed / 24.0).powf(0.6);
let speedmult = s_a.tempo;
let canceler = (speed / 24.0).powf(0.6);
let mixed_vel = acc_vel + anim_time * 2.5;
let mixed_vel = acc_vel + anim_time * 2.5; //sets run frequency using speed, with anim_time setting a floor
let short = ((1.0
/ (0.72

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

@ -29,7 +29,7 @@ impl Animation for RunAnimation {
// acc_vel and anim_time mix to make sure phase lenght isn't starting at
// +infinite
let mixed_vel = acc_vel + anim_time * 12.0;
let mixed_vel = acc_vel + anim_time * 12.0; //sets run frequency using speed, with anim_time setting a floor
let speedmult = s_a.tempo;
let short = (mixed_vel * lab * speedmult + PI * 1.0).sin() * speednorm;

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

@ -26,7 +26,7 @@ impl Animation for RunAnimation {
//let speednorm = speed / 13.0;
let speednorm = (speed / 13.0).powf(0.25);
let mixed_vel = acc_vel + anim_time * 6.0;
let mixed_vel = acc_vel + anim_time * 6.0; //sets run frequency using speed, with anim_time setting a floor
let speedmult = 1.0;
let lab: f32 = 0.6; //6