Skip to content

Commit 71db9a0

Browse files
PazazPazaz
committed
chore: Renamed WorldTextureProvider
1 parent c3bdefc commit 71db9a0

File tree

6 files changed

+25
-24
lines changed

6 files changed

+25
-24
lines changed

‎src/main/java/jagex3/callstack/JagException.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.io.*;
88
import java.net.URL;
99

10+
// jag::JagException
1011
@ObfuscatedName("fa")
1112
public class JagException extends RuntimeException {
1213

‎src/main/java/jagex3/client/Client.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ public static void mainLoad() {
19461946
TitleScreen.loadString = Text.MAINLOAD90 + textures.getIndexLoadProgress() + "%";
19471947
TitleScreen.loadPos = 90;
19481948
} else {
1949-
WorldTextureProvider provider = new WorldTextureProvider(textures, sprites, 20, 0.8D, lowMem ? 64 : 128);
1949+
TextureManager provider = new TextureManager(textures, sprites, 20, 0.8D, lowMem ? 64 : 128);
19501950
Pix3D.setTextures(provider);
19511951
Pix3D.initColourTable(0.8D);
19521952

@@ -3095,7 +3095,7 @@ public static void clearCaches() {
30953095
VarpType.resetCache();
30963096
PlayerModel.resetCache();
30973097
IfType.resetCache();
3098-
((WorldTextureProvider) Pix3D.textureProvider).reset();
3098+
((TextureManager) Pix3D.textureManager).reset();
30993099
ClientScript.cache.clear();
31003100

31013101
anims.discardAllFiles();
@@ -4175,7 +4175,7 @@ public static void gameDrawMain(int var12, int var13, int var31, int var32) {
41754175

41764176
entityOverlays(var12, var13, var31, var32);
41774177
coordArrow(var12, var13);
4178-
((WorldTextureProvider) Pix3D.textureProvider).runAnims(worldUpdateNum);
4178+
((TextureManager) Pix3D.textureManager).runAnims(worldUpdateNum);
41794179
otherOverlays(var12, var13, var31, var32);
41804180

41814181
camX = var65;
@@ -5314,7 +5314,7 @@ public static void mapBuildLoop() {
53145314
LocType.mc1.clear();
53155315

53165316
if (GameShell.frame != null) {
5317-
// todo: packet name notifying the server the client is in a frame
5317+
// WINDOW_STATUS
53185318
out.p1Enc(210);
53195319
out.p4(1057001181);
53205320
}
@@ -11669,16 +11669,16 @@ public static void clientVar(int varp) {
1166911669
if (clientcode == 1) {
1167011670
if (value == 1) {
1167111671
Pix3D.initColourTable(0.9D);
11672-
((WorldTextureProvider) Pix3D.textureProvider).setBrightness(0.9D);
11672+
((TextureManager) Pix3D.textureManager).setBrightness(0.9D);
1167311673
} else if (value == 2) {
1167411674
Pix3D.initColourTable(0.8D);
11675-
((WorldTextureProvider) Pix3D.textureProvider).setBrightness(0.8D);
11675+
((TextureManager) Pix3D.textureManager).setBrightness(0.8D);
1167611676
} else if (value == 3) {
1167711677
Pix3D.initColourTable(0.7D);
11678-
((WorldTextureProvider) Pix3D.textureProvider).setBrightness(0.7D);
11678+
((TextureManager) Pix3D.textureManager).setBrightness(0.7D);
1167911679
} else if (value == 4) {
1168011680
Pix3D.initColourTable(0.6D);
11681-
((WorldTextureProvider) Pix3D.textureProvider).setBrightness(0.6D);
11681+
((TextureManager) Pix3D.textureManager).setBrightness(0.6D);
1168211682
}
1168311683

1168411684
ObjType.resetSpriteCache();

‎src/main/java/jagex3/client/ClientBuild.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ public static void finishBuild(World arg0, CollisionMap[] arg1) {
907907
int var61;
908908
int var62;
909909
if (var60 >= 0) {
910-
var61 = Pix3D.textureProvider.getAverageRgb(var60);
910+
var61 = Pix3D.textureManager.getAverageRgb(var60);
911911
var62 = -1;
912912
} else if (var59.colour == 16711935) {
913913
var62 = -2;

‎src/main/java/jagex3/dash3d/Pix3D.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class Pix3D extends Pix2D {
5757
public static int[] colourTable = new int[65536];
5858

5959
@ObfuscatedName("fx.av")
60-
public static TextureProvider textureProvider;
60+
public static TextureProvider textureManager;
6161

6262
// jag::oldscape::dash3d::Pix3D::m_divTable
6363
@ObfuscatedName("fx.ak")
@@ -155,7 +155,7 @@ public static void setOrigin(int arg0, int arg1) {
155155
// jag::oldscape::dash3d::Pix3D::SetTextures
156156
@ObfuscatedName("fx.ba(Law;)V")
157157
public static void setTextures(TextureProvider arg0) {
158-
textureProvider = arg0;
158+
textureManager = arg0;
159159
}
160160

161161
// jag::oldscape::dash3d::Pix3D::InitColourTable
@@ -1290,14 +1290,14 @@ public static void flatRaster(int[] arg0, int arg1, int arg2, int arg3, int arg4
12901290

12911291
@ObfuscatedName("fx.cp(IIIIIIIIIIIIIIIIIII)V")
12921292
public static void textureTriangle(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, int arg13, int arg14, int arg15, int arg16, int arg17, int arg18) {
1293-
int[] var19 = textureProvider.getTexels(arg18);
1293+
int[] var19 = textureManager.getTexels(arg18);
12941294
if (var19 == null) {
1295-
int var20 = textureProvider.getAverageRgb(arg18);
1295+
int var20 = textureManager.getAverageRgb(arg18);
12961296
gouraudTriangle(arg0, arg1, arg2, arg3, arg4, arg5, textureLightColour(var20, arg6), textureLightColour(var20, arg7), textureLightColour(var20, arg8));
12971297
return;
12981298
}
1299-
lowMem = textureProvider.isLowMem(arg18);
1300-
opaque = textureProvider.isOpaque(arg18);
1299+
lowMem = textureManager.isLowMem(arg18);
1300+
opaque = textureManager.isOpaque(arg18);
13011301
int var21 = arg4 - arg3;
13021302
int var22 = arg1 - arg0;
13031303
int var23 = arg5 - arg3;
@@ -2267,14 +2267,14 @@ public static void textureRaster(int[] arg0, int[] arg1, int arg2, int arg3, int
22672267
// jag::oldscape::dash3d::SoftwarePix3D::TextureTriangleAffine
22682268
@ObfuscatedName("fx.co(IIIIIIIIIIIIIIIIIII)V")
22692269
public static void textureTriangleAffine(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, int arg13, int arg14, int arg15, int arg16, int arg17, int arg18) {
2270-
int[] var19 = textureProvider.getTexels(arg18);
2270+
int[] var19 = textureManager.getTexels(arg18);
22712271
if (var19 == null) {
2272-
int var20 = textureProvider.getAverageRgb(arg18);
2272+
int var20 = textureManager.getAverageRgb(arg18);
22732273
gouraudTriangle(arg0, arg1, arg2, arg3, arg4, arg5, textureLightColour(var20, arg6), textureLightColour(var20, arg7), textureLightColour(var20, arg8));
22742274
return;
22752275
}
2276-
lowMem = textureProvider.isLowMem(arg18);
2277-
opaque = textureProvider.isOpaque(arg18);
2276+
lowMem = textureManager.isLowMem(arg18);
2277+
opaque = textureManager.isOpaque(arg18);
22782278
int var21 = arg4 - arg3;
22792279
int var22 = arg1 - arg0;
22802280
int var23 = arg5 - arg3;

src/main/java/jagex3/dash3d/WorldTextureProvider.java renamed to src/main/java/jagex3/dash3d/TextureManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import jagex3.js5.Js5;
77

88
@ObfuscatedName("bi")
9-
public class WorldTextureProvider implements TextureProvider {
9+
public class TextureManager implements TextureProvider {
1010

1111
@ObfuscatedName("bi.r")
1212
public Texture[] textures;
@@ -29,7 +29,7 @@ public class WorldTextureProvider implements TextureProvider {
2929
@ObfuscatedName("bi.j")
3030
public Js5 sprites;
3131

32-
public WorldTextureProvider(Js5 textures, Js5 sprites, int poolSize, double brightness, int resolution) {
32+
public TextureManager(Js5 textures, Js5 sprites, int poolSize, double brightness, int resolution) {
3333
this.sprites = sprites;
3434
this.poolSize = poolSize;
3535
this.field718 = this.poolSize;

‎src/main/java/jagex3/dash3d/World.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,7 +1741,7 @@ public void renderQuickGround(QuickGround underlay, int level, int arg2, int arg
17411741
Pix3D.gouraudTriangle(pz1, py3, px1, py1, px3, pz0, underlay.colourNE, underlay.colourNW, underlay.colourSE);
17421742
}
17431743
} else if (lowMem) {
1744-
int textureColor = Pix3D.textureProvider.getAverageRgb(underlay.texture);
1744+
int textureColor = Pix3D.textureManager.getAverageRgb(underlay.texture);
17451745
Pix3D.gouraudTriangle(pz1, py3, px1, py1, px3, pz0, mulLightness(textureColor, underlay.colourNE), mulLightness(textureColor, underlay.colourNW), mulLightness(textureColor, underlay.colourSE));
17461746
} else if (underlay.flat) {
17471747
Pix3D.textureTriangleAffine(pz1, py3, px1, py1, px3, pz0, underlay.colourNE, underlay.colourNW, underlay.colourSE, var21, var27, var39, var24, var30, var42, z0, z1, z3, underlay.texture);
@@ -1766,7 +1766,7 @@ public void renderQuickGround(QuickGround underlay, int level, int arg2, int arg
17661766
Pix3D.gouraudTriangle(py0, px1, py3, px0, pz0, px3, underlay.colourSW, underlay.colourSE, underlay.colourNW);
17671767
}
17681768
} else if (lowMem) {
1769-
int averageColour = Pix3D.textureProvider.getAverageRgb(underlay.texture);
1769+
int averageColour = Pix3D.textureManager.getAverageRgb(underlay.texture);
17701770
Pix3D.gouraudTriangle(py0, px1, py3, px0, pz0, px3, mulLightness(averageColour, underlay.colourSW), mulLightness(averageColour, underlay.colourSE), mulLightness(averageColour, underlay.colourNW));
17711771
} else {
17721772
Pix3D.textureTriangleAffine(py0, px1, py3, px0, pz0, px3, underlay.colourSW, underlay.colourSE, underlay.colourNW, var21, var27, var39, var24, var30, var42, z0, z1, z3, underlay.texture);
@@ -1835,7 +1835,7 @@ public void renderGround(Ground overlay, int sinEyePitch, int cosEyePitch, int s
18351835
Pix3D.gouraudTriangle(yA, yB, yC, xA, xB, xC, overlay.faceColourA[var20], overlay.faceColourB[var20], overlay.faceColourC[var20]);
18361836
}
18371837
} else if (lowMem) {
1838-
int textureColor = Pix3D.textureProvider.getAverageRgb(overlay.faceTexture[var20]);
1838+
int textureColor = Pix3D.textureManager.getAverageRgb(overlay.faceTexture[var20]);
18391839
Pix3D.gouraudTriangle(yA, yB, yC, xA, xB, xC, mulLightness(textureColor, overlay.faceColourA[var20]), mulLightness(textureColor, overlay.faceColourB[var20]), mulLightness(textureColor, overlay.faceColourC[var20]));
18401840
} else if (overlay.flat) {
18411841
Pix3D.textureTriangleAffine(yA, yB, yC, xA, xB, xC, overlay.faceColourA[var20], overlay.faceColourB[var20], overlay.faceColourC[var20], Ground.drawTextureVertexX[0], Ground.drawTextureVertexX[1], Ground.drawTextureVertexX[3], Ground.drawTextureVertexY[0], Ground.drawTextureVertexY[1], Ground.drawTextureVertexY[3], Ground.drawTextureVertexZ[0], Ground.drawTextureVertexZ[1], Ground.drawTextureVertexZ[3], overlay.faceTexture[var20]);

0 commit comments

Comments
 (0)