refactor: convert Landscape to an instance, make a child of Scene

Author: Jameskmonger

src/main/java/org/runejs/OldEngine/MapDecompressor.java

@@ -132,7 +132,7 @@ public static void spawnObject(int objectId, int x, int y, int z, int rotation,
             class20 = groundData[plane];
         }
         if(localY > 0 && localX > 0 && localY < 103 && localX < 103) {
-            Landscape.addObject(objectId, localX, localY, z, rotation, type, Game.currentScene, class20);
+            Game.currentScene.landscape.addObject(objectId, localX, localY, z, rotation, type, Game.currentScene, class20);
         }
     }
 

src/main/java/org/runejs/OldEngine/ObjectDecompressor.java

@@ -135,7 +135,7 @@ public static void spawnObject(int objectId, int x, int y, int z, int rotation,
             class20 = groundData[plane];
         }
         if(localY > 0 && localX > 0 && localY < 103 && localX < 103) {
-            Landscape.addObject(objectId, localX, localY, z, rotation, type, Game.currentScene, class20);
+            Game.currentScene.landscape.addObject(objectId, localX, localY, z, rotation, type, Game.currentScene, class20);
         }
     }
 

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

@@ -2038,7 +2038,7 @@ else if (MovedStatics.obfuscatedKeyStatus[99] && !Console.console.consoleOpen)
                     int i_7_ = Player.worldLevel;
                     if (i_7_ < 3 && (0x2 & MovedStatics.tile_flags[1][i_5_][i_6_]) == 2)
                         i_7_++;
-                    int i_8_ = i_4_ + -Landscape.tile_height[i_7_][i_5_][i_6_];
+                    int i_8_ = i_4_ + -currentScene.landscape.tile_height[i_7_][i_5_][i_6_];
                     if (i_8_ > i_3_)
                         i_3_ = i_8_;
                 }
@@ -2171,7 +2171,7 @@ public void processGameLoop() {
             Class60.updateLogin();
             handleLoginScreenActions();
         } else if (gameStatusCode == 25)
-            Landscape.loadRegion();
+            currentScene.landscape.loadRegion();
         if (gameStatusCode == 30) {
             ScreenController.refreshFrameSize();
             updateGame();

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

@@ -47,12 +47,12 @@ public class Landscape {
     public static byte[][] terrainData;
     public static boolean loadGeneratedMap = false;
     public static int[] terrainDataIds;
-    public static int[][][] tile_height = new int[4][105][105];
+    public int[][][] tile_height = new int[4][105][105];
     public static int randomiserLightness = -16 + (int) (Math.random() * 33.0);
     public static int randomiserHue = -8 + (int) (17.0 * Math.random());
     private static int lowestPlane = 99;
 
-    public static void loadRegion() {
+    public void loadRegion() {
         method364(false);
         Game.anInt874 = 0;
         boolean bool = true;
@@ -254,7 +254,7 @@ public static void loadRegion() {
 
     }
 
-    private static void loadTerrainSubblock(int y, int drawX, int drawingPlane, int currentPlane, int x, int drawY, int rotation, byte[] terrainData, CollisionMap[] collisionMaps) {
+    private void loadTerrainSubblock(int y, int drawX, int drawingPlane, int currentPlane, int x, int drawY, int rotation, byte[] terrainData, CollisionMap[] collisionMaps) {
         for(int i = 0; i < 8; i++) {
             for(int yIdx = 0; yIdx < 8; yIdx++) {
                 if(x + i > 0 && i + x < 103 && y + yIdx > 0 && yIdx + y < 103)
@@ -297,7 +297,7 @@ private static int getRotatedTileY(int x, int y, int rotation) {
 
     }
 
-    private static void constructMapRegionObjects(int drawX, int drawY, int drawingPlane, int orientation, int x, int y, int plane, Scene scene, byte[] objectData, CollisionMap[] collisionMaps) {
+    private void constructMapRegionObjects(int drawX, int drawY, int drawingPlane, int orientation, int x, int y, int plane, Scene scene, byte[] objectData, CollisionMap[] collisionMaps) {
         Buffer objectBuffer = new Buffer(objectData);
         int i = -1;
         for(; ; ) {
@@ -367,7 +367,7 @@ private static int getRotatedObjectY(int x, int y, int sizeX, int sizeY, int ori
         return x;
     }
 
-    private static void createRegion(Scene scene, CollisionMap[] collisionMaps) {
+    private void createRegion(Scene scene, CollisionMap[] collisionMaps) {
         for(int plane = 0; plane < 4; plane++) {
             for(int x = 0; x < 104; x++) {
                 for(int y = 0; y < 104; y++) {
@@ -743,7 +743,7 @@ private static void method1020() {
         tile_underlayids = new byte[4][104][104];
     }
 
-    private static void loadTerrainBlock(CollisionMap[] collisions, int regionX_maybe, byte[] blockData, int offsetX, int offsetY, int regionY_maybe) {
+    private void loadTerrainBlock(CollisionMap[] collisions, int regionX_maybe, byte[] blockData, int offsetX, int offsetY, int regionY_maybe) {
         for(int i = 0; i < 4; i++) {
             for(int i_1_ = 0; i_1_ < 64; i_1_++) {
                 for(int i_2_ = 0; i_2_ < 64; i_2_++) {
@@ -763,7 +763,7 @@ private static void loadTerrainBlock(CollisionMap[] collisions, int regionX_mayb
         }
     }
 
-    private static void method922(int x, int arg1, Buffer fileData, int y, int regionY, int regionX, int level) {
+    private void method922(int x, int arg1, Buffer fileData, int y, int regionY, int regionX, int level) {
         if(x >= 0 && x < 104 && y >= 0 && y < 104) {
             MovedStatics.tile_flags[level][x][y] = (byte) 0;
             for(; ; ) {
@@ -936,7 +936,7 @@ else if(lightness > 126)
         return lightness + (hsl & 0xff80);
     }
 
-    private static void loadObjectBlock(int block_x, Scene scene, CollisionMap[] collisionMaps, byte[] block_data, int block_z) {
+    private void loadObjectBlock(int block_x, Scene scene, CollisionMap[] collisionMaps, byte[] block_data, int block_z) {
         Buffer buffer = new Buffer(block_data);
         int object_id = -1;
         for(; ; ) {
@@ -971,7 +971,7 @@ private static void loadObjectBlock(int block_x, Scene scene, CollisionMap[] col
         }
     }
 
-    public static void addObject(int objectId, int localX, int localY, int plane, int face, int type, Scene scene, CollisionMap collisionMap) {
+    public void addObject(int objectId, int localX, int localY, int plane, int face, int type, Scene scene, CollisionMap collisionMap) {
         if(!VertexNormal.lowMemory || (0x2 & MovedStatics.tile_flags[0][localX][localY]) != 0 || (0x10 & MovedStatics.tile_flags[plane][localX][localY]) == 0 && MovedStatics.onBuildTimePlane == MovedStatics.getVisibilityPlaneFor(plane, localY, 0, localX)) {
             if(lowestPlane > plane)
                 lowestPlane = plane;
@@ -1297,7 +1297,7 @@ private static void method364(boolean arg1) {
         }
     }
 
-    private static void initiateVertexHeights(int offsetY, int sizeY, int sizeX, int offsetX) {
+    private void initiateVertexHeights(int offsetY, int sizeY, int sizeX, int offsetX) {
         for (int y = offsetY; y <= offsetY + sizeY; y++) {
             for (int x = offsetX; sizeX + offsetX >= x; x++) {
                 if (x >= 0 && x < 104 && y >= 0 && y < 104) {
@@ -1315,7 +1315,7 @@ private static void initiateVertexHeights(int offsetY, int sizeY, int sizeX, int
         }
     }
 
-    private static void method455(int arg0, int arg1, int arg3) {
+    private void method455(int arg0, int arg1, int arg3) {
         for (int i = 0; i < 8; i++) {
             for (int i_0_ = 0; i_0_ < 8; i_0_++)
                 tile_height[arg1][arg3 + i][arg0 + i_0_] = 0;

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

@@ -3390,7 +3390,7 @@ public static boolean method596(int arg0, int arg1, byte junk, int arg3) {
 
     public static void startup() {
         if (loadingPercent == 0) {
-            Game.currentScene = new Scene(Landscape.tile_height);
+            Game.currentScene = new Scene();
             for (int i = 0; i < 4; i++)
                 Landscape.currentCollisionMap[i] = new CollisionMap(104, 104);
             Minimap.minimapImage = new ImageRGB(512, 512);

src/main/java/org/runejs/client/message/handler/rs435/misc/TransformPlayerToObjectMessageHandler.java

@@ -31,10 +31,10 @@ public void handle(TransformPlayerToObjectInboundMessage message) {
             player = Player.localPlayer;
         if (player != null) {
             GameObjectDefinition gameObjectDefinition = GameObjectDefinition.getDefinition(message.objectId);
-            int tileHeightX0Y0 = Landscape.tile_height[Player.worldLevel][x][y];
-            int tileHeightX0Y1 = Landscape.tile_height[Player.worldLevel][x][1 + y];
-            int tileHeightX1Y1 = Landscape.tile_height[Player.worldLevel][1 + x][1 + y];
-            int tileHeightX1Y0 = Landscape.tile_height[Player.worldLevel][x + 1][y];
+            int tileHeightX0Y0 = Game.currentScene.landscape.tile_height[Player.worldLevel][x][y];
+            int tileHeightX0Y1 = Game.currentScene.landscape.tile_height[Player.worldLevel][x][1 + y];
+            int tileHeightX1Y1 = Game.currentScene.landscape.tile_height[Player.worldLevel][1 + x][1 + y];
+            int tileHeightX1Y0 = Game.currentScene.landscape.tile_height[Player.worldLevel][x + 1][y];
             Model model = gameObjectDefinition.createTerrainObjectModel(tileHeightX1Y1, tileHeightX0Y1, message.orientation, tileHeightX0Y0, typeKey, tileHeightX1Y0);
             if (model != null) {
                 if (unknownXMax < unknownXMin) {

src/main/java/org/runejs/client/message/handler/rs435/world/object/RotateAnimateObjectMessageHandler.java

@@ -24,10 +24,10 @@ public void handle(RotateAnimateObjectInboundMessage message) {
         int animationId = message.animationId;
 
         if (x >= 0 && y >= 0 && x < 103 && y < 103) {
-            int tileHeightX0Y0 = Landscape.tile_height[Player.worldLevel][x][y];
-            int tileHeightX1Y0 = Landscape.tile_height[Player.worldLevel][x + 1][y];
-            int tileHeightX1Y1 = Landscape.tile_height[Player.worldLevel][1 + x][1 + y];
-            int tileHeightX0Y1 = Landscape.tile_height[Player.worldLevel][x][y + 1];
+            int tileHeightX0Y0 = Game.currentScene.landscape.tile_height[Player.worldLevel][x][y];
+            int tileHeightX1Y0 = Game.currentScene.landscape.tile_height[Player.worldLevel][x + 1][y];
+            int tileHeightX1Y1 = Game.currentScene.landscape.tile_height[Player.worldLevel][1 + x][1 + y];
+            int tileHeightX0Y1 = Game.currentScene.landscape.tile_height[Player.worldLevel][x][y + 1];
             if (objectType == 0) {
                 Wall wall = Game.currentScene.getWall(Player.worldLevel, x, y);
                 if (wall != null) {

src/main/java/org/runejs/client/scene/Scene.java

@@ -37,6 +37,8 @@ public class Scene {
 
     public static boolean lowMemory = true;
 
+    public final Landscape landscape = new Landscape();
+
     public SceneTile[][][] tileArray;
     public int[][][] tileOcclusionCycles;
     public int sceneSpawnRequestsCacheCurrentPos = 0;
@@ -100,10 +102,10 @@ public class Scene {
     private Camera currentCamera;
     private CameraTileVisibility tileVisibilityInfo;
 
-    public Scene(int[][][] heightMap) {
+    public Scene() {
         tileArray = new SceneTile[mapSizeZ][mapSizeX][mapSizeY];
         tileOcclusionCycles = new int[mapSizeZ][mapSizeX + 1][mapSizeY + 1];
-        this.heightMap = heightMap;
+        this.heightMap = this.landscape.tile_height;
         initToNull();
     }
 
@@ -2036,11 +2038,10 @@ public boolean isMouseWithinTriangle(int mouseX, int mouseY, int pointAY, int po
      * @param plane The current plane (or level) within the 3D space
      * @param x The x coordinate in the 3D space
      * @param y The y coordinate in the 3D space
-     * @param tileHeights A 3D array containing the heights of each tile
      * @param tileFlags A 3D array containing the flags for each tile (e.g. whether it's a bridge)
      * @return The height of the floor at the given x,y coordinate
      */
-    public int getFloorDrawHeight(int plane, int x, int y, int[][][] tileHeights, byte[][][] tileFlags) {
+    public int getFloorDrawHeight(int plane, int x, int y, byte[][][] tileFlags) {
         // Convert x and y into 'tile space' by dividing by 128 (right shifting by 7 bits)
         int groundX = x >> 7;
         int groundY = y >> 7;
@@ -2063,11 +2064,11 @@ public int getFloorDrawHeight(int plane, int x, int y, int[][][] tileHeights, by
 
         // Interpolate the height for the X-axis at Y position 'groundY' based on tile position X
         // It's a weighted average between the height at groundX and groundX+1
-        int interpolatedHeightX1 = ((128 - tilePositionX) * tileHeights[groundZ][groundX][groundY] + tilePositionX * tileHeights[groundZ][groundX + 1][groundY]) >> 7;
+        int interpolatedHeightX1 = ((128 - tilePositionX) * landscape.tile_height[groundZ][groundX][groundY] + tilePositionX * landscape.tile_height[groundZ][groundX + 1][groundY]) >> 7;
 
         // Interpolate the height for the X-axis at Y position 'groundY+1' based on tile position X
         // Similar to above, but one step forward in the Y-axis
-        int interpolatedHeightX2 = (tilePositionX * tileHeights[groundZ][groundX + 1][groundY + 1] + tileHeights[groundZ][groundX][groundY + 1] * (128 - tilePositionX)) >> 7;
+        int interpolatedHeightX2 = (tilePositionX * landscape.tile_height[groundZ][groundX + 1][groundY + 1] + landscape.tile_height[groundZ][groundX][groundY + 1] * (128 - tilePositionX)) >> 7;
 
         // Interpolate between the two interpolated X-axis heights, based on the tile position Y
         // This results in a height that takes into account the position within the tile in both the X and Y directions
@@ -2076,6 +2077,6 @@ public int getFloorDrawHeight(int plane, int x, int y, int[][][] tileHeights, by
     }
 
     public int getFloorDrawHeight(int plane, int x, int y) {
-        return getFloorDrawHeight(plane, x, y, Landscape.tile_height, MovedStatics.tile_flags);
+        return getFloorDrawHeight(plane, x, y, MovedStatics.tile_flags);
     }
 }

src/main/java/org/runejs/client/scene/util/CollisionMap.java

@@ -28,10 +28,10 @@ public CollisionMap(int arg0, int arg1) {
     public void addObject(int arg1, int arg2, int arg3, int arg4, Scene arg5, int arg7, int arg8, int arg9) {
         CollisionMap arg0 = this;
 
-        int i = Landscape.tile_height[arg2][arg9][arg8];
-        int i_0_ = Landscape.tile_height[arg2][1 + arg9][arg8];
-        int i_1_ = Landscape.tile_height[arg2][arg9][1 + arg8];
-        int i_2_ = Landscape.tile_height[arg2][arg9 + 1][arg8 + 1];
+        int i = Game.currentScene.landscape.tile_height[arg2][arg9][arg8];
+        int i_0_ = Game.currentScene.landscape.tile_height[arg2][1 + arg9][arg8];
+        int i_1_ = Game.currentScene.landscape.tile_height[arg2][arg9][1 + arg8];
+        int i_2_ = Game.currentScene.landscape.tile_height[arg2][arg9 + 1][arg8 + 1];
         GameObjectDefinition gameObjectDefinition = GameObjectDefinition.getDefinition(arg1);
         int i_3_ = i_2_ + i_0_ + i + i_1_ >> 2;
         int i_4_ = (arg7 << 6) + arg4;