From aec35a4792e2815291b4b0df66e2efea5afee791 Mon Sep 17 00:00:00 2001 From: flo Date: Mon, 27 Mar 2023 19:13:19 +0000 Subject: [PATCH] bird_medium_wing_tweaks --- voxygen/anim/src/bird_medium/idle.rs | 8 ++++++-- voxygen/anim/src/bird_medium/run.rs | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/voxygen/anim/src/bird_medium/idle.rs b/voxygen/anim/src/bird_medium/idle.rs index 6dfe4b88f2..e6a45e1547 100644 --- a/voxygen/anim/src/bird_medium/idle.rs +++ b/voxygen/anim/src/bird_medium/idle.rs @@ -41,6 +41,8 @@ impl Animation for IdleAnimation { next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01; + next.wing_in_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.wing_in_r.scale = Vec3::one() * s_a.scaler * 0.99; next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2); next.leg_l.orientation = Quaternion::rotation_x(0.0); @@ -67,8 +69,10 @@ impl Animation for IdleAnimation { * Quaternion::rotation_y(PI / 2.5 - wave_slow_cos * 0.06) * Quaternion::rotation_z(PI / 4.0); - next.wing_out_l.position = Vec3::new(-s_a.wing_out.0 / 2.5, s_a.wing_out.1, s_a.wing_out.2); - next.wing_out_r.position = Vec3::new(s_a.wing_out.0 / 2.5, s_a.wing_out.1, s_a.wing_out.2); + next.wing_out_l.position = + Vec3::new(-s_a.wing_out.0 / 2.5, s_a.wing_out.1, s_a.wing_out.2 + 1.0); + next.wing_out_r.position = + Vec3::new(s_a.wing_out.0 / 2.5, s_a.wing_out.1, s_a.wing_out.2 + 1.0); next.wing_out_l.orientation = Quaternion::rotation_y(0.1) * Quaternion::rotation_z(0.2); next.wing_out_r.orientation = Quaternion::rotation_y(-0.1) * Quaternion::rotation_z(-0.2); diff --git a/voxygen/anim/src/bird_medium/run.rs b/voxygen/anim/src/bird_medium/run.rs index 1588514364..010d08eb11 100644 --- a/voxygen/anim/src/bird_medium/run.rs +++ b/voxygen/anim/src/bird_medium/run.rs @@ -71,6 +71,8 @@ impl Animation for RunAnimation { next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01; + next.wing_in_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.wing_in_r.scale = Vec3::one() * s_a.scaler * 0.99; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.orientation = Quaternion::rotation_x(-0.1 * speednorm + short * -0.05) @@ -89,8 +91,8 @@ impl Animation for RunAnimation { next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1); next.tail.orientation = Quaternion::rotation_x(0.6 + short * -0.02); - next.wing_in_l.position = Vec3::new(-s_a.wing_in.0, s_a.wing_in.1, s_a.wing_in.2 + 2.0); - next.wing_in_r.position = Vec3::new(s_a.wing_in.0, s_a.wing_in.1, s_a.wing_in.2 + 2.0); + next.wing_in_l.position = Vec3::new(-s_a.wing_in.0, s_a.wing_in.1, s_a.wing_in.2); + next.wing_in_r.position = Vec3::new(s_a.wing_in.0, s_a.wing_in.1, s_a.wing_in.2); next.wing_in_l.orientation = Quaternion::rotation_x(-PI / 1.5) * Quaternion::rotation_y(-PI / 2.5)