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

@@ -191,49 +191,26 @@ public abstract class RSModelMixin implements RSModel
int translateY; int translateY;
int translateZ; int translateZ;
if (type == 2) if (type == 2)
{
if (nextTranslateX != 0)
{ {
int deltaX = nextTranslateX - currentTranslateX & 0xFF; int deltaX = nextTranslateX - currentTranslateX & 0xFF;
int deltaY = nextTranslateY - currentTranslateY & 0xFF;
int deltaZ = nextTranslateZ - currentTranslateZ & 0xFF;
if (deltaX >= 128) if (deltaX >= 128)
{ {
deltaX -= 256; deltaX -= 256;
} }
translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF;
}
else
{
translateX = currentTranslateX;
}
if (nextTranslateY != 0)
{
int deltaY = nextTranslateY - currentTranslateY & 0xFF;
if (deltaY >= 128) if (deltaY >= 128)
{ {
deltaY -= 256; deltaY -= 256;
} }
translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF;
}
else
{
translateY = currentTranslateY;
}
if (nextTranslateZ != 0)
{
int deltaZ = nextTranslateZ - currentTranslateZ & 0xFF;
if (deltaZ >= 128) if (deltaZ >= 128)
{ {
deltaZ -= 256; deltaZ -= 256;
} }
translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF;
translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF;
translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF; translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF;
} }
else
{
translateZ = currentTranslateZ;
}
}
else if (type == 5) else if (type == 5)
{ {
// don't interpolate alpha transformations // don't interpolate alpha transformations