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

Refactored more of RawModel (and decodeOld)

Browse source
This commit is contained in:
Pazaz 2022-05-25 01:13:51 -04:00
parent 1c9e73d540
commit ec48c0767a
17 changed files with 431 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,5 +28,5 @@ public abstract class Entity {
public abstract void render(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10); public abstract void render(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10);
@OriginalMember(owner = "client!th", name = "b", descriptor = "()I") @OriginalMember(owner = "client!th", name = "b", descriptor = "()I")
public abstract int getMaxY(); public abstract int getMinY();
} }

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

@ -229,7 +229,7 @@ public final class GlModel extends Model {
this.anIntArray465 = arg0.vertexY; this.anIntArray465 = arg0.vertexY;
this.anIntArray466 = arg0.vertexZ; this.anIntArray466 = arg0.vertexZ;
this.anIntArray464 = arg0.vertexBones; this.anIntArray464 = arg0.vertexBones;
this.aShortArray84 = arg0.aShortArray29; this.aShortArray84 = arg0.vertexSources;
local117 = this.anInt5297 * 3; local117 = this.anInt5297 * 3;
this.aShortArray76 = new short[local117]; this.aShortArray76 = new short[local117];
this.aShortArray79 = new short[local117]; this.aShortArray79 = new short[local117];
@ -1844,7 +1844,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "b", descriptor = "()I") @OriginalMember(owner = "client!td", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
if (!this.vertexBuffer.valid) { if (!this.vertexBuffer.valid) {
this.method4108(); this.method4108();
} }

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

@ -219,7 +219,7 @@ public final class Inv extends Node {
@Pc(176) int pitchcos = MathUtils.cos[objType.xAngle2d] * zoom >> 16; @Pc(176) int pitchcos = MathUtils.cos[objType.xAngle2d] * zoom >> 16;
@Pc(185) int pitchsin = MathUtils.sin[objType.xAngle2d] * zoom >> 16; @Pc(185) int pitchsin = MathUtils.sin[objType.xAngle2d] * zoom >> 16;
model.setCamera(objType.yAngle2d, objType.zAngle2d, objType.xAngle2d, objType.xOffset2d, pitchsin + objType.yOffset2d - model.getMaxY() / 2, objType.yOffset2d + pitchcos, -1L); model.setCamera(objType.yAngle2d, objType.zAngle2d, objType.xAngle2d, objType.xOffset2d, pitchsin + objType.yOffset2d - model.getMinY() / 2, objType.yOffset2d + pitchcos, -1L);
if (state >= 1) { if (state >= 1) {
canvas.drawOutline(1); canvas.drawOutline(1);

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

@ -386,7 +386,7 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "b", descriptor = "()I") @OriginalMember(owner = "client!dc", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt1311; return this.anInt1311;
} }
} }

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

@ -337,7 +337,7 @@ public final class LocType {
} }
} }
if (local211) { if (local211) {
local265.method1665(this.resizeX, this.resizeY, this.resizeZ); local265.resize(this.resizeX, this.resizeY, this.resizeZ);
} }
if (local230) { if (local230) {
local265.translate(this.translateX, this.translateY, this.translateZ); local265.translate(this.translateX, this.translateY, this.translateZ);
@ -803,7 +803,7 @@ public final class LocType {
aClass139_1.aClass8_10 = null; aClass139_1.aClass8_10 = null;
return aClass139_1; return aClass139_1;
} }
local69.method1681(); local69.resetBones();
if (arg3 == 10 && arg0 > 3) { if (arg3 == 10 && arg0 > 3) {
local69.method1682(); local69.method1682();
} }

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

@ -31,7 +31,7 @@ public abstract class Model extends Entity {
public abstract int method4550(); public abstract int method4550();
@OriginalMember(owner = "client!ak", name = "b", descriptor = "()I") @OriginalMember(owner = "client!ak", name = "b", descriptor = "()I")
public abstract int getMaxY(); public abstract int getMinY();
@OriginalMember(owner = "client!ak", name = "d", descriptor = "()Z") @OriginalMember(owner = "client!ak", name = "d", descriptor = "()Z")
protected abstract boolean method4551(); protected abstract boolean method4551();

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

@ -39,7 +39,7 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "b", descriptor = "()I") @OriginalMember(owner = "client!km", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt3413; return this.anInt3413;
} }
@ -57,7 +57,7 @@ public final class Npc extends PathingEntity {
return; return;
} }
this.anInt3413 = body.getMaxY(); this.anInt3413 = body.getMinY();
@Pc(84) NpcType local84 = this.type; @Pc(84) NpcType local84 = this.type;
if (local84.multiNpcs != null) { if (local84.multiNpcs != null) {
local84 = local84.getMultiNpc(); local84 = local84.getMultiNpc();

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

@ -28,13 +28,13 @@ public final class ObjStack extends Entity {
@Pc(16) Model local16 = ObjTypeList.get(this.type).getModel(-1, 0, null, this.anInt5550, 0); @Pc(16) Model local16 = ObjTypeList.get(this.type).getModel(-1, 0, null, this.anInt5550, 0);
if (local16 != null) { if (local16 != null) {
local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
this.anInt5553 = local16.getMaxY(); this.anInt5553 = local16.getMinY();
} }
} }
@OriginalMember(owner = "client!uj", name = "b", descriptor = "()I") @OriginalMember(owner = "client!uj", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt5553; return this.anInt5553;
} }
} }

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

@ -525,7 +525,7 @@ public abstract class PathingEntity extends Entity {
this.anInt3383 += this.anInt3355; this.anInt3383 += this.anInt3355;
if (this.anInt3383 != 0) { if (this.anInt3383 != 0) {
local101 = this.anInt3383 >> 5 & 0x7FF; local101 = this.anInt3383 >> 5 & 0x7FF;
local106 = arg0.getMaxY() / 2; local106 = arg0.getMinY() / 2;
arg0.translate(0, -local106, 0); arg0.translate(0, -local106, 0);
arg0.rotateZ(local101); arg0.rotateZ(local101);
arg0.translate(0, local106, 0); arg0.translate(0, local106, 0);
@ -616,7 +616,7 @@ public abstract class PathingEntity extends Entity {
return; return;
} }
local101 = this.anInt3427 >> 5 & 0x7FF; local101 = this.anInt3427 >> 5 & 0x7FF;
local106 = arg0.getMaxY() / 2; local106 = arg0.getMinY() / 2;
arg0.translate(0, -local106, 0); arg0.translate(0, -local106, 0);
arg0.rotateX(local101); arg0.rotateX(local101);
arg0.translate(0, local106, 0); arg0.translate(0, local106, 0);

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

@ -332,7 +332,7 @@ public final class Player extends PathingEntity {
if (local76 == null) { if (local76 == null) {
return; return;
} }
this.anInt3413 = local76.getMaxY(); this.anInt3413 = local76.getMinY();
@Pc(184) Model local184; @Pc(184) Model local184;
if (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || NpcTypeList.get(this.appearance.anInt2492).shadow)) { if (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || NpcTypeList.get(this.appearance.anInt2492).shadow)) {
local184 = ShadowModelList.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240); local184 = ShadowModelList.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
@ -509,7 +509,7 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "b", descriptor = "()I") @OriginalMember(owner = "client!e", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt3413; return this.anInt3413;
} }
} }

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

@ -201,13 +201,13 @@ public final class ProjAnim extends Entity {
@Pc(3) Model local3 = this.method3703(); @Pc(3) Model local3 = this.method3703();
if (local3 != null) { if (local3 != null) {
local3.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_6); local3.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_6);
this.anInt4814 = local3.getMaxY(); this.anInt4814 = local3.getMinY();
} }
} }
@OriginalMember(owner = "client!ra", name = "b", descriptor = "()I") @OriginalMember(owner = "client!ra", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt4814; return this.anInt4814;
} }
} }

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

File diff suppressed because it is too large Load diff

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

@ -242,7 +242,7 @@ public final class SoftwareModel extends Model {
this.anIntArrayArray41 = arg0.boneVertices; this.anIntArrayArray41 = arg0.boneVertices;
this.anIntArrayArray42 = arg0.boneTriangles; this.anIntArrayArray42 = arg0.boneTriangles;
this.aShortArray90 = arg0.aShortArray22; this.aShortArray90 = arg0.aShortArray22;
this.aShortArray91 = arg0.aShortArray29; this.aShortArray91 = arg0.vertexSources;
@Pc(102) int local102 = (int) Math.sqrt((double) (arg3 * arg3 + arg4 * arg4 + arg5 * arg5)); @Pc(102) int local102 = (int) Math.sqrt((double) (arg3 * arg3 + arg4 * arg4 + arg5 * arg5));
@Pc(108) int local108 = arg2 * local102 >> 8; @Pc(108) int local108 = arg2 * local102 >> 8;
this.anIntArray533 = new int[this.anInt5787]; this.anIntArray533 = new int[this.anInt5787];
@ -643,7 +643,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "b", descriptor = "()I") @OriginalMember(owner = "client!w", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
if (!this.boundsValid) { if (!this.boundsValid) {
this.method4592(); this.method4592();
} }

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

@ -78,7 +78,7 @@ public final class SpotAnim extends Entity {
@OriginalMember(owner = "client!bh", name = "b", descriptor = "()I") @OriginalMember(owner = "client!bh", name = "b", descriptor = "()I")
@Override @Override
public final int getMaxY() { public final int getMinY() {
return this.anInt603; return this.anInt603;
} }
@ -88,7 +88,7 @@ public final class SpotAnim extends Entity {
@Pc(7) Model local7 = this.method552(); @Pc(7) Model local7 = this.method552();
if (local7 != null) { if (local7 != null) {
local7.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_1); local7.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_1);
this.anInt603 = local7.getMaxY(); this.anInt603 = local7.getMinY();
} }
} }

6
client/src/main/java/rt4/Static247.java
View file

@ -266,7 +266,7 @@ public final class Static247 {
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
} }
} }
if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMaxY())) { if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMinY())) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRenderer.method4159(local33 - 0.5F); GlRenderer.method4159(local33 - 0.5F);
} }
@ -499,7 +499,7 @@ public final class Static247 {
} }
@Pc(1697) Scenery local1697 = SceneGraph.aClass31Array2[local115]; @Pc(1697) Scenery local1697 = SceneGraph.aClass31Array2[local115];
local1697.anInt1707 = Static13.anInt437; local1697.anInt1707 = Static13.anInt437;
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.primary.getMaxY())) { if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.primary.getMinY())) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if ((local1697.key & 0xFC000L) == 147456L) { if ((local1697.key & 0xFC000L) == 147456L) {
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -583,7 +583,7 @@ public final class Static247 {
} }
if (local8.anInt670 != 0) { if (local8.anInt670 != 0) {
@Pc(2109) WallDecor local2109 = local8.wallDecor; @Pc(2109) WallDecor local2109 = local8.wallDecor;
if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMaxY())) { if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMinY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) { if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);

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

@ -40,7 +40,7 @@ public final class Static69 {
for (@Pc(46) int local46 = 0; local46 < local42.sceneryLen; local46++) { for (@Pc(46) int local46 = 0; local46 < local42.sceneryLen; local46++) {
@Pc(55) Scenery local55 = local42.scenery[local46]; @Pc(55) Scenery local55 = local42.scenery[local46];
if ((local55.key & 0x400000L) == 4194304L) { if ((local55.key & 0x400000L) == 4194304L) {
@Pc(66) int local66 = local55.primary.getMaxY(); @Pc(66) int local66 = local55.primary.getMinY();
if (local66 != -32768 && local66 < local34) { if (local66 != -32768 && local66 < local34) {
local34 = local66; local34 = local66;
} }

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

@ -677,7 +677,7 @@ public final class Static87 {
if (local2589 == null) { if (local2589 == null) {
InterfaceList.redraw(local30); InterfaceList.redraw(local30);
} else { } else {
memory = -local2589.getMaxY() / 2; memory = -local2589.getMinY() / 2;
} }
} }
} else if (local30.modelType == 5) { } else if (local30.modelType == 5) {