Skip to content

Commit ff5ab42

Browse files
PromisesPromises
authored
Merge pull request #175 from runejs/scene-renames
refactor: rename contents of Scene class
2 parents de1bbea + a81e995 commit ff5ab42

File tree

9 files changed

+131
-127
lines changed

9 files changed

+131
-127
lines changed

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.runejs.client.net.OutgoingPackets;
1919
import org.runejs.client.scene.InteractiveObjectTemporary;
2020
import org.runejs.client.scene.Scene;
21-
import org.runejs.client.scene.SceneCluster;
2221
import org.runejs.client.scene.util.CollisionMap;
2322
import org.runejs.client.sound.SoundSystem;
2423
import org.runejs.client.util.BitUtils;
@@ -556,15 +555,15 @@ else if(s > 255)
556555
}
557556
for(int i_56_ = 1; i_56_ < 103; i_56_++) {
558557
for(int i_57_ = 1; i_57_ < 103; i_57_++)
559-
scene.method130(_plane, i_57_, i_56_, MovedStatics.getVisibilityPlaneFor(_plane, i_56_, 0, i_57_));
558+
scene.setDrawLevel(_plane, i_57_, i_56_, MovedStatics.getVisibilityPlaneFor(_plane, i_56_, 0, i_57_));
560559
}
561560
tile_underlayids[_plane] = null;
562561
tile_overlayids[_plane] = null;
563562
tile_underlay_path[_plane] = null;
564563
tile_overlay_rotation[_plane] = null;
565564
tileShadowIntensity[_plane] = null;
566565
}
567-
scene.method118(-50, -10, -50);
566+
scene.buildModels(-50, -10, -50);
568567
for(int i = 0; i < 104; i++) {
569568
for(int i_58_ = 0; i_58_ < 104; i_58_++) {
570569
if((MovedStatics.tile_flags[1][i][i_58_] & 0x2) == 2)
@@ -1057,7 +1056,7 @@ public static void addObject(int objectId, int localX, int localY, int plane, in
10571056
renderable = gameObjectDefinition.createTerrainObjectModel(vertexHeightTopRight, vertexHeightTop, face, vertexHeight, 0, vertexHeightRight);
10581057
else
10591058
renderable = new GameObject(objectId, 0, face, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
1060-
scene.addWall(localX, localY, plane, vertexMix, SceneCluster.anIntArray761[face], 0, hash, renderable, null, objectConfig);
1059+
scene.addWall(localX, localY, plane, vertexMix, Scene.ROTATION_WALL_TYPE[face], 0, hash, renderable, null, objectConfig);
10611060
if(face == 0) {
10621061
if(gameObjectDefinition.castsShadow) {
10631062
tileShadowIntensity[plane][localX][localY] = (byte) 50;
@@ -1090,14 +1089,14 @@ public static void addObject(int objectId, int localX, int localY, int plane, in
10901089
if(gameObjectDefinition.solid && collisionMap != null)
10911090
collisionMap.unmarkWall(localX, localY, type, face, gameObjectDefinition.walkable);
10921091
if(gameObjectDefinition.setDecorDisplacement != 16)
1093-
scene.method115(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
1092+
scene.setWallDecorationOffset(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
10941093
} else if(type == 1) {
10951094
Renderable renderable;
10961095
if(gameObjectDefinition.animationId == -1 && gameObjectDefinition.childIds == null)
10971096
renderable = gameObjectDefinition.createTerrainObjectModel(vertexHeightTopRight, vertexHeightTop, face, vertexHeight, 1, vertexHeightRight);
10981097
else
10991098
renderable = new GameObject(objectId, 1, face, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
1100-
scene.addWall(localX, localY, plane, vertexMix, MovedStatics.anIntArray2788[face], 0, hash, renderable, null, objectConfig);
1099+
scene.addWall(localX, localY, plane, vertexMix, Scene.ROTATION_WALL_CORNER_TYPE[face], 0, hash, renderable, null, objectConfig);
11011100
if(gameObjectDefinition.castsShadow) {
11021101
if(face == 0)
11031102
tileShadowIntensity[plane][localX][localY + 1] = (byte) 50;
@@ -1121,7 +1120,7 @@ else if(face == 3)
11211120
renderable = new GameObject(objectId, 2, 4 + face, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
11221121
renderable_47_ = new GameObject(objectId, 2, i_46_, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
11231122
}
1124-
scene.addWall(localX, localY, plane, vertexMix, SceneCluster.anIntArray761[face], SceneCluster.anIntArray761[i_46_], hash, renderable, renderable_47_, objectConfig);
1123+
scene.addWall(localX, localY, plane, vertexMix, Scene.ROTATION_WALL_TYPE[face], Scene.ROTATION_WALL_TYPE[i_46_], hash, renderable, renderable_47_, objectConfig);
11251124
if(gameObjectDefinition.wall) {
11261125
if(face == 0) {
11271126
tileCullingBitsets[plane][localX][localY] = BitUtils.bitWiseOR(tileCullingBitsets[plane][localX][localY], 585);
@@ -1140,14 +1139,14 @@ else if(face == 3)
11401139
if(gameObjectDefinition.solid && collisionMap != null)
11411140
collisionMap.unmarkWall(localX, localY, type, face, gameObjectDefinition.walkable);
11421141
if(gameObjectDefinition.setDecorDisplacement != 16)
1143-
scene.method115(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
1142+
scene.setWallDecorationOffset(plane, localX, localY, gameObjectDefinition.setDecorDisplacement);
11441143
} else if(type == 3) {
11451144
Renderable renderable;
11461145
if(gameObjectDefinition.animationId != -1 || gameObjectDefinition.childIds != null)
11471146
renderable = new GameObject(objectId, 3, face, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
11481147
else
11491148
renderable = gameObjectDefinition.createTerrainObjectModel(vertexHeightTopRight, vertexHeightTop, face, vertexHeight, 3, vertexHeightRight);
1150-
scene.addWall(localX, localY, plane, vertexMix, MovedStatics.anIntArray2788[face], 0, hash, renderable, null, objectConfig);
1149+
scene.addWall(localX, localY, plane, vertexMix, Scene.ROTATION_WALL_CORNER_TYPE[face], 0, hash, renderable, null, objectConfig);
11511150
if(gameObjectDefinition.castsShadow) {
11521151
if(face != 0) {
11531152
if(face == 1)
@@ -1199,7 +1198,7 @@ else if(face == 3)
11991198
renderable = gameObjectDefinition.createTerrainObjectModel(vertexHeightTopRight, vertexHeightTop, 0, vertexHeight, 4, vertexHeightRight);
12001199
else
12011200
renderable = new GameObject(objectId, 4, 0, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
1202-
scene.addWallDecoration(localX, localY, plane, vertexMix, 0, 0, 512 * face, hash, renderable, objectConfig, SceneCluster.anIntArray761[face]);
1201+
scene.addWallDecoration(localX, localY, plane, vertexMix, 0, 0, 512 * face, hash, renderable, objectConfig, Scene.ROTATION_WALL_TYPE[face]);
12031202
} else if(type == 5) {
12041203
int i_51_ = scene.getWallHash(plane, localX, localY);
12051204
int i_52_ = 16;
@@ -1210,7 +1209,7 @@ else if(face == 3)
12101209
renderable = gameObjectDefinition.createTerrainObjectModel(vertexHeightTopRight, vertexHeightTop, 0, vertexHeight, 4, vertexHeightRight);
12111210
else
12121211
renderable = new GameObject(objectId, 4, 0, vertexHeight, vertexHeightRight, vertexHeightTopRight, vertexHeightTop, gameObjectDefinition.animationId, true);
1213-
scene.addWallDecoration(localX, localY, plane, vertexMix, i_52_ * MovedStatics.anIntArray666[face], MovedStatics.anIntArray2207[face] * i_52_, face * 512, hash, renderable, objectConfig, SceneCluster.anIntArray761[face]);
1212+
scene.addWallDecoration(localX, localY, plane, vertexMix, i_52_ * MovedStatics.anIntArray666[face], MovedStatics.anIntArray2207[face] * i_52_, face * 512, hash, renderable, objectConfig, Scene.ROTATION_WALL_TYPE[face]);
12141213
} else if(type == 6) {
12151214
Renderable renderable;
12161215
if(gameObjectDefinition.animationId == -1 && gameObjectDefinition.childIds == null)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ public class MovedStatics {
260260
public static boolean showIconsRedrawnText = false;
261261
public static IndexedImage[] tabIcons;
262262
public static boolean lastItemDragged = false;
263-
public static int[] anIntArray2788 = new int[]{16, 32, 64, 128};
264263
public static int randomiserHue = -8 + (int) (17.0 * Math.random());
265264
public static ProducingGraphicsBuffer mapBackRight;
266265
public static IndexedImage chatboxBackgroundImage;
@@ -1834,7 +1833,7 @@ public static ImageRGB method1028(CacheArchive arg0, String arg1, String arg3) {
18341833
public static void spawnGroundItem(int arg1, int arg2) {
18351834
LinkedList linkedList = groundItems[Player.worldLevel][arg2][arg1];
18361835
if(linkedList == null)
1837-
Game.currentScene.method125(Player.worldLevel, arg2, arg1);
1836+
Game.currentScene.removeGroundItems(Player.worldLevel, arg2, arg1);
18381837
else {
18391838
int i = -99999999;
18401839
Item item = null;
@@ -1849,7 +1848,7 @@ public static void spawnGroundItem(int arg1, int arg2) {
18491848
}
18501849
}
18511850
if(item == null)
1852-
Game.currentScene.method125(Player.worldLevel, arg2, arg1);
1851+
Game.currentScene.removeGroundItems(Player.worldLevel, arg2, arg1);
18531852
else {
18541853
Item item_34_ = null;
18551854
Item item_35_ = null;

‎src/main/java/org/runejs/client/cache/media/gameInterface/GameInterface.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,9 +1253,9 @@ public static void processMenuActions(int arg1) {
12531253
}
12541254
if(action == ActionRowType.WALK_HERE.getId()) {
12551255
if(MovedStatics.menuOpen) {
1256-
Game.currentScene.method120(-4 + i, -4 + i_10_);
1256+
Game.currentScene.click(-4 + i, -4 + i_10_);
12571257
} else {
1258-
Game.currentScene.method120(MouseHandler.clickX - 4, -4 + MouseHandler.clickY);
1258+
Game.currentScene.click(MouseHandler.clickX - 4, -4 + MouseHandler.clickY);
12591259
}
12601260
}
12611261
if(action == ActionRowType.EXAMINE_ITEM_ON_V1_WIDGET.getId()) {

‎src/main/java/org/runejs/client/frame/Minimap.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ public static void method299(int arg1) {
352352
int i_2_ = 24628 + (-(512 * i_1_) + 52736) * 4;
353353
for(int i_3_ = 1; i_3_ < 103; i_3_++) {
354354
if((0x18 & MovedStatics.tile_flags[arg1][i_3_][i_1_]) == 0)
355-
Game.currentScene.method96(is, i_2_, 512, arg1, i_3_, i_1_);
355+
Game.currentScene.drawMinimapTile(is, i_2_, 512, arg1, i_3_, i_1_);
356356
if(arg1 < 3 && (MovedStatics.tile_flags[1 + arg1][i_3_][i_1_] & 0x8) != 0)
357-
Game.currentScene.method96(is, i_2_, 512, 1 + arg1, i_3_, i_1_);
357+
Game.currentScene.drawMinimapTile(is, i_2_, 512, 1 + arg1, i_3_, i_1_);
358358
i_2_ += 4;
359359
}
360360
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void handle(RotateAnimateObjectInboundMessage message) {
2929
int tileHeightX1Y1 = Landscape.tile_height[Player.worldLevel][1 + x][1 + y];
3030
int tileHeightX0Y1 = Landscape.tile_height[Player.worldLevel][x][y + 1];
3131
if (objectType == 0) {
32-
Wall wall = Game.currentScene.method126(Player.worldLevel, x, y);
32+
Wall wall = Game.currentScene.getWall(Player.worldLevel, x, y);
3333
if (wall != null) {
3434
int i_11_ = 0x7fff & wall.hash >> 14;
3535
if (objectTypeKey == 2) {
@@ -45,7 +45,7 @@ public void handle(RotateAnimateObjectInboundMessage message) {
4545
wallDecoration.renderable = new GameObject((0x1fffe268 & wallDecoration.hash) >> 14, 4, 0, tileHeightX0Y0, tileHeightX1Y0, tileHeightX1Y1, tileHeightX0Y1, animationId, false);
4646
}
4747
if (objectType == 2) {
48-
InteractiveObject interactiveObject = Game.currentScene.method107(Player.worldLevel, x, y);
48+
InteractiveObject interactiveObject = Game.currentScene.getObject(Player.worldLevel, x, y);
4949
if (objectTypeKey == 11)
5050
objectTypeKey = 10;
5151
if (interactiveObject != null)

0 commit comments

Comments
 (0)