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

Multiply, not divide (0.2 / 5 == 0.04)

Browse source
This commit is contained in:
Sollace 2018-06-03 19:59:55 +02:00
parent bafe9aca31
commit da2d435ca2
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,7 +149,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
return 0; return 0;
} }
return MathHelper.sin(MathHelper.sqrt(swingProgress) * PI * 2) * 0.2F; return MathHelper.sin(MathHelper.sqrt(swingProgress) * PI * 2) * 0.04F;
} }
protected void adjustBodyRiding() { protected void adjustBodyRiding() {
@ -167,8 +167,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, ticks); tail.setRotationAndAngles(rainboom, move, swing, bodySwing * 5, ticks);
bodySwing /= 5;
upperTorso.rotateAngleY = bodySwing; upperTorso.rotateAngleY = bodySwing;
bipedBody.rotateAngleY = bodySwing; bipedBody.rotateAngleY = bodySwing;

1
src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java
View file

@ -19,7 +19,6 @@ public class ModelVillagerPony extends ModelAlicorn {
@Override @Override
protected void shakeBody(float move, float swing, float bodySwing, float ticks) { protected void shakeBody(float move, float swing, float bodySwing, float ticks) {
super.shakeBody(move, swing, bodySwing, ticks); super.shakeBody(move, swing, bodySwing, ticks);
bodySwing /= 5;
bag.rotateAngleY = bodySwing; bag.rotateAngleY = bodySwing;
apron.rotateAngleY = bodySwing; apron.rotateAngleY = bodySwing;