PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix derped swimming animation

Browse source
This commit is contained in:
Sollace 2018-07-27 00:10:35 +02:00
parent 7f12104ec5
commit 028b86d749
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/minelittlepony/model/AbstractPonyModel.java
View file

@ -72,7 +72,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
* Checks flying and speed conditions and sets rainboom to true if we're a species with wings and is going faaast. * Checks flying and speed conditions and sets rainboom to true if we're a species with wings and is going faaast.
*/ */
protected void checkRainboom(Entity entity, float swing) { protected void checkRainboom(Entity entity, float swing) {
rainboom = isSwimming() || canFly() && Math.sqrt(entity.motionX * entity.motionX + entity.motionZ * entity.motionZ) > 0.4F; rainboom = canFly() && Math.sqrt(entity.motionX * entity.motionX + entity.motionZ * entity.motionZ) > 0.4F;
} }
public void updateLivingState(EntityLivingBase entity, Pony pony) { public void updateLivingState(EntityLivingBase entity, Pony pony) {
@ -112,7 +112,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
shakeBody(move, swing, getWobbleAmount(), ticks); shakeBody(move, swing, getWobbleAmount(), ticks);
rotateLegs(move, swing, ticks, entity); rotateLegs(move, swing, ticks, entity);
if (!rainboom) { if (!isSwimming && !rainboom) {
holdItem(swing); holdItem(swing);
} }
swingItem(entity); swingItem(entity);
@ -175,7 +175,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
* @param ticks Total whole and partial ticks since the entity's existance. Used in animations together with {@code swing} and {@code move}. * @param ticks Total whole and partial ticks since the entity's existance. Used in animations together with {@code swing} and {@code move}.
*/ */
protected void shakeBody(float move, float swing, float bodySwing, float ticks) { protected void shakeBody(float move, float swing, float bodySwing, float ticks) {
tail.setRotationAndAngles(rainboom, move, swing, bodySwing * 5, ticks); tail.setRotationAndAngles(isSwimming || rainboom, move, swing, bodySwing * 5, ticks);
upperTorso.rotateAngleY = bodySwing; upperTorso.rotateAngleY = bodySwing;
bipedBody.rotateAngleY = bodySwing; bipedBody.rotateAngleY = bodySwing;
@ -276,24 +276,19 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
float leftY = -forward - MathHelper.sin((move / 3) + 2*PI/3); float leftY = -forward - MathHelper.sin((move / 3) + 2*PI/3);
float rightX = down + MathHelper.sin(move / 3) / 2; float rightX = down + MathHelper.sin(move / 3) / 2;
float rightY = forward + MathHelper.sin(move / 3);
bipedLeftArm.rotateAngleX = leftX; bipedLeftArm.rotateAngleX = leftX;
bipedLeftArm.rotateAngleY = leftY; bipedLeftArm.rotateAngleY = leftY;
bipedRightArm.rotateAngleY = rightY; bipedRightArm.rotateAngleY = -leftY;
bipedRightArm.rotateAngleX = rightX; bipedRightArm.rotateAngleX = leftX;
bipedLeftLeg.rotateAngleX = leftX; bipedLeftLeg.rotateAngleX = leftX;
bipedRightLeg.rotateAngleX = rightX; bipedRightLeg.rotateAngleX = rightX;
bipedLeftLeg.rotateAngleY = 0; bipedLeftLeg.rotateAngleY = 0;
bipedRightLeg.rotateAngleY = 0; bipedRightLeg.rotateAngleY = 0;
} }
/** /**