Merge pull request #160 from Jameskmonger/more-refactors-for-camera

refactor: renaming and reorganising methods

Author: Promises

src/main/java/org/runejs/client/Class37.java

@@ -13,8 +13,6 @@
 import org.runejs.client.media.renderable.actor.Npc;
 import org.runejs.client.media.renderable.actor.Player;
 import org.runejs.client.net.IncomingPackets;
-import org.runejs.client.scene.GroundItemTile;
-import org.runejs.client.scene.SceneCamera;
 import org.runejs.client.scene.SceneCluster;
 import org.runejs.client.scene.tile.FloorDecoration;
 import org.runejs.client.scene.tile.SceneTile;
@@ -30,22 +28,6 @@ public class Class37 {
         anInt874 = 0;
     }
 
-    public static int getFloorDrawHeight(int plane, int x, int y) {
-        int groundX = x >> 7;
-        int groundY = y >> 7;
-        if(groundX < 0 || groundY < 0 || groundX > 103 || groundY > 103)
-            return 0;
-        int groundZ = plane;
-        if(groundZ < 3 && (OverlayDefinition.tile_flags[1][groundX][groundY] & 0x2) == 2)
-            groundZ++;
-        int _x = 0x7f & x;
-        int _y = y & 0x7f;
-        int i2 = (-_x + 128) * MovedStatics.tile_height[groundZ][groundX][groundY] + _x * MovedStatics.tile_height[groundZ][groundX + 1][groundY] >> 7;
-        int j2 = _x * MovedStatics.tile_height[groundZ][1 + groundX][1 + groundY] + MovedStatics.tile_height[groundZ][groundX][1 + groundY] * (128 + -_x) >> 7;
-        return (128 + -_y) * i2 + j2 * _y >> 7;
-    }
-
-
     public static void method434() {
         MovedStatics.menuOpen = false;
         IncomingPackets.opcode = -1;

src/main/java/org/runejs/client/Class65.java

@@ -25,7 +25,7 @@ public static void method1020() {
         SceneTile.blendedLightness = new int[104];
         AnimationSequence.tileLightIntensity = new int[105][105];
         MouseHandler.tile_overlayids = new byte[4][104][104];
-        Class40_Sub5_Sub17_Sub6.blendedHue = new int[104];
+        SpotAnim.blendedHue = new int[104];
         Class35.tile_overlay_rotation = new byte[4][104][104];
         MovedStatics.tile_underlayids = new byte[4][104][104];
     }

src/main/java/org/runejs/client/Main.java

@@ -590,11 +590,11 @@ public static void renderFlames() {
             if (IdentityKit.anInt2613 > 0) {
                 for (int i = 0; i < 256; i++) {
                     if (IdentityKit.anInt2613 > 768)
-                        MovedStatics.anIntArray1013[i] = MovedStatics.method614(Class51.anIntArray1198[i], Class40_Sub5_Sub17_Sub6.anIntArray3248[i], -IdentityKit.anInt2613 + 1024);
+                        MovedStatics.anIntArray1013[i] = MovedStatics.method614(Class51.anIntArray1198[i], SpotAnim.anIntArray3248[i], -IdentityKit.anInt2613 + 1024);
                     else if (IdentityKit.anInt2613 > 256)
-                        MovedStatics.anIntArray1013[i] = Class40_Sub5_Sub17_Sub6.anIntArray3248[i];
+                        MovedStatics.anIntArray1013[i] = SpotAnim.anIntArray3248[i];
                     else
-                        MovedStatics.anIntArray1013[i] = MovedStatics.method614(Class40_Sub5_Sub17_Sub6.anIntArray3248[i], Class51.anIntArray1198[i], -IdentityKit.anInt2613 + 256);
+                        MovedStatics.anIntArray1013[i] = MovedStatics.method614(SpotAnim.anIntArray3248[i], Class51.anIntArray1198[i], -IdentityKit.anInt2613 + 256);
                 }
             } else {
                 System.arraycopy(Class51.anIntArray1198, 0, MovedStatics.anIntArray1013, 0, 256);
@@ -803,12 +803,12 @@ public static void setConfigToDefaults() {
 
     public static void method353() {
         MovedStatics.anInt2628++;
-        Class40_Sub5_Sub17_Sub6.method833(0, true);
-        ItemDefinition.method749(true);
-        Class40_Sub5_Sub17_Sub6.method833(0, false);
-        ItemDefinition.method749(false);
-        MovedStatics.method335();
-        MovedStatics.method1000();
+        SpotAnim.renderPlayers(0, true);
+        ItemDefinition.renderNPCs(true);
+        SpotAnim.renderPlayers(0, false);
+        ItemDefinition.renderNPCs(false);
+        MovedStatics.renderProjectiles();
+        MovedStatics.renderSpotAnims();
         if(!Player.cutsceneActive) {
             int pitch = Main.playerCamera.getPitch();
             if(SceneCamera.cameraTerrainMinScaledPitch / 256 > pitch) {
@@ -834,23 +834,23 @@ public static void method353() {
         Point3d shakeOffsetPosition = new Point3d(0, 0, 0);
         CameraRotation shakeOffsetRotation = new CameraRotation(0, 0);
 
-        for(int i_6_ = 0; i_6_ < 5; i_6_++) {
-            if(SceneCamera.customCameraActive[i_6_]) {
-                int i_7_ = (int) ((double) (SceneCamera.customCameraJitter[i_6_] * 2 + 1) * Math.random() - (double) SceneCamera.customCameraJitter[i_6_] + Math.sin((double) SceneCamera.customCameraTimer[i_6_] * ((double) SceneCamera.customCameraFrequency[i_6_] / 100.0)) * (double) SceneCamera.customCameraAmplitude[i_6_]);
-                if(i_6_ == 1) {
-                    shakeOffsetPosition = shakeOffsetPosition.addZ(i_7_);
+        for(int cameraType = 0; cameraType < 5; cameraType++) {
+            if(SceneCamera.customCameraActive[cameraType]) {
+                int shakeAmount = (int) ((double) (SceneCamera.customCameraJitter[cameraType] * 2 + 1) * Math.random() - (double) SceneCamera.customCameraJitter[cameraType] + Math.sin((double) SceneCamera.customCameraTimer[cameraType] * ((double) SceneCamera.customCameraFrequency[cameraType] / 100.0)) * (double) SceneCamera.customCameraAmplitude[cameraType]);
+                if(cameraType == 1) {
+                    shakeOffsetPosition = shakeOffsetPosition.addZ(shakeAmount);
                 }
-                if(i_6_ == 0) {
-                    shakeOffsetPosition = shakeOffsetPosition.addX(i_7_);
+                if(cameraType == 0) {
+                    shakeOffsetPosition = shakeOffsetPosition.addX(shakeAmount);
                 }
-                if(i_6_ == 2) {
-                    shakeOffsetPosition = shakeOffsetPosition.addY(i_7_);
+                if(cameraType == 2) {
+                    shakeOffsetPosition = shakeOffsetPosition.addY(shakeAmount);
                 }
-                if(i_6_ == 4) {
-                    shakeOffsetRotation = shakeOffsetRotation.addPitch(i_7_);
+                if(cameraType == 4) {
+                    shakeOffsetRotation = shakeOffsetRotation.addPitch(shakeAmount);
                 }
-                if(i_6_ == 3) {
-                    shakeOffsetRotation = shakeOffsetRotation.addYaw(i_7_);
+                if(cameraType == 3) {
+                    shakeOffsetRotation = shakeOffsetRotation.addYaw(shakeAmount);
                 }
             }
         }
@@ -1189,13 +1189,13 @@ public static void method164() {
         }
     }
 
-    public static void method165() {
+    public static void moveTowardsTarget() {
         // TODO (James) this moves the cutscene camera towards its target, we should move this into the CutsceneCamera class
         CutsceneCamera camera = Main.cutsceneCamera;
 
         int i = camera.getMoveTo().y;
         int i_3_ = camera.getMoveTo().x;
-        int i_4_ = Class37.getFloorDrawHeight(Player.worldLevel, i_3_, i) - camera.getMoveTo().z;
+        int i_4_ = Scene.getFloorDrawHeight(Player.worldLevel, i_3_, i) - camera.getMoveTo().z;
 
         int newX = camera.getPosition().x;
         int newY = camera.getPosition().y;
@@ -1238,7 +1238,7 @@ public static void method165() {
 
         i_3_ = camera.getLookAt().x;
         i = camera.getLookAt().y;
-        i_4_ = Class37.getFloorDrawHeight(Player.worldLevel, i_3_, i) - camera.getLookAt().z;
+        i_4_ = Scene.getFloorDrawHeight(Player.worldLevel, i_3_, i) - camera.getLookAt().z;
         int i_5_ = -newZ + i_4_;
         int i_6_ = i - newY;
         int i_7_ = i_3_ - newX;
@@ -1586,7 +1586,7 @@ else if(ChatBox.dialogueId != -1)
                             WallDecoration.durationHoveredOverWidget--;
                         Item.calculateCameraPosition();
                         if(Player.cutsceneActive)
-                            method165();
+                            moveTowardsTarget();
                         for(int i_19_ = 0; i_19_ < 5; i_19_++)
                             SceneCamera.customCameraTimer[i_19_]++;
                         MovedStatics.manageTextInputs();

src/main/java/org/runejs/client/MovedStatics.java

@@ -185,7 +185,7 @@ public static void method440() {
             ProducingGraphicsBuffer.aProducingGraphicsBuffer_1631 = null;
             Class51.aProducingGraphicsBuffer_1206 = null;
             Landscape.anIntArray1168 = null;
-            Class40_Sub5_Sub17_Sub6.anIntArray3255 = null;
+            SpotAnim.anIntArray3255 = null;
             Class59.imgLoginScreenButton = null;
             anIntArray1445 = null;
             Class40_Sub5_Sub15.loginScreenBox = null;
@@ -195,7 +195,7 @@ public static void method440() {
             GameObjectDefinition.aProducingGraphicsBuffer_2524 = null;
             Class39.aClass40_Sub5_Sub14_Sub4_918 = null;
             MovedStatics.aClass40_Sub5_Sub14_Sub2Array535 = null;
-            Class40_Sub5_Sub17_Sub6.anIntArray3248 = null;
+            SpotAnim.anIntArray3248 = null;
             MovedStatics.loginBoxGraphics = null;
             SceneTile.aClass40_Sub5_Sub14_Sub4_2043 = null;
             anIntArray178 = null;
@@ -334,18 +334,18 @@ public static void initiateVertexHeights(int offsetY, int sizeY, int sizeX, int
         }
     }
 
-    public static void method1000() {
-        for (Class40_Sub5_Sub17_Sub6 class40_sub5_sub17_sub6 = (Class40_Sub5_Sub17_Sub6) Class57.aLinkedList_1332.peekFirst(); class40_sub5_sub17_sub6 != null; class40_sub5_sub17_sub6 = (Class40_Sub5_Sub17_Sub6) Class57.aLinkedList_1332.pollFirst()) {
-            if (Player.worldLevel == class40_sub5_sub17_sub6.anInt3239 && !class40_sub5_sub17_sub6.aBoolean3237) {
-                if (pulseCycle >= class40_sub5_sub17_sub6.anInt3230) {
-                    class40_sub5_sub17_sub6.method834(anInt199);
-                    if (class40_sub5_sub17_sub6.aBoolean3237)
-                        class40_sub5_sub17_sub6.unlink();
+    public static void renderSpotAnims() {
+        for (SpotAnim spotAnim = (SpotAnim) Class57.aLinkedList_1332.peekFirst(); spotAnim != null; spotAnim = (SpotAnim) Class57.aLinkedList_1332.pollFirst()) {
+            if (Player.worldLevel == spotAnim.plane && !spotAnim.animationFinished) {
+                if (pulseCycle >= spotAnim.startCycle) {
+                    spotAnim.method834(anInt199);
+                    if (spotAnim.animationFinished)
+                        spotAnim.unlink();
                     else
-                        Npc.currentScene.method134(class40_sub5_sub17_sub6.anInt3239, class40_sub5_sub17_sub6.anInt3244, class40_sub5_sub17_sub6.anInt3235, class40_sub5_sub17_sub6.anInt3231, 60, class40_sub5_sub17_sub6, 0, -1, false);
+                        Npc.currentScene.method134(spotAnim.plane, spotAnim.x, spotAnim.y, spotAnim.z, 60, spotAnim, 0, -1, false);
                 }
             } else
-                class40_sub5_sub17_sub6.unlink();
+                spotAnim.unlink();
         }
     }
 
@@ -359,7 +359,7 @@ public static int method546() {
 
         Point3d cameraPos = Main.cutsceneCamera.getPosition();
 
-        int i = Class37.getFloorDrawHeight(Player.worldLevel, cameraPos.x, cameraPos.y);
+        int i = Scene.getFloorDrawHeight(Player.worldLevel, cameraPos.x, cameraPos.y);
         if (i + -cameraPos.z < 800 && (OverlayDefinition.tile_flags[Player.worldLevel][cameraPos.x >> 7][cameraPos.y >> 7] & 0x4) != 0)
             return Player.worldLevel;
         return 3;
@@ -435,15 +435,15 @@ public static RSString intToStr(int arg0) {
         return PacketBuffer.method521(false, 10, arg0);
     }
 
-    public static void method335() {
+    public static void renderProjectiles() {
         Projectile projectile = (Projectile) Class43.projectileQueue.peekFirst();
         for (/**/; projectile != null; projectile = (Projectile) Class43.projectileQueue.pollFirst()) {
             if (Player.worldLevel == projectile.anInt2981 && pulseCycle <= projectile.endCycle) {
                 if (projectile.delay <= pulseCycle) {
                     if (projectile.entityIndex > 0) {
                         Npc class40_sub5_sub17_sub4_sub2 = Player.npcs[-1 + projectile.entityIndex];
                         if (class40_sub5_sub17_sub4_sub2 != null && class40_sub5_sub17_sub4_sub2.worldX >= 0 && class40_sub5_sub17_sub4_sub2.worldX < 13312 && class40_sub5_sub17_sub4_sub2.worldY >= 0 && class40_sub5_sub17_sub4_sub2.worldY < 13312)
-                            projectile.trackTarget(pulseCycle, 61 + -61, class40_sub5_sub17_sub4_sub2.worldY, Class37.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub2.worldX, class40_sub5_sub17_sub4_sub2.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub2.worldX);
+                            projectile.trackTarget(pulseCycle, 61 + -61, class40_sub5_sub17_sub4_sub2.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub2.worldX, class40_sub5_sub17_sub4_sub2.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub2.worldX);
                     }
                     if (projectile.entityIndex < 0) {
                         int i = -1 + -projectile.entityIndex;
@@ -453,7 +453,7 @@ public static void method335() {
                         else
                             class40_sub5_sub17_sub4_sub1 = Player.localPlayer;
                         if (class40_sub5_sub17_sub4_sub1 != null && class40_sub5_sub17_sub4_sub1.worldX >= 0 && class40_sub5_sub17_sub4_sub1.worldX < 13312 && class40_sub5_sub17_sub4_sub1.worldY >= 0 && class40_sub5_sub17_sub4_sub1.worldY < 13312)
-                            projectile.trackTarget(pulseCycle, 0, class40_sub5_sub17_sub4_sub1.worldY, Class37.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub1.worldX, class40_sub5_sub17_sub4_sub1.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub1.worldX);
+                            projectile.trackTarget(pulseCycle, 0, class40_sub5_sub17_sub4_sub1.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub1.worldX, class40_sub5_sub17_sub4_sub1.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub1.worldX);
                     }
                     projectile.move(anInt199);
                     Npc.currentScene.method134(Player.worldLevel, (int) projectile.currentX, (int) projectile.currentY, (int) projectile.currentHeight, 60, projectile, projectile.anInt3013, -1, false);
@@ -518,7 +518,7 @@ public static void method973() {
         OverlayDefinition.tile_underlay_path = null;
         MouseHandler.tile_overlayids = null;
         tile_underlayids = null;
-        Class40_Sub5_Sub17_Sub6.blendedHue = null;
+        SpotAnim.blendedHue = null;
     }
 
     public static void printException(String arg0, Throwable exception) {
@@ -622,7 +622,7 @@ public static void method836(int arg0) {
         for (int i_6_ = 1; i_6_ < i - 1; i_6_++) {
             for (int i_7_ = 1; i_7_ < 127; i_7_++) {
                 int i_8_ = i_7_ + (i_6_ << 7);
-                Class40_Sub5_Sub17_Sub6.anIntArray3255[i_8_] = (anIntArray178[i_8_ + 1] + anIntArray178[i_8_ - 1] - (-anIntArray178[-128 + i_8_] - anIntArray178[128 + i_8_])) / 4;
+                SpotAnim.anIntArray3255[i_8_] = (anIntArray178[i_8_ + 1] + anIntArray178[i_8_ - 1] - (-anIntArray178[-128 + i_8_] - anIntArray178[128 + i_8_])) / 4;
             }
         }
         RSRuntimeException.anInt1641 += 128;
@@ -634,7 +634,7 @@ public static void method836(int arg0) {
         for (int i_10_ = 1; i_10_ < -1 + i; i_10_++) {
             for (int i_11_ = 1; i_11_ < 127; i_11_++) {
                 int i_12_ = i_11_ + (i_10_ << 7);
-                int i_13_ = -(Landscape.anIntArray1168[i_12_ + RSRuntimeException.anInt1641 & -1 + Landscape.anIntArray1168.length] / 5) + Class40_Sub5_Sub17_Sub6.anIntArray3255[i_12_ + 128];
+                int i_13_ = -(Landscape.anIntArray1168[i_12_ + RSRuntimeException.anInt1641 & -1 + Landscape.anIntArray1168.length] / 5) + SpotAnim.anIntArray3255[i_12_ + 128];
                 if (i_13_ < 0)
                     i_13_ = 0;
                 anIntArray178[i_12_] = i_13_;
@@ -1960,7 +1960,7 @@ public static void method312(int arg0, int arg1, int arg2, int arg3) {
 	        Class44.anInt1048 = -1;
 	        ISAAC.anInt522 = -1;
 	    } else {
-	        int i = Class37.getFloorDrawHeight(Player.worldLevel, arg2, arg1) + -arg0;
+	        int i = Scene.getFloorDrawHeight(Player.worldLevel, arg2, arg1) + -arg0;
 
             Point3d cameraPos = Main.getActiveCamera().getPosition();
             CameraRotation rotation = Main.getActiveCamera().getRotation();

src/main/java/org/runejs/client/Projectile.java

@@ -189,7 +189,7 @@ public static void method763(Component arg0, CacheArchive arg2) {
             GameObject.tabPieceLeft = MovedStatics.createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
             image.drawInverse(0, 0);
             image = HuffmanEncoding.method1028(arg2, Native.imgBacktop1, Native.aClass1_305);
-            Class40_Sub5_Sub17_Sub6.framePieceTop = MovedStatics.createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
+            SpotAnim.framePieceTop = MovedStatics.createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
             image.drawInverse(0, 0);
             image = HuffmanEncoding.method1028(arg2, Native.imgBackvmid1, Native.aClass1_305);
             Class40_Sub7.mapBackRight = MovedStatics.createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
@@ -627,7 +627,7 @@ else if(face == 3)
 
     public Model getRotatedModel() {
         SpotAnimDefinition spotAnimDefinition = SpotAnimDefinition.forId(graphicsId);
-        Model class40_sub5_sub17_sub5 = spotAnimDefinition.method549(animationFrame);
+        Model class40_sub5_sub17_sub5 = spotAnimDefinition.getModel(animationFrame);
         if(class40_sub5_sub17_sub5 == null)
             return null;
         class40_sub5_sub17_sub5.method804(anInt2976);