mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
first attempt at adaptive stride system
This commit is contained in:
jshipsey
parent
b514fb4159
commit
47d5c635de
@ -25,39 +25,72 @@ impl Animation for RunAnimation {
|
||||
let speed = Vec2::<f32>::from(velocity).magnitude();
|
||||
*rate = 1.0;
|
||||
let lab = 0.6; //6
|
||||
|
||||
let speedmult = if speed > 8.0 {
|
||||
let amplitude = (speed / 24.0).max(0.25);
|
||||
let amplitude2 = (speed * 1.4 / 24.0).min(0.8);
|
||||
let amplitude3 = (speed / 24.0).min(0.7);
|
||||
let speedmult = if speed > 0.0 {
|
||||
1.2 * (1.0 * skeleton_attr.tempo)
|
||||
} else {
|
||||
0.9 * (1.0 * skeleton_attr.tempo)
|
||||
};
|
||||
|
||||
//println!("{:?}", avg_speed);
|
||||
let canceler = speed / 24.0;
|
||||
let short = (((1.0)
|
||||
/ (0.72
|
||||
+ 0.28
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.0).sin())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * -0.15).sin())
|
||||
.powf(2.0 as f32)))
|
||||
.sqrt())
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.0).sin());
|
||||
* ((anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * -0.15).sin());
|
||||
|
||||
//
|
||||
let shortalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.35).sin();
|
||||
|
||||
let shortalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.5).sin();
|
||||
let noisify1 = (anim_time as f32 * 13.0 * lab as f32 * speedmult).sin() * 0.1;
|
||||
let noisify2 = (anim_time as f32 * 17.0 * lab as f32 * speedmult).sin() * 0.1;
|
||||
|
||||
let footvert = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin();
|
||||
let footvertt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin();
|
||||
let footvertalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin();
|
||||
let footverttalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.6).sin();
|
||||
let speedadjust = if speed < 5.0 { 0.0 } else { speed };
|
||||
let shift1 = speedadjust / 24.0 * 0.0;
|
||||
let shift2 = speedadjust / 24.0 * PI / -4.0;
|
||||
let shift3 = speedadjust / 24.0 * PI / 2.0;
|
||||
let shift4 = speedadjust / 24.0 * PI / 4.0;
|
||||
|
||||
let footvertf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.3).sin();
|
||||
let footverttf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.7).sin();
|
||||
let footvertaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.5).sin();
|
||||
let footverttaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.9).sin();
|
||||
//FL
|
||||
let foot1a =
|
||||
(anim_time as f32 * 16.0 * lab as f32 * speedmult + noisify1 + PI * (0.0 + shift1))
|
||||
.sin(); //1.5
|
||||
let foot1b =
|
||||
(anim_time as f32 * 16.0 * lab as f32 * speedmult + noisify1 + PI * (0.4 + shift1))
|
||||
.sin(); //1.9
|
||||
|
||||
//FR
|
||||
let foot2a = (anim_time as f32 * 16.0 * lab as f32 * speedmult
|
||||
+ noisify2
|
||||
+ PI * (PI / 4.0 + shift2))
|
||||
.sin(); //1.2
|
||||
let foot2b = (anim_time as f32 * 16.0 * lab as f32 * speedmult
|
||||
+ noisify2
|
||||
+ PI * (0.4 + PI / 4.0 + shift2))
|
||||
.sin(); //1.6
|
||||
|
||||
//BL
|
||||
let foot3a =
|
||||
(anim_time as f32 * 16.0 * lab as f32 * speedmult + noisify1 + PI * (0.0 + shift3))
|
||||
.sin(); //0.0
|
||||
let foot3b =
|
||||
(anim_time as f32 * 16.0 * lab as f32 * speedmult + noisify1 + PI * (0.4 + shift3))
|
||||
.sin(); //0.4
|
||||
|
||||
//BR
|
||||
let foot4a = (anim_time as f32 * 16.0 * lab as f32 * speedmult
|
||||
+ noisify2
|
||||
+ PI * (0.0 + PI / 4.0 + shift4))
|
||||
.sin(); //0.3
|
||||
let foot4b = (anim_time as f32 * 16.0 * lab as f32 * speedmult
|
||||
+ noisify2
|
||||
+ PI * (0.4 + PI / 4.0 + shift4))
|
||||
.sin(); //0.7
|
||||
|
||||
let footvertfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.6).sin();
|
||||
let footverttfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.0).sin();
|
||||
let footvertaltfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.8).sin();
|
||||
let footverttaltfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 2.2).sin();
|
||||
//
|
||||
let ori: Vec2<f32> = Vec2::from(orientation);
|
||||
let last_ori = Vec2::from(last_ori);
|
||||
@ -73,253 +106,137 @@ impl Animation for RunAnimation {
|
||||
0.0
|
||||
} * 1.3;
|
||||
let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude());
|
||||
if speed < 8.0 {
|
||||
//Trot
|
||||
next.head_upper.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
|
||||
next.head_upper.orientation =
|
||||
Quaternion::rotation_x(short * -0.03 - 0.1 + x_tilt * -0.5)
|
||||
* Quaternion::rotation_z(tilt * -1.2);
|
||||
next.head_upper.scale = Vec3::one();
|
||||
|
||||
next.head_lower.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
|
||||
next.head_lower.orientation = Quaternion::rotation_z(tilt * -0.8)
|
||||
* Quaternion::rotation_x(short * -0.05 + x_tilt * -0.5);
|
||||
next.head_lower.scale = Vec3::one() * 1.02;
|
||||
//Gallop
|
||||
next.head_upper.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
|
||||
next.head_upper.orientation = Quaternion::rotation_x(amplitude * short * -0.03 - 0.1)
|
||||
* Quaternion::rotation_z(tilt * -1.2)
|
||||
* Quaternion::rotation_y(tilt * 0.8);
|
||||
next.head_upper.scale = Vec3::one();
|
||||
|
||||
next.jaw.position = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
|
||||
next.jaw.orientation = Quaternion::rotation_x(0.0);
|
||||
next.jaw.scale = Vec3::one() * 1.02;
|
||||
next.head_lower.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
|
||||
next.head_lower.orientation = Quaternion::rotation_z(tilt * -0.8)
|
||||
* Quaternion::rotation_x(amplitude * short * -0.05)
|
||||
* Quaternion::rotation_y(tilt * 0.3);
|
||||
next.head_lower.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.orientation =
|
||||
Quaternion::rotation_x(shortalt * 0.3) * Quaternion::rotation_z(tilt * 1.5);
|
||||
next.tail.scale = Vec3::one();
|
||||
next.jaw.position = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
|
||||
next.jaw.orientation = Quaternion::rotation_x(0.0);
|
||||
next.jaw.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.torso_front.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_front.0,
|
||||
skeleton_attr.torso_front.1 + shortalt * 1.0 + x_tilt,
|
||||
) * skeleton_attr.scaler
|
||||
/ 11.0;
|
||||
next.torso_front.orientation = Quaternion::rotation_x(short * 0.03 + x_tilt)
|
||||
* Quaternion::rotation_y(0.0)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
|
||||
next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.orientation =
|
||||
Quaternion::rotation_x(shortalt * 0.3) * Quaternion::rotation_z(tilt * 1.5);
|
||||
next.tail.scale = Vec3::one();
|
||||
|
||||
next.torso_back.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_back.0,
|
||||
skeleton_attr.torso_back.1 + shortalt * 0.04 - 0.2,
|
||||
);
|
||||
next.torso_back.orientation =
|
||||
Quaternion::rotation_x(short * 0.06) * Quaternion::rotation_z(tilt * 1.8);
|
||||
next.torso_back.scale = Vec3::one();
|
||||
next.torso_front.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_front.0,
|
||||
skeleton_attr.torso_front.1 + canceler * shortalt * 2.5 + x_tilt * 10.0,
|
||||
) * skeleton_attr.scaler
|
||||
/ 11.0;
|
||||
next.torso_front.orientation = Quaternion::rotation_x(amplitude * short * -0.13 + x_tilt)
|
||||
* Quaternion::rotation_y(tilt * 0.8)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
|
||||
|
||||
next.ears.position = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1);
|
||||
next.ears.orientation = Quaternion::rotation_x(shortalt * 0.04 + 0.2);
|
||||
next.ears.scale = Vec3::one() * 1.02;
|
||||
next.torso_back.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_back.0,
|
||||
skeleton_attr.torso_back.1 + amplitude * shortalt * 0.2 - 0.2,
|
||||
);
|
||||
next.torso_back.orientation = Quaternion::rotation_x(amplitude * short * -0.1)
|
||||
* Quaternion::rotation_z(tilt * 1.8)
|
||||
* Quaternion::rotation_y(tilt * 0.6);
|
||||
next.torso_back.scale = Vec3::one();
|
||||
|
||||
next.leg_fl.position = Vec3::new(
|
||||
-skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + footvertaltfslow * -1.4,
|
||||
skeleton_attr.leg_f.2 + 1.0 + footverttaltfslow * -0.3,
|
||||
);
|
||||
next.leg_fl.orientation = Quaternion::rotation_x(footverttaltfslow * -0.35)
|
||||
* Quaternion::rotation_z(tilt * -0.5);
|
||||
next.leg_fl.scale = Vec3::one() * 1.02;
|
||||
next.ears.position = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1);
|
||||
next.ears.orientation = Quaternion::rotation_x(amplitude * shortalt * 0.2 + 0.2);
|
||||
next.ears.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_fr.position = Vec3::new(
|
||||
skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + footvertalt * -1.4,
|
||||
skeleton_attr.leg_f.2 + 1.0 + footverttalt * -0.3,
|
||||
);
|
||||
next.leg_fr.orientation =
|
||||
Quaternion::rotation_x(footverttalt * -0.35) * Quaternion::rotation_z(tilt * -0.5);
|
||||
next.leg_fr.scale = Vec3::one() * 1.02;
|
||||
next.leg_fl.position = Vec3::new(
|
||||
-skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + amplitude3 * foot1a * -1.3,
|
||||
skeleton_attr.leg_f.2 + canceler + amplitude3 * foot1b * -1.9,
|
||||
);
|
||||
next.leg_fl.orientation = Quaternion::rotation_x(amplitude3 * foot1b * -0.65)
|
||||
* Quaternion::rotation_z(tilt * -0.5)
|
||||
* Quaternion::rotation_y(tilt * 1.5);
|
||||
next.leg_fl.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_bl.position = Vec3::new(
|
||||
-skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + footvertalt * -1.0,
|
||||
skeleton_attr.leg_b.2 + 1.0 + footverttalt * -0.3,
|
||||
);
|
||||
next.leg_bl.orientation =
|
||||
Quaternion::rotation_x(footverttalt * -0.2) * Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_bl.scale = Vec3::one() * 1.02;
|
||||
next.leg_fr.position = Vec3::new(
|
||||
skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + amplitude3 * foot2a * -1.3,
|
||||
skeleton_attr.leg_f.2 + canceler + amplitude3 * foot2b * -1.9,
|
||||
);
|
||||
next.leg_fr.orientation = Quaternion::rotation_x(amplitude3 * foot2b * -0.65)
|
||||
* Quaternion::rotation_z(tilt * -0.5)
|
||||
* Quaternion::rotation_y(tilt * 1.5);
|
||||
next.leg_fr.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_br.position = Vec3::new(
|
||||
skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + footvertaltfslow * -1.0,
|
||||
skeleton_attr.leg_b.2 + 1.0 + footverttaltfslow * -0.3,
|
||||
);
|
||||
next.leg_br.orientation = Quaternion::rotation_x(footverttaltfslow * -0.2)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_br.scale = Vec3::one() * 1.02;
|
||||
next.leg_bl.position = Vec3::new(
|
||||
-skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + amplitude3 * foot3a * -1.7,
|
||||
skeleton_attr.leg_b.2 + canceler + amplitude3 * foot3b * -1.9,
|
||||
);
|
||||
next.leg_bl.orientation = Quaternion::rotation_x(amplitude3 * foot3b * -0.45 - 0.2)
|
||||
* Quaternion::rotation_y(tilt * 1.5)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_bl.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.foot_fl.position = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2 + ((footvertfslow * -1.0 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fl.orientation =
|
||||
Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttfslow * 0.5);
|
||||
next.foot_fl.scale = Vec3::one() * 0.96;
|
||||
next.leg_br.position = Vec3::new(
|
||||
skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + amplitude3 * foot4a * -1.7,
|
||||
skeleton_attr.leg_b.2 + canceler + amplitude3 * foot4b * -1.9,
|
||||
);
|
||||
next.leg_br.orientation = Quaternion::rotation_x(amplitude3 * foot4b * -0.45 - 0.2)
|
||||
* Quaternion::rotation_y(tilt * 1.5)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_br.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.foot_fr.position = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2 + ((footvert * -1.0 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fr.orientation =
|
||||
Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.5);
|
||||
next.foot_fr.scale = Vec3::one() * 0.96;
|
||||
next.foot_fl.position = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2
|
||||
+ ((amplitude2 * foot1a * 2.7 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fl.orientation = Quaternion::rotation_x(
|
||||
(1.0 - skeleton_attr.dampen) * -1.0 + amplitude2 * foot1b * -0.9,
|
||||
) * Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_fl.scale = Vec3::one() * 0.96;
|
||||
|
||||
next.foot_bl.position = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((footvert * -1.8).max(0.0)),
|
||||
);
|
||||
next.foot_bl.orientation = Quaternion::rotation_x(footvertt * 0.5 - 0.2);
|
||||
next.foot_bl.scale = Vec3::one() * 0.96;
|
||||
next.foot_fr.position = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2
|
||||
+ ((amplitude2 * foot2a * 2.7 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fr.orientation = Quaternion::rotation_x(
|
||||
(1.0 - skeleton_attr.dampen) * -1.0 + amplitude2 * foot2b * -0.9,
|
||||
) * Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_fr.scale = Vec3::one() * 0.96;
|
||||
|
||||
next.foot_br.position = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((footvertfslow * -0.8).max(-0.0)),
|
||||
);
|
||||
next.foot_br.orientation = Quaternion::rotation_x(footverttfslow * 0.5 - 0.2);
|
||||
next.foot_br.scale = Vec3::one() * 0.96;
|
||||
} else {
|
||||
let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude());
|
||||
|
||||
//Gallop
|
||||
next.head_upper.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
|
||||
next.head_upper.orientation = Quaternion::rotation_x(short * -0.03 - 0.1)
|
||||
* Quaternion::rotation_z(tilt * -1.2)
|
||||
* Quaternion::rotation_y(tilt * 0.8);
|
||||
next.head_upper.scale = Vec3::one();
|
||||
|
||||
next.head_lower.position =
|
||||
Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
|
||||
next.head_lower.orientation = Quaternion::rotation_z(tilt * -0.8)
|
||||
* Quaternion::rotation_x(short * -0.05)
|
||||
* Quaternion::rotation_y(tilt * 0.3);
|
||||
next.head_lower.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.jaw.position = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
|
||||
next.jaw.orientation = Quaternion::rotation_x(0.0);
|
||||
next.jaw.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
|
||||
next.tail.orientation =
|
||||
Quaternion::rotation_x(shortalt * 0.3) * Quaternion::rotation_z(tilt * 1.5);
|
||||
next.tail.scale = Vec3::one();
|
||||
|
||||
next.torso_front.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_front.0,
|
||||
skeleton_attr.torso_front.1 + shortalt * 2.5 + x_tilt * 10.0,
|
||||
) * skeleton_attr.scaler
|
||||
/ 11.0;
|
||||
next.torso_front.orientation = Quaternion::rotation_x(short * 0.13 + x_tilt)
|
||||
* Quaternion::rotation_y(tilt * 0.8)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
|
||||
|
||||
next.torso_back.position = Vec3::new(
|
||||
0.0,
|
||||
skeleton_attr.torso_back.0,
|
||||
skeleton_attr.torso_back.1 + shortalt * 0.2 - 0.2,
|
||||
);
|
||||
next.torso_back.orientation = Quaternion::rotation_x(short * 0.1)
|
||||
* Quaternion::rotation_z(tilt * 1.8)
|
||||
* Quaternion::rotation_y(tilt * 0.6);
|
||||
next.torso_back.scale = Vec3::one();
|
||||
|
||||
next.ears.position = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1);
|
||||
next.ears.orientation = Quaternion::rotation_x(shortalt * 0.2 + 0.2);
|
||||
next.ears.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_fl.position = Vec3::new(
|
||||
-skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + footvertaltf * -1.3,
|
||||
skeleton_attr.leg_f.2 + 1.0 + footverttaltf * -1.9,
|
||||
);
|
||||
next.leg_fl.orientation = Quaternion::rotation_x(footverttaltf * -0.65)
|
||||
* Quaternion::rotation_z(tilt * -0.5)
|
||||
* Quaternion::rotation_y(tilt * 1.5);
|
||||
next.leg_fl.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_fr.position = Vec3::new(
|
||||
skeleton_attr.leg_f.0,
|
||||
skeleton_attr.leg_f.1 + footvertalt * -1.3,
|
||||
skeleton_attr.leg_f.2 + 1.0 + footverttalt * -1.9,
|
||||
);
|
||||
next.leg_fr.orientation = Quaternion::rotation_x(footverttalt * -0.65)
|
||||
* Quaternion::rotation_z(tilt * -0.5)
|
||||
* Quaternion::rotation_y(tilt * 1.5);
|
||||
next.leg_fr.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_bl.position = Vec3::new(
|
||||
-skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + footvert * -1.7,
|
||||
skeleton_attr.leg_b.2 + 1.0 + footvertt * -1.5,
|
||||
);
|
||||
next.leg_bl.orientation = Quaternion::rotation_x(footvertt * -0.45 - 0.2)
|
||||
* Quaternion::rotation_y(tilt * 1.5)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_bl.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.leg_br.position = Vec3::new(
|
||||
skeleton_attr.leg_b.0,
|
||||
skeleton_attr.leg_b.1 + footvertf * -1.7,
|
||||
skeleton_attr.leg_b.2 + 1.0 + footverttf * -1.5,
|
||||
);
|
||||
next.leg_br.orientation = Quaternion::rotation_x(footverttf * -0.45 - 0.2)
|
||||
* Quaternion::rotation_y(tilt * 1.5)
|
||||
* Quaternion::rotation_z(tilt * -1.5);
|
||||
next.leg_br.scale = Vec3::one() * 1.02;
|
||||
|
||||
next.foot_fl.position = Vec3::new(
|
||||
-skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2 + ((footvertf * -2.7 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fl.orientation =
|
||||
Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttf * 0.9)
|
||||
* Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_fl.scale = Vec3::one() * 0.96;
|
||||
|
||||
next.foot_fr.position = Vec3::new(
|
||||
skeleton_attr.feet_f.0,
|
||||
skeleton_attr.feet_f.1,
|
||||
skeleton_attr.feet_f.2 + ((footvert * -2.7 * skeleton_attr.maximize).max(0.0)),
|
||||
);
|
||||
next.foot_fr.orientation =
|
||||
Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.9)
|
||||
* Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_fr.scale = Vec3::one() * 0.96;
|
||||
|
||||
next.foot_bl.position = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((footvert * 1.3).max(0.0)),
|
||||
);
|
||||
next.foot_bl.orientation = Quaternion::rotation_x(footvertt * -0.9 - 0.2)
|
||||
next.foot_bl.position = Vec3::new(
|
||||
-skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((amplitude2 * foot3a * 1.8).max(-0.0)),
|
||||
);
|
||||
next.foot_bl.orientation =
|
||||
Quaternion::rotation_x(amplitude2 * foot3b * -1.3 - 0.2 * speed / 24.0)
|
||||
* Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_bl.scale = Vec3::one() * 0.96;
|
||||
next.foot_bl.scale = Vec3::one() * 0.96;
|
||||
|
||||
next.foot_br.position = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((footvertf * 1.3).max(-0.0)),
|
||||
);
|
||||
next.foot_br.orientation = Quaternion::rotation_x(footverttf * -0.9 - 0.2)
|
||||
next.foot_br.position = Vec3::new(
|
||||
skeleton_attr.feet_b.0,
|
||||
skeleton_attr.feet_b.1,
|
||||
skeleton_attr.feet_b.2 + ((amplitude2 * foot4a * 1.8).max(0.0)),
|
||||
);
|
||||
next.foot_br.orientation =
|
||||
Quaternion::rotation_x(amplitude2 * foot4b * -1.3 - 0.2 * speed / 24.0)
|
||||
* Quaternion::rotation_y(tilt * -1.0);
|
||||
next.foot_br.scale = Vec3::one() * 0.96;
|
||||
}
|
||||
next.foot_br.scale = Vec3::one() * 0.96;
|
||||
next
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user