Revert "animation smoothing: do not interpolate to angle 0"

This reverts commit 68639d8932.
This commit is contained in:
Adam
2018-06-25 08:18:42 -04:00
parent 30ce18da62
commit 714a533735

View File

@@ -192,47 +192,24 @@ public abstract class RSModelMixin implements RSModel
int translateZ; int translateZ;
if (type == 2) if (type == 2)
{ {
if (nextTranslateX != 0) int deltaX = nextTranslateX - currentTranslateX & 0xFF;
int deltaY = nextTranslateY - currentTranslateY & 0xFF;
int deltaZ = nextTranslateZ - currentTranslateZ & 0xFF;
if (deltaX >= 128)
{ {
int deltaX = nextTranslateX - currentTranslateX & 0xFF; deltaX -= 256;
if (deltaX >= 128)
{
deltaX -= 256;
}
translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF;
} }
else if (deltaY >= 128)
{ {
translateX = currentTranslateX; deltaY -= 256;
} }
if (deltaZ >= 128)
if (nextTranslateY != 0)
{ {
int deltaY = nextTranslateY - currentTranslateY & 0xFF; deltaZ -= 256;
if (deltaY >= 128)
{
deltaY -= 256;
}
translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF;
}
else
{
translateY = currentTranslateY;
}
if (nextTranslateZ != 0)
{
int deltaZ = nextTranslateZ - currentTranslateZ & 0xFF;
if (deltaZ >= 128)
{
deltaZ -= 256;
}
translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF;
}
else
{
translateZ = currentTranslateZ;
} }
translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF;
translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF;
translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF;
} }
else if (type == 5) else if (type == 5)
{ {