PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-26 06:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix awkward walking animation when dual-wielding

Browse source 
This commit fixes the awkward situation where running while dual-wielding
causes the pony to appear to be sliding on their front hooves.

When the player is holding two items (non-blocking) while not flying, the
forehooves animation is now blended with the player speed. As the player
reaches walking speed, the "decreased" arm movement (less pendulum
rotation) is cancelled, causing the animation to appear as if the pony is not
holding any items.

When the player is not moving, or is flying, the original animation is preserved
(arms are leaning forward), even if the player is holding two items.
This commit is contained in:
Ha3 2016-06-10 01:03:44 +02:00
parent 56bd748a16
commit 69f369a957
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java
View file

@ -79,7 +79,7 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
this.bipedHeadwear.offsetY = 0f; this.bipedHeadwear.offsetY = 0f;
this.bipedHeadwear.offsetZ = 0f; this.bipedHeadwear.offsetZ = 0f;
this.setLegs(move, swing, tick, entity); this.setLegs(move, swing, tick, entity);
this.holdItem(); this.holdItem(swing);
this.swingItem(entity, this.swingProgress); this.swingItem(entity, this.swingProgress);
if (this.isSneak && !this.isFlying) { if (this.isSneak && !this.isFlying) {
this.adjustBody(BODY_ROTATE_ANGLE_X_SNEAK, BODY_RP_Y_SNEAK, BODY_RP_Z_SNEAK); this.adjustBody(BODY_ROTATE_ANGLE_X_SNEAK, BODY_RP_Y_SNEAK, BODY_RP_Z_SNEAK);
@ -327,8 +327,9 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
} }
@SuppressWarnings("incomplete-switch") @SuppressWarnings("incomplete-switch")
protected void holdItem() { protected void holdItem(float swing) {
if (!this.rainboom && !this.metadata.hasMagic()) { if (!this.rainboom && !this.metadata.hasMagic()) {
boolean bothHoovesAreOccupied = this.leftArmPose == ArmPose.ITEM && this.rightArmPose == ArmPose.ITEM;
switch (this.leftArmPose) { switch (this.leftArmPose) {
case EMPTY: case EMPTY:
@ -339,7 +340,12 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
this.bipedLeftArm.rotateAngleY = 0.5235988F; this.bipedLeftArm.rotateAngleY = 0.5235988F;
break; break;
case ITEM: case ITEM:
this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * 0.5F - ((float) Math.PI / 10F); float swag = 1f;
if (!isFlying && bothHoovesAreOccupied) {
swag = (float) (1d - Math.pow(swing, 2d));
}
float rotationMultiplier = 0.5f + 0.5f * (1f - swag);
this.bipedLeftArm.rotateAngleX = this.bipedLeftArm.rotateAngleX * rotationMultiplier - ((float) Math.PI / 10F) * swag;
this.bipedLeftArm.rotateAngleY = 0.0F; this.bipedLeftArm.rotateAngleY = 0.0F;
} }
@ -352,7 +358,12 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
this.bipedRightArm.rotateAngleY = -0.5235988F; this.bipedRightArm.rotateAngleY = -0.5235988F;
break; break;
case ITEM: case ITEM:
this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * 0.5F - ((float) Math.PI / 10F); float swag = 1f;
if (!isFlying && bothHoovesAreOccupied) {
swag = (float) (1d - Math.pow(swing, 2d));
}
float rotationMultiplier = 0.5f + 0.5f * (1f - swag);
this.bipedRightArm.rotateAngleX = this.bipedRightArm.rotateAngleX * rotationMultiplier - ((float) Math.PI / 10F) * swag;
this.bipedRightArm.rotateAngleY = 0.0F; this.bipedRightArm.rotateAngleY = 0.0F;
} }

2
src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelPonyArmor.java
View file

@ -42,7 +42,7 @@ public class ModelPonyArmor extends ModelPlayerPony {
this.extHead[1].offsetY = 0f; this.extHead[1].offsetY = 0f;
this.extHead[1].offsetZ = 0f; this.extHead[1].offsetZ = 0f;
this.setLegs(move, swing, tick, entity); this.setLegs(move, swing, tick, entity);
this.holdItem(); this.holdItem(swing);
this.swingItem(entity, this.swingProgress); this.swingItem(entity, this.swingProgress);
if (this.isSneak && !this.isFlying) { if (this.isSneak && !this.isFlying) {
this.adjustBody(BODY_ROTATE_ANGLE_X_SNEAK, BODY_RP_Y_SNEAK, BODY_RP_Z_SNEAK); this.adjustBody(BODY_ROTATE_ANGLE_X_SNEAK, BODY_RP_Y_SNEAK, BODY_RP_Z_SNEAK);