From 714a5337352e5a3bcfa1bbcd53afffb24ac45e04 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 25 Jun 2018 08:18:42 -0400 Subject: [PATCH] Revert "animation smoothing: do not interpolate to angle 0" This reverts commit 68639d893271c825ac8406193bd9f9072e5a5378. --- .../net/runelite/mixins/RSModelMixin.java | 47 +++++-------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java index 9a6e50379f..dfa641faec 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java @@ -192,47 +192,24 @@ public abstract class RSModelMixin implements RSModel int translateZ; 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; - if (deltaX >= 128) - { - deltaX -= 256; - } - translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF; + deltaX -= 256; } - else + if (deltaY >= 128) { - translateX = currentTranslateX; + deltaY -= 256; } - - if (nextTranslateY != 0) + if (deltaZ >= 128) { - int deltaY = nextTranslateY - currentTranslateY & 0xFF; - 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; + deltaZ -= 256; } + translateX = currentTranslateX + deltaX * interval / intervalCount & 0xFF; + translateY = currentTranslateY + deltaY * interval / intervalCount & 0xFF; + translateZ = currentTranslateZ + deltaZ * interval / intervalCount & 0xFF; } else if (type == 5) {