Skip to content

Commit 93a8e72

Browse files
JameskmongerJameskmonger
committed
refactor: move statics from SpotAnim
1 parent c34de29 commit 93a8e72

File tree

6 files changed

+87
-92
lines changed

6 files changed

+87
-92
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ private static void method836(int arg0) {
487487
for (int i_6_ = 1; i_6_ < i - 1; i_6_++) {
488488
for (int i_7_ = 1; i_7_ < 127; i_7_++) {
489489
int i_8_ = i_7_ + (i_6_ << 7);
490-
SpotAnim.anIntArray3255[i_8_] = (MovedStatics.anIntArray178[i_8_ + 1] + MovedStatics.anIntArray178[i_8_ - 1] - (-MovedStatics.anIntArray178[-128 + i_8_] - MovedStatics.anIntArray178[128 + i_8_])) / 4;
490+
MovedStatics.anIntArray3255[i_8_] = (MovedStatics.anIntArray178[i_8_ + 1] + MovedStatics.anIntArray178[i_8_ - 1] - (-MovedStatics.anIntArray178[-128 + i_8_] - MovedStatics.anIntArray178[128 + i_8_])) / 4;
491491
}
492492
}
493493
RSRuntimeException.anInt1641 += 128;
@@ -499,7 +499,7 @@ private static void method836(int arg0) {
499499
for (int i_10_ = 1; i_10_ < -1 + i; i_10_++) {
500500
for (int i_11_ = 1; i_11_ < 127; i_11_++) {
501501
int i_12_ = i_11_ + (i_10_ << 7);
502-
int i_13_ = -(Landscape.anIntArray1168[i_12_ + RSRuntimeException.anInt1641 & -1 + Landscape.anIntArray1168.length] / 5) + SpotAnim.anIntArray3255[i_12_ + 128];
502+
int i_13_ = -(Landscape.anIntArray1168[i_12_ + RSRuntimeException.anInt1641 & -1 + Landscape.anIntArray1168.length] / 5) + MovedStatics.anIntArray3255[i_12_ + 128];
503503
if (i_13_ < 0)
504504
i_13_ = 0;
505505
MovedStatics.anIntArray178[i_12_] = i_13_;
@@ -630,20 +630,20 @@ public static void renderLoginScreen(Component arg0, CacheArchive huffmanCacheAr
630630
Renderable.anIntArray2865[128 + i] = i * 262144 + 65535;
631631
for (int i = 0; i < 64; i++)
632632
Renderable.anIntArray2865[i + 192] = 16777215;
633-
SpotAnim.anIntArray3248 = new int[256];
633+
MovedStatics.anIntArray3248 = new int[256];
634634
for (int i = 0; i < 64; i++)
635-
SpotAnim.anIntArray3248[i] = i * 4;
635+
MovedStatics.anIntArray3248[i] = i * 4;
636636
for (int i = 0; i < 64; i++)
637-
SpotAnim.anIntArray3248[64 + i] = 255 + i * 262144;
637+
MovedStatics.anIntArray3248[64 + i] = 255 + i * 262144;
638638
for (int i = 0; i < 64; i++)
639-
SpotAnim.anIntArray3248[128 + i] = i * 1024 + 16711935;
639+
MovedStatics.anIntArray3248[128 + i] = i * 1024 + 16711935;
640640
for (int i = 0; i < 64; i++)
641-
SpotAnim.anIntArray3248[192 + i] = 16777215;
641+
MovedStatics.anIntArray3248[192 + i] = 16777215;
642642
MovedStatics.anIntArray1013 = new int[256];
643643
MovedStatics.anIntArray1445 = new int[32768];
644644
Landscape.anIntArray1168 = new int[32768];
645645
method879(null);
646-
SpotAnim.anIntArray3255 = new int[32768];
646+
MovedStatics.anIntArray3255 = new int[32768];
647647
Native.username = Configuration.getUsername();
648648
Native.password = Configuration.getPassword();
649649
MovedStatics.anIntArray178 = new int[32768];

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ private static void createRegion(Scene scene, CollisionMap[] collisionMaps) {
506506
}
507507
int underlayMinimapColour = 0;
508508
if(hslBitsetRandomised != -1)
509-
underlayMinimapColour = Rasterizer3D.hsl2rgb[SpotAnim.mixLightness(hslBitsetRandomised, 96)];
509+
underlayMinimapColour = Rasterizer3D.hsl2rgb[mixLightness(hslBitsetRandomised, 96)];
510510
if(overlayId != 0) {
511511
int shape = 1 + tile_underlay_path[_plane][x][y];
512512
byte rotation = tile_overlay_rotation[_plane][x][y];
@@ -545,9 +545,9 @@ else if(s > 255)
545545
overlayMinimapColour = Class13.generateHslBitset(overlayDefinition.otherLightness, i_55_, i_54_);
546546
rgb = Rasterizer3D.hsl2rgb[MovedStatics.mixLightnessSigned(overlayMinimapColour, 96)];
547547
}
548-
scene.addTile(_plane, x, y, shape, rotation, textureId, vertexHeightSW, vertexHeightSE, vertexHeightNE, vertexHeightNW, SpotAnim.mixLightness(hslBitsetOriginal, lightIntensitySW), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensitySE), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensityNE), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensityNW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNW), underlayMinimapColour, rgb);
548+
scene.addTile(_plane, x, y, shape, rotation, textureId, vertexHeightSW, vertexHeightSE, vertexHeightNE, vertexHeightNW, mixLightness(hslBitsetOriginal, lightIntensitySW), mixLightness(hslBitsetOriginal, lightIntensitySE), mixLightness(hslBitsetOriginal, lightIntensityNE), mixLightness(hslBitsetOriginal, lightIntensityNW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNW), underlayMinimapColour, rgb);
549549
} else
550-
scene.addTile(_plane, x, y, 0, 0, -1, vertexHeightSW, vertexHeightSE, vertexHeightNE, vertexHeightNW, SpotAnim.mixLightness(hslBitsetOriginal, lightIntensitySW), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensitySE), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensityNE), SpotAnim.mixLightness(hslBitsetOriginal, lightIntensityNW), 0, 0, 0, 0, underlayMinimapColour, 0);
550+
scene.addTile(_plane, x, y, 0, 0, -1, vertexHeightSW, vertexHeightSE, vertexHeightNE, vertexHeightNW, mixLightness(hslBitsetOriginal, lightIntensitySW), mixLightness(hslBitsetOriginal, lightIntensitySE), mixLightness(hslBitsetOriginal, lightIntensityNE), mixLightness(hslBitsetOriginal, lightIntensityNW), 0, 0, 0, 0, underlayMinimapColour, 0);
551551
}
552552
}
553553
}
@@ -923,4 +923,17 @@ public static void constructMapRegion(boolean generatedMap) {
923923
Actor.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
924924
}
925925
}
926+
927+
private static int mixLightness(int hsl, int lightness) {
928+
if(hsl == -1)
929+
return 12345678;
930+
931+
lightness = (0x7f & hsl) * lightness / 128;
932+
if(lightness < 2)
933+
lightness = 2;
934+
else if(lightness > 126)
935+
lightness = 126;
936+
937+
return lightness + (hsl & 0xff80);
938+
}
926939
}

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

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,11 +606,11 @@ public static void renderFlames() {
606606
if (MovedStatics.anInt2613 > 0) {
607607
for (int i = 0; i < 256; i++) {
608608
if (MovedStatics.anInt2613 > 768)
609-
MovedStatics.anIntArray1013[i] = MovedStatics.method614(Class51.anIntArray1198[i], SpotAnim.anIntArray3248[i], -MovedStatics.anInt2613 + 1024);
609+
MovedStatics.anIntArray1013[i] = MovedStatics.method614(Class51.anIntArray1198[i], MovedStatics.anIntArray3248[i], -MovedStatics.anInt2613 + 1024);
610610
else if (MovedStatics.anInt2613 > 256)
611-
MovedStatics.anIntArray1013[i] = SpotAnim.anIntArray3248[i];
611+
MovedStatics.anIntArray1013[i] = MovedStatics.anIntArray3248[i];
612612
else
613-
MovedStatics.anIntArray1013[i] = MovedStatics.method614(SpotAnim.anIntArray3248[i], Class51.anIntArray1198[i], -MovedStatics.anInt2613 + 256);
613+
MovedStatics.anIntArray1013[i] = MovedStatics.method614(MovedStatics.anIntArray3248[i], Class51.anIntArray1198[i], -MovedStatics.anInt2613 + 256);
614614
}
615615
} else {
616616
System.arraycopy(Class51.anIntArray1198, 0, MovedStatics.anIntArray1013, 0, 256);
@@ -819,9 +819,9 @@ public static void setConfigToDefaults() {
819819

820820
public static void method353() {
821821
MovedStatics.anInt2628++;
822-
SpotAnim.renderPlayers(0, true);
822+
renderPlayers(0, true);
823823
renderNPCs(true);
824-
SpotAnim.renderPlayers(0, false);
824+
renderPlayers(0, false);
825825
renderNPCs(false);
826826
MovedStatics.renderProjectiles();
827827
MovedStatics.renderSpotAnims();
@@ -1876,7 +1876,7 @@ private static void method947(int arg0) {
18761876
}
18771877
}
18781878

1879-
public static void renderNPCs(boolean arg0) {
1879+
private static void renderNPCs(boolean arg0) {
18801880
for(int i = 0; Player.npcCount > i; i++) {
18811881
Npc npc = Player.npcs[Player.npcIds[i]];
18821882
int i_15_ = 536870912 + (Player.npcIds[i] << 14);
@@ -1899,6 +1899,53 @@ public static void renderNPCs(boolean arg0) {
18991899
}
19001900
}
19011901

1902+
private static void renderPlayers(int arg0, boolean arg1) {
1903+
if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY) {
1904+
MovedStatics.destinationX = 0;
1905+
1906+
DebugTools.walkpathX = null;
1907+
DebugTools.walkpathY = null;
1908+
}
1909+
int i = Player.localPlayerCount;
1910+
if(arg1)
1911+
i = 1;
1912+
int i_0_ = arg0;
1913+
for(/**/; i > i_0_; i_0_++) {
1914+
int i_1_;
1915+
Player player;
1916+
if(arg1) {
1917+
i_1_ = 33538048;
1918+
player = Player.localPlayer;
1919+
} else {
1920+
i_1_ = Player.trackedPlayerIndices[i_0_] << 14;
1921+
player = Player.trackedPlayers[Player.trackedPlayerIndices[i_0_]];
1922+
}
1923+
if(player != null && player.isInitialized()) {
1924+
player.aBoolean3287 = false;
1925+
int tileX = player.worldX >> 7;
1926+
int tileY = player.worldY >> 7;
1927+
if((VertexNormal.lowMemory && Player.localPlayerCount > 50 || Player.localPlayerCount > 200) && !arg1 && player.anInt3077 == player.idleAnimation)
1928+
player.aBoolean3287 = true;
1929+
if(tileX >= 0 && tileX < 104 && tileY >= 0 && tileY < 104) {
1930+
if(player.playerModel != null && player.anInt3283 <= MovedStatics.pulseCycle && MovedStatics.pulseCycle < player.anInt3274) {
1931+
player.aBoolean3287 = false;
1932+
player.anInt3276 = Scene.getFloorDrawHeight(Player.worldLevel, player.worldX, player.worldY);
1933+
Npc.currentScene.method112(Player.worldLevel, player.worldX, player.worldY, player.anInt3276, 60, player, player.anInt3118, i_1_, player.anInt3258, player.anInt3281, player.anInt3262, player.anInt3289);
1934+
} else {
1935+
if((0x7f & player.worldX) == 64 && (player.worldY & 0x7f) == 64) {
1936+
if(MovedStatics.anInt2628 == MovedStatics.anIntArrayArray1435[tileX][tileY])
1937+
continue;
1938+
MovedStatics.anIntArrayArray1435[tileX][tileY] = MovedStatics.anInt2628;
1939+
}
1940+
player.anInt3276 = Scene.getFloorDrawHeight(Player.worldLevel, player.worldX, player.worldY);
1941+
Npc.currentScene.method134(Player.worldLevel, player.worldX, player.worldY, player.anInt3276, 60, player, player.anInt3118, i_1_, player.aBoolean3105);
1942+
}
1943+
}
1944+
}
1945+
}
1946+
1947+
}
1948+
19021949
public void method35(int arg1) {
19031950
if (currentPort != gameServerPort)
19041951
currentPort = gameServerPort;

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ public class MovedStatics {
198198
public static int hoveredWidgetChildId = -1;
199199
public static int[] directions = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792};
200200
public static int menuScreenArea;
201+
public static ProducingGraphicsBuffer framePieceTop;
202+
public static int[] anIntArray3253;
203+
public static int[] anIntArray3255;
204+
public static int[] anIntArray3248;
201205

202206
public static void method440() {
203207
if (ISAAC.aBoolean512) {
@@ -206,7 +210,7 @@ public static void method440() {
206210
ProducingGraphicsBuffer.aProducingGraphicsBuffer_1631 = null;
207211
Class51.aProducingGraphicsBuffer_1206 = null;
208212
Landscape.anIntArray1168 = null;
209-
SpotAnim.anIntArray3255 = null;
213+
anIntArray3255 = null;
210214
Class59.imgLoginScreenButton = null;
211215
anIntArray1445 = null;
212216
Class40_Sub5_Sub15.loginScreenBox = null;
@@ -216,7 +220,7 @@ public static void method440() {
216220
aProducingGraphicsBuffer_2524 = null;
217221
Class39.aClass40_Sub5_Sub14_Sub4_918 = null;
218222
MovedStatics.aClass40_Sub5_Sub14_Sub2Array535 = null;
219-
SpotAnim.anIntArray3248 = null;
223+
anIntArray3248 = null;
220224
MovedStatics.loginBoxGraphics = null;
221225
SceneTile.aClass40_Sub5_Sub14_Sub4_2043 = null;
222226
anIntArray178 = null;
@@ -1661,7 +1665,7 @@ private static void method344(int arg0) {
16611665
Renderable.tabHighlightImageBottomLeftEdge = null;
16621666
Class24.fullScreenTextureArray = null;
16631667
PlayerAppearance.tabPieveLowerRight = null;
1664-
SpotAnim.framePieceTop = null;
1668+
framePieceTop = null;
16651669
Class44.chatboxBackgroundImage = null;
16661670
}
16671671
}
@@ -2121,7 +2125,7 @@ public static void drawWelcomeScreenGraphics() {
21212125
chatboxRight.drawGraphics(0, 357, graphics);
21222126
Class39.mapbackLeft.drawGraphics(722, 4, graphics);
21232127
GameObject.tabPieceLeft.drawGraphics(743, 205, graphics);
2124-
SpotAnim.framePieceTop.drawGraphics(0, 0, graphics);
2128+
framePieceTop.drawGraphics(0, 0, graphics);
21252129
Class40_Sub7.mapBackRight.drawGraphics(516, 4, graphics);
21262130
tabPieceUpperRight.drawGraphics(516, 205, graphics);
21272131
PlayerAppearance.tabPieveLowerRight.drawGraphics(496, 357, graphics);
@@ -2165,7 +2169,7 @@ public static void method763(Component arg0, CacheArchive arg2) {
21652169
GameObject.tabPieceLeft = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
21662170
image.drawInverse(0, 0);
21672171
image = method1028(arg2, Native.imgBacktop1, Native.aClass1_305);
2168-
SpotAnim.framePieceTop = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
2172+
framePieceTop = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
21692173
image.drawInverse(0, 0);
21702174
image = method1028(arg2, Native.imgBackvmid1, Native.aClass1_305);
21712175
Class40_Sub7.mapBackRight = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);

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

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,10 @@
22

33
import org.runejs.client.cache.media.AnimationSequence;
44
import org.runejs.client.cache.def.SpotAnimDefinition;
5-
import org.runejs.client.frame.DebugTools;
6-
import org.runejs.client.media.VertexNormal;
75
import org.runejs.client.media.renderable.Model;
86
import org.runejs.client.media.renderable.Renderable;
9-
import org.runejs.client.media.renderable.actor.Npc;
10-
import org.runejs.client.media.renderable.actor.Player;
11-
import org.runejs.client.scene.Scene;
127

138
public class SpotAnim extends Renderable {
14-
public static ProducingGraphicsBuffer framePieceTop;
15-
public static int[] anIntArray3248;
16-
public static int[] anIntArray3253;
17-
public static int[] anIntArray3255;
189

1910
public int startCycle;
2011
public int z;
@@ -45,66 +36,6 @@ public SpotAnim(int id, int plane, int x, int y, int z, int delay, int cycle) {
4536

4637
}
4738

48-
public static int mixLightness(int hsl, int lightness) {
49-
if(hsl == -1)
50-
return 12345678;
51-
52-
lightness = (0x7f & hsl) * lightness / 128;
53-
if(lightness < 2)
54-
lightness = 2;
55-
else if(lightness > 126)
56-
lightness = 126;
57-
58-
return lightness + (hsl & 0xff80);
59-
}
60-
61-
public static void renderPlayers(int arg0, boolean arg1) {
62-
if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY) {
63-
MovedStatics.destinationX = 0;
64-
65-
DebugTools.walkpathX = null;
66-
DebugTools.walkpathY = null;
67-
}
68-
int i = Player.localPlayerCount;
69-
if(arg1)
70-
i = 1;
71-
int i_0_ = arg0;
72-
for(/**/; i > i_0_; i_0_++) {
73-
int i_1_;
74-
Player player;
75-
if(arg1) {
76-
i_1_ = 33538048;
77-
player = Player.localPlayer;
78-
} else {
79-
i_1_ = Player.trackedPlayerIndices[i_0_] << 14;
80-
player = Player.trackedPlayers[Player.trackedPlayerIndices[i_0_]];
81-
}
82-
if(player != null && player.isInitialized()) {
83-
player.aBoolean3287 = false;
84-
int tileX = player.worldX >> 7;
85-
int tileY = player.worldY >> 7;
86-
if((VertexNormal.lowMemory && Player.localPlayerCount > 50 || Player.localPlayerCount > 200) && !arg1 && player.anInt3077 == player.idleAnimation)
87-
player.aBoolean3287 = true;
88-
if(tileX >= 0 && tileX < 104 && tileY >= 0 && tileY < 104) {
89-
if(player.playerModel != null && player.anInt3283 <= MovedStatics.pulseCycle && MovedStatics.pulseCycle < player.anInt3274) {
90-
player.aBoolean3287 = false;
91-
player.anInt3276 = Scene.getFloorDrawHeight(Player.worldLevel, player.worldX, player.worldY);
92-
Npc.currentScene.method112(Player.worldLevel, player.worldX, player.worldY, player.anInt3276, 60, player, player.anInt3118, i_1_, player.anInt3258, player.anInt3281, player.anInt3262, player.anInt3289);
93-
} else {
94-
if((0x7f & player.worldX) == 64 && (player.worldY & 0x7f) == 64) {
95-
if(MovedStatics.anInt2628 == MovedStatics.anIntArrayArray1435[tileX][tileY])
96-
continue;
97-
MovedStatics.anIntArrayArray1435[tileX][tileY] = MovedStatics.anInt2628;
98-
}
99-
player.anInt3276 = Scene.getFloorDrawHeight(Player.worldLevel, player.worldX, player.worldY);
100-
Npc.currentScene.method134(Player.worldLevel, player.worldX, player.worldY, player.anInt3276, 60, player, player.anInt3118, i_1_, player.aBoolean3105);
101-
}
102-
}
103-
}
104-
}
105-
106-
}
107-
10839

10940
public Model getRotatedModel() {
11041
SpotAnimDefinition spotAnimDefinition = SpotAnimDefinition.forId(id);

‎src/main/java/org/runejs/client/cache/def/ItemDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static ImageRGB sprite(int stackSize, int id, int backColour) {
155155
int i_9_ = Rasterizer3D.viewportRx;
156156
ImageRGB rendered = new ImageRGB(32, 32);
157157
Rasterizer.prepare(rendered.pixels, 32, 32);
158-
SpotAnim.anIntArray3253 = Rasterizer3D.setLineOffsets(SpotAnim.anIntArray3253);
158+
MovedStatics.anIntArray3253 = Rasterizer3D.setLineOffsets(MovedStatics.anIntArray3253);
159159
Rasterizer.drawFilledRectangle(0, 0, 32, 32, 0);
160160
int i_11_ = definition.zoom2d;
161161
if(backColour == -1)

0 commit comments

Comments
 (0)