2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-20 13:30:30 -07:00
Code Issues Projects Releases Packages Wiki Activity

Lots of login/js5/cs2 refactoring, rename Class3_Sub14 to GlTile

Browse source
This commit is contained in:
Pazaz 2022-04-23 01:33:23 -04:00
parent 16e8148b7a
commit e5eeecd0ad
168 changed files with 3168 additions and 3161 deletions
Download patch file Download diff file Expand all files Collapse all files

62
client/src/main/java/Static156.java
View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static156 {
@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
public static byte[][] aByteArrayArray11;
public static byte[][] locationMapFilesBuffer;
@OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;")
public static Js5 js5Archive22;
@ -21,13 +21,13 @@ public final class Static156 {
public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) {
if (arg0 < 0) {
arg0 = 0;
} else if (arg0 >= Static152.anInt3594 * 128) {
arg0 = Static152.anInt3594 * 128 - 1;
} else if (arg0 >= Static152.mapSizeX * 128) {
arg0 = Static152.mapSizeX * 128 - 1;
}
if (arg2 < 0) {
arg2 = 0;
} else if (arg2 >= Static99.anInt2550 * 128) {
arg2 = Static99.anInt2550 * 128 - 1;
} else if (arg2 >= Static99.mapSizeZ * 128) {
arg2 = Static99.mapSizeZ * 128 - 1;
}
Static109.anInt2886 = MathUtils.anIntArray223[arg3];
Static121.anInt3038 = MathUtils.anIntArray225[arg3];
@ -38,21 +38,21 @@ public final class Static156 {
Static217.anInt4903 = arg2;
Static167.anInt4069 = arg0 / 128;
Static193.anInt4539 = arg2 / 128;
Static31.anInt987 = Static167.anInt4069 - Static277.anInt5855;
Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance;
if (Static31.anInt987 < 0) {
Static31.anInt987 = 0;
}
Static80.anInt4698 = Static193.anInt4539 - Static277.anInt5855;
Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance;
if (Static80.anInt4698 < 0) {
Static80.anInt4698 = 0;
}
Static2.anInt15 = Static167.anInt4069 + Static277.anInt5855;
if (Static2.anInt15 > Static152.anInt3594) {
Static2.anInt15 = Static152.anInt3594;
Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance;
if (Static2.anInt15 > Static152.mapSizeX) {
Static2.anInt15 = Static152.mapSizeX;
}
Static215.anInt4866 = Static193.anInt4539 + Static277.anInt5855;
if (Static215.anInt4866 > Static99.anInt2550) {
Static215.anInt4866 = Static99.anInt2550;
Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance;
if (Static215.anInt4866 > Static99.mapSizeZ) {
Static215.anInt4866 = Static99.mapSizeZ;
}
@Pc(99) short local99;
if (GlRenderer.enabled) {
@ -62,28 +62,28 @@ public final class Static156 {
}
@Pc(104) int local104;
@Pc(113) int local113;
for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 2; local104++) {
for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 2; local113++) {
@Pc(130) int local130 = (local104 - Static277.anInt5855 << 7) - (Static149.anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - Static277.anInt5855 << 7) - (Static217.anInt4903 & 0x7F);
@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.anInt5855;
@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.anInt5855;
if (local146 >= 0 && local152 >= 0 && local146 < Static152.anInt3594 && local152 < Static99.anInt2550) {
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) {
@Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance;
@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance;
if (local146 >= 0 && local152 >= 0 && local146 < Static152.mapSizeX && local152 < Static99.mapSizeZ) {
@Pc(176) int local176;
if (Static80.anIntArrayArrayArray19 == null) {
local176 = Static107.anIntArrayArrayArray10[0][local146][local152] + 128 - Static162.anInt3947;
if (Static80.underWaterTileHeightMap == null) {
local176 = Static107.surfaceTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947;
} else {
local176 = Static80.anIntArrayArrayArray19[0][local146][local152] + 128 - Static162.anInt3947;
local176 = Static80.underWaterTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947;
}
@Pc(201) int local201 = Static107.anIntArrayArrayArray10[3][local146][local152] - Static162.anInt3947 - 1000;
@Pc(201) int local201 = Static107.surfaceTileHeightMap[3][local146][local152] - Static162.anInt3947 - 1000;
Static89.aBooleanArrayArray3[local104][local113] = Static160.method3049(local130, local201, local176, local140, local99);
} else {
Static89.aBooleanArrayArray3[local104][local113] = false;
}
}
}
for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 1; local104++) {
for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 1; local113++) {
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) {
Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1];
}
}
@ -93,8 +93,8 @@ public final class Static156 {
Static234.anIntArray454 = arg9;
Static206.anIntArray427 = arg10;
Static123.method2419();
if (Static276.aClass3_Sub5ArrayArrayArray3 != null) {
Static278.method4648(true);
if (Static276.underWaterGroundTiles != null) {
Static278.setRenderTiles(true);
Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
if (GlRenderer.enabled) {
Static119.aBoolean153 = false;
@ -102,7 +102,7 @@ public final class Static156 {
Static161.method3066(null);
Static120.method2390();
}
Static278.method4648(false);
Static278.setRenderTiles(false);
}
Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
}
@ -160,8 +160,8 @@ public final class Static156 {
local1.glPushAttrib(GL2.GL_FOG_BIT);
local1.glFogf(GL2.GL_FOG_START, 3072.0F);
GlRenderer.disableDepthMask();
for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) {
@Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19];
for (@Pc(19) int local19 = 0; local19 < Static36.surfaceHdTiles[0].length; local19++) {
@Pc(31) GlTile local31 = Static36.surfaceHdTiles[0][local19];
if (local31.anInt2485 >= 0 && Rasteriser.textureProvider.method3237(local31.anInt2485) == 4) {
local1.glColor4fv(Static190.method3441(local31.anInt2486), 0);
@Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F);