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

Renamed remaining local variables in RawModel decodeNew/decodeOld

Browse source
This commit is contained in:
Pazaz 2022-05-25 01:49:09 -04:00
parent ec48c0767a
commit 60880455de
7 changed files with 399 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/rt4/Entity.java
View file

@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public abstract class Entity { public abstract class Entity {
@OriginalMember(owner = "client!th", name = "a", descriptor = "(III)Lclient!th;") @OriginalMember(owner = "client!th", name = "a", descriptor = "(III)Lclient!th;")
public Entity method4539() { public Entity createModel() {
return this; return this;
} }

18
client/src/main/java/rt4/GlModel.java
View file

@ -277,7 +277,7 @@ public final class GlModel extends Model {
@Pc(683) float local683; @Pc(683) float local683;
@Pc(714) float local714; @Pc(714) float local714;
@Pc(685) float local685; @Pc(685) float local685;
if (arg0.faceTextureIndex != null) { if (arg0.triangleTextureIndex != null) {
local439 = arg0.texturedCount; local439 = arg0.texturedCount;
@Pc(442) int[] local442 = new int[local439]; @Pc(442) int[] local442 = new int[local439];
@Pc(445) int[] local445 = new int[local439]; @Pc(445) int[] local445 = new int[local439];
@ -296,8 +296,8 @@ public final class GlModel extends Model {
} }
for (local459 = 0; local459 < this.anInt5297; local459++) { for (local459 = 0; local459 < this.anInt5297; local459++) {
@Pc(498) int local498 = local23[local459]; @Pc(498) int local498 = local23[local459];
if (arg0.faceTextureIndex[local498] != -1) { if (arg0.triangleTextureIndex[local498] != -1) {
@Pc(511) int local511 = arg0.faceTextureIndex[local498] & 0xFF; @Pc(511) int local511 = arg0.triangleTextureIndex[local498] & 0xFF;
for (@Pc(513) int local513 = 0; local513 < 3; local513++) { for (@Pc(513) int local513 = 0; local513 < 3; local513++) {
@Pc(523) int local523; @Pc(523) int local523;
if (local513 == 0) { if (local513 == 0) {
@ -378,10 +378,10 @@ public final class GlModel extends Model {
local822 = arg0.triangleTextures[local810]; local822 = arg0.triangleTextures[local810];
} }
@Pc(833) int local833; @Pc(833) int local833;
if (arg0.faceTextureIndex == null) { if (arg0.triangleTextureIndex == null) {
local833 = -1; local833 = -1;
} else { } else {
local833 = arg0.faceTextureIndex[local810]; local833 = arg0.triangleTextureIndex[local810];
} }
@Pc(844) int local844; @Pc(844) int local844;
if (arg0.triangleAlpha == null) { if (arg0.triangleAlpha == null) {
@ -2750,7 +2750,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "a", descriptor = "(III)Lclient!th;") @OriginalMember(owner = "client!td", name = "a", descriptor = "(III)Lclient!th;")
@Override @Override
public final Entity method4539() { public final Entity createModel() {
this.aBoolean259 = false; this.aBoolean259 = false;
if (this.aClass23_1 != null) { if (this.aClass23_1 != null) {
this.aShortArray76 = this.aClass23_1.aShortArray8; this.aShortArray76 = this.aClass23_1.aShortArray8;
@ -2801,13 +2801,13 @@ public final class GlModel extends Model {
local3.anIntArray461 = this.anIntArray461; local3.anIntArray461 = this.anIntArray461;
local3.anIntArray466 = this.anIntArray466; local3.anIntArray466 = this.anIntArray466;
} else { } else {
local3.anIntArray461 = Static115.method2308(this.anIntArray461); local3.anIntArray461 = RawModel.method2308(this.anIntArray461);
local3.anIntArray466 = Static115.method2308(this.anIntArray466); local3.anIntArray466 = RawModel.method2308(this.anIntArray466);
} }
if (arg1) { if (arg1) {
local3.anIntArray465 = this.anIntArray465; local3.anIntArray465 = this.anIntArray465;
} else { } else {
local3.anIntArray465 = Static115.method2308(this.anIntArray465); local3.anIntArray465 = RawModel.method2308(this.anIntArray465);
} }
if (arg0 && arg1) { if (arg0 && arg1) {
local3.bounds = this.bounds; local3.bounds = this.bounds;

4
client/src/main/java/rt4/LocType.java
View file

@ -315,9 +315,9 @@ public final class LocType {
} }
@Pc(285) int local285 = arg0 & 0x3; @Pc(285) int local285 = arg0 & 0x3;
if (local285 == 1) { if (local285 == 1) {
local265.method1662(); local265.swapXz();
} else if (local285 == 2) { } else if (local285 == 2) {
local265.method1660(); local265.negateXz();
} else if (local285 == 3) { } else if (local285 == 3) {
local265.method1689(); local265.method1689();
} }

704
client/src/main/java/rt4/RawModel.java
View file

File diff suppressed because it is too large Load diff

16
client/src/main/java/rt4/SoftwareModel.java
View file

@ -262,12 +262,12 @@ public final class SoftwareModel extends Model {
} }
} }
} }
if (arg0.texturedCount > 0 && arg0.faceTextureIndex != null) { if (arg0.texturedCount > 0 && arg0.triangleTextureIndex != null) {
@Pc(177) int[] local177 = new int[arg0.texturedCount]; @Pc(177) int[] local177 = new int[arg0.texturedCount];
@Pc(179) int local179; @Pc(179) int local179;
for (local179 = 0; local179 < this.anInt5787; local179++) { for (local179 = 0; local179 < this.anInt5787; local179++) {
if (arg0.faceTextureIndex[local179] != -1) { if (arg0.triangleTextureIndex[local179] != -1) {
local177[arg0.faceTextureIndex[local179] & 0xFF]++; local177[arg0.triangleTextureIndex[local179] & 0xFF]++;
} }
} }
this.anInt5789 = 0; this.anInt5789 = 0;
@ -293,10 +293,10 @@ public final class SoftwareModel extends Model {
} }
this.aByteArray74 = new byte[this.anInt5787]; this.aByteArray74 = new byte[this.anInt5787];
for (local248 = 0; local248 < this.anInt5787; local248++) { for (local248 = 0; local248 < this.anInt5787; local248++) {
if (arg0.faceTextureIndex[local248] == -1) { if (arg0.triangleTextureIndex[local248] == -1) {
this.aByteArray74[local248] = -1; this.aByteArray74[local248] = -1;
} else { } else {
this.aByteArray74[local248] = (byte) local177[arg0.faceTextureIndex[local248] & 0xFF]; this.aByteArray74[local248] = (byte) local177[arg0.triangleTextureIndex[local248] & 0xFF];
if (this.aByteArray74[local248] == -1 && this.aShortArray92 != null) { if (this.aByteArray74[local248] == -1 && this.aShortArray92 != null) {
this.aShortArray92[local248] = -1; this.aShortArray92[local248] = -1;
} }
@ -963,9 +963,9 @@ public final class SoftwareModel extends Model {
local150.aShortArray90 = this.aShortArray90; local150.aShortArray90 = this.aShortArray90;
local150.aBoolean303 = this.aBoolean303; local150.aBoolean303 = this.aBoolean303;
if (arg0 == 3) { if (arg0 == 3) {
local150.anIntArray528 = Static115.method2308(this.anIntArray528); local150.anIntArray528 = RawModel.method2308(this.anIntArray528);
local150.anIntArray527 = Static115.method2308(this.anIntArray527); local150.anIntArray527 = RawModel.method2308(this.anIntArray527);
local150.anIntArray531 = Static115.method2308(this.anIntArray531); local150.anIntArray531 = RawModel.method2308(this.anIntArray531);
} else { } else {
local150.anIntArray528 = this.anIntArray528; local150.anIntArray528 = this.anIntArray528;
local150.anIntArray527 = new int[local150.vertexCount]; local150.anIntArray527 = new int[local150.vertexCount];

13
client/src/main/java/rt4/Static115.java
View file

@ -43,18 +43,7 @@ public final class Static115 {
@OriginalMember(owner = "client!ee", name = "f", descriptor = "S") @OriginalMember(owner = "client!ee", name = "f", descriptor = "S")
public static short aShort12 = 1; public static short aShort12 = 1;
@OriginalMember(owner = "client!ja", name = "a", descriptor = "([II)[I") @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static int[] method2308(@OriginalArg(0) int[] arg0) {
if (arg0 == null) {
return null;
} else {
@Pc(18) int[] local18 = new int[arg0.length];
ArrayUtils.copy(arg0, 0, local18, 0, arg0.length);
return local18;
}
}
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Cross.type == 1) { if (Cross.type == 1) {
Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8); Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8);

8
client/src/main/java/rt4/Static220.java
View file

@ -68,21 +68,21 @@ public final class Static220 {
if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) { if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) {
Static69.method1544(local27.aClass8_6, local1, local6, local11, 1, 1); Static69.method1544(local27.aClass8_6, local1, local6, local11, 1, 1);
local27.primary.method4544(local27.aClass8_6, 0, 0, 0, false); local27.primary.method4544(local27.aClass8_6, 0, 0, 0, false);
local27.aClass8_6 = local27.aClass8_6.method4539(); local27.aClass8_6 = local27.aClass8_6.createModel();
} }
local27.primary = local27.primary.method4539(); local27.primary = local27.primary.createModel();
} }
for (@Pc(83) int local83 = 0; local83 < local22.sceneryLen; local83++) { for (@Pc(83) int local83 = 0; local83 < local22.sceneryLen; local83++) {
@Pc(92) Scenery local92 = local22.scenery[local83]; @Pc(92) Scenery local92 = local22.scenery[local83];
if (local92 != null && local92.primary.method4543()) { if (local92 != null && local92.primary.method4543()) {
Static69.method1544(local92.primary, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1); Static69.method1544(local92.primary, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1);
local92.primary = local92.primary.method4539(); local92.primary = local92.primary.createModel();
} }
} }
@Pc(131) GroundDecor local131 = local22.groundDecor; @Pc(131) GroundDecor local131 = local22.groundDecor;
if (local131 != null && local131.primary.method4543()) { if (local131 != null && local131.primary.method4543()) {
Static264.method3574(local131.primary, local1, local6, local11); Static264.method3574(local131.primary, local1, local6, local11);
local131.primary = local131.primary.method4539(); local131.primary = local131.primary.createModel();
} }
} }
} }