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

Don't try to strafe at angles of NaN

Browse source
This commit is contained in:
Sollace 2018-06-11 19:50:58 +02:00
parent 2a32b74b5b
commit a9abab820e
3 changed files with 17 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/anim/BasicEasingInterpolator.java
View file

@ -21,6 +21,11 @@ public class BasicEasingInterpolator implements IInterpolator {
from += (to - from) / scalingFactor;
if (Float.isNaN(from) || Float.isInfinite(from)) {
System.err.println("Error: Animation frame for " + key + " is NaN or Infinite.");
from = to;
}
properties.put(key, from);
return from;

4
src/main/java/com/minelittlepony/pony/data/PonyData.java
View file

@ -47,7 +47,7 @@ public class PonyData implements IPonyData {
@Override
public PonyRace getRace() {
return race.isHuman() ? race : PonyRace.PEGASUS;
return race;
}
@Override
@ -77,7 +77,7 @@ public class PonyData implements IPonyData {
@Override
public boolean isWearing(PonyWearable wearable) {
return true;//wearables[wearable.ordinal()];
return wearables[wearable.ordinal()];
}
@Override

12
src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
View file

@ -43,7 +43,13 @@ public class RenderPonyPlayer extends RenderPonyBase {
}
// ayyy magic numbers (after 5 - an approximation of nice looking coefficients calculated by hand)
roll *= horMotion * 5 * (3.6884f * Math.pow(Math.abs(roll), -0.191));
// roll might be zero, in which case Math.pow produces +Infinity. Anything x Infinity = NaN.
double pow = roll != 0 ? Math.pow(Math.abs(roll), -0.191) : 0;
roll *= horMotion * 5 * (3.6884f * pow);
assert !Float.isNaN((float)roll);
return MathHelper.clamp(roll, -54, 54);
}
@ -67,7 +73,9 @@ public class RenderPonyPlayer extends RenderPonyBase {
GlStateManager.rotate(ponyModel.motionPitch, 1, 0, 0);
float roll = getPony().getMetadata().getInterpolator().interpolate("pegasusRoll", (float)calculateRoll(player, motionX, motionY, motionZ), 10);
float roll = (float)calculateRoll(player, motionX, motionY, motionZ);
roll = getPony().getMetadata().getInterpolator().interpolate("pegasusRoll", roll, 10);
GlStateManager.rotate((float)roll, 0, 0, 1);