refactor: move occluders to instance

Author: Jameskmonger

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

@@ -613,7 +613,7 @@ else if(s > 255)
                                 int i_72_ = 240;
                                 int i_73_ = -i_72_ + tile_height[i_68_][x][i_65_];
                                 int i_74_ = tile_height[i_67_][x][i_65_];
-                                Scene.createOccluder(plane, 1, 128 * x, 128 * x, 128 * i_65_, 128 + 128 * i_66_, i_73_, i_74_);
+                                Game.currentScene.createOccluder(plane, 1, 128 * x, 128 * x, 128 * i_65_, 128 + 128 * i_66_, i_73_, i_74_);
                                 for(int i_75_ = i_67_; i_75_ <= i_68_; i_75_++) {
                                     for(int i_76_ = i_65_; i_76_ <= i_66_; i_76_++)
                                         tileCullingBitsets[i_75_][x][i_76_] = BitUtils.bitWiseAND(tileCullingBitsets[i_75_][x][i_76_], renderRule1 ^ 0xffffffff);
@@ -652,7 +652,7 @@ else if(s > 255)
                                 int lowestOcclusionVertexHeight = tile_height[lowestOcclusionPlane][lowestOcclusionX][y];
                                 int highestOcclusionVertexHeightOffset = 240;
                                 int highestOcclusionVertexHeight = tile_height[highestOcclusionPlane][lowestOcclusionX][y] - highestOcclusionVertexHeightOffset;
-                                Scene.createOccluder(plane, 2, 128 * lowestOcclusionX, 128 * highestOcclusionX + 128, 128 * y, y * 128, highestOcclusionVertexHeight, lowestOcclusionVertexHeight);
+                                Game.currentScene.createOccluder(plane, 2, 128 * lowestOcclusionX, 128 * highestOcclusionX + 128, 128 * y, y * 128, highestOcclusionVertexHeight, lowestOcclusionVertexHeight);
                                 for(int occludedPlane = lowestOcclusionPlane; highestOcclusionPlane >= occludedPlane; occludedPlane++) {
                                     for(int occludedX = lowestOcclusionX; occludedX <= highestOcclusionX; occludedX++)
                                         tileCullingBitsets[occludedPlane][occludedX][y] = BitUtils.bitWiseAND(tileCullingBitsets[occludedPlane][occludedX][y], i_59_ ^ 0xffffffff);
@@ -688,7 +688,7 @@ else if(s > 255)
                             }
                             if((-i_89_ + i_90_ + 1) * (1 + i_92_ - i_91_) >= 4) {
                                 int i_95_ = tile_height[_plane][i_89_][i_91_];
-                                Scene.createOccluder(plane, 4, i_89_ * 128, i_90_ * 128 + 128, 128 * i_91_, i_92_ * 128 + 128, i_95_, i_95_);
+                                Game.currentScene.createOccluder(plane, 4, i_89_ * 128, i_90_ * 128 + 128, 128 * i_91_, i_92_ * 128 + 128, i_95_, i_95_);
                                 for(int i_96_ = i_89_; i_96_ <= i_90_; i_96_++) {
                                     for(int i_97_ = i_91_; i_92_ >= i_97_; i_97_++)
                                         tileCullingBitsets[_plane][i_96_][i_97_] = BitUtils.bitWiseAND(tileCullingBitsets[_plane][i_96_][i_97_], i_60_ ^ 0xffffffff);

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

@@ -46,21 +46,18 @@ public class Scene {
     public static int mapBoundsX;
     public static int currentPositionY;
     public static int cameraPosZ;
-    public static int anInt90 = 4;
     public static int currentPositionX;
     public static int activeOccluderCount = 0;
     public static int cameraPosY;
     public static int renderCameraYawCosine;
     public static int cameraPositionTileY;
-    public static int[] cullingClusterPointer = new int[anInt90];
     public static int renderCameraYawSine;
     public static InteractiveObject[] interactiveObjects = new InteractiveObject[100];
     public static SceneCluster[] processedCullingClusters = new SceneCluster[500];
     public static LinkedList tileList = new LinkedList();
     public static int anInt109 = 0;
     public static int renderCameraPitchCosine;
     public static int mapBoundsY;
-    public static SceneCluster[][] cullingClusters = new SceneCluster[anInt90][500];
     public static int drawWidthMidpoint;
     public static int drawHeight;
     public static int drawHeightMidpoint;
@@ -108,6 +105,9 @@ public class Scene {
     public int mapSizeY = 104;
     public int mapSizeZ = 4;
 
+    private SceneCluster[][] cullingClusters = new SceneCluster[mapSizeZ][500];
+    private int[] cullingClusterPointer = new int[mapSizeZ];
+
     public Scene(int[][][] heightMap) {
         tileArray = new SceneTile[mapSizeZ][mapSizeX][mapSizeY];
         tileOcclusionCycles = new int[mapSizeZ][mapSizeX + 1][mapSizeY + 1];
@@ -255,7 +255,7 @@ public boolean isPointVisibleOnScreen(int x, int y, int z) {
     }
 
 
-    public static void createOccluder(int z, int searchMask, int lowestX, int highestX, int lowestY, int highestY, int highestZ, int lowestZ) {
+    public void createOccluder(int z, int searchMask, int lowestX, int highestX, int lowestY, int highestY, int highestZ, int lowestZ) {
         SceneCluster sceneCluster = new SceneCluster();
         sceneCluster.tileStartX = lowestX / 128;
         sceneCluster.tileEndX = highestX / 128;
@@ -568,7 +568,7 @@ public void initToNull() {
                 }
             }
         }
-        for (int i = 0; i < anInt90; i++) {
+        for (int i = 0; i < mapSizeZ; i++) {
             for (int i_39_ = 0; i_39_ < cullingClusterPointer[i]; i_39_++) {
                 cullingClusters[i][i_39_] = null;
             }