From 91918bab0c1050e6078f03d745d543c45cd2106c Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 21 Aug 2023 21:25:04 +0100 Subject: [PATCH] Improve seapony tail animations --- .../client/model/entity/race/SeaponyModel.java | 5 +---- .../client/model/part/SeaponyTail.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java index 4769710e..af02043e 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java @@ -73,10 +73,7 @@ public class SeaponyModel extends UnicornModel { leftFin.yaw = finAngle; rightFin.yaw = -finAngle; - - if (!attributes.isSleeping) { - centerFin.roll = flapMotion; - } + centerFin.roll = flapMotion; if (!entity.isSubmergedInWater()) { leftArm.pitch -= 0.5F; diff --git a/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java index 3af8b752..fd373852 100644 --- a/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java @@ -17,8 +17,8 @@ public class SeaponyTail implements IPart, MsonModel { public SeaponyTail(ModelPart tree) { tailBase = tree.getChild("base"); - tailTip = tree.getChild("tip"); - tailFins = tree.getChild("fins"); + tailTip = tailBase.getChild("tip"); + tailFins = tailTip.getChild("fins"); } @Override @@ -28,6 +28,14 @@ public class SeaponyTail implements IPart, MsonModel { tailBase.pitch = MathHelper.HALF_PI + rotation; tailTip.pitch = rotation; tailFins.pitch = rotation - MathHelper.HALF_PI; + + float turn = MathHelper.clamp(attributes.motionRoll * 0.05F + bodySwing, -0.4F, 0.4F); + + tailBase.yaw = turn; + turn /= 2F; + tailTip.roll = -turn; + turn /= 2F; + tailFins.roll = -turn; } @Override