2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2026-08-27 21:35:17 -06:00
Code Issues Projects Releases Packages Wiki Activity

Fixed VertexNormal magnitude naming

Browse source
This commit is contained in:
Pazaz 2022-07-22 11:33:49 -04:00
parent 92730e5d96
commit dfa35a80e5
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -628,13 +628,13 @@ public final class GlModel extends Model {
@Pc(1994) long local1994 = (long) (local833 << 2) + ((long) (local553 << 24) + (long) (local817 << 8) + (long) local844 << 32);
local919 = model.triangleVertexA[local810];
@Pc(2004) VertexNormal local2004 = model.vertexNormals[local919];
this.aShortArray77[local439] = this.method4098(model, local919, local1994, local2004.x, local2004.y, local2004.z, local2004.triangles, local854, local856);
this.aShortArray77[local439] = this.method4098(model, local919, local1994, local2004.x, local2004.y, local2004.z, local2004.magnitude, local854, local856);
local1280 = model.triangleVertexB[local810];
@Pc(2033) VertexNormal local2033 = model.vertexNormals[local1280];
this.aShortArray82[local439] = this.method4098(model, local1280, local1994 + (long) local866, local2033.x, local2033.y, local2033.z, local2033.triangles, local858, local683);
this.aShortArray82[local439] = this.method4098(model, local1280, local1994 + (long) local866, local2033.x, local2033.y, local2033.z, local2033.magnitude, local858, local683);
@Pc(2060) int local2060 = model.triangleVertexC[local810];
@Pc(2065) VertexNormal local2065 = model.vertexNormals[local2060];
this.aShortArray83[local439] = this.method4098(model, local2060, local1994 + (long) local868, local2065.x, local2065.y, local2065.z, local2065.triangles, local714, local685);
this.aShortArray83[local439] = this.method4098(model, local2060, local1994 + (long) local868, local2065.x, local2065.y, local2065.z, local2065.magnitude, local714, local685);
} else if (local902 == 1) {
@Pc(2096) TriangleNormal local2096 = model.triangleNormals[local810];
@Pc(2137) long local2137 = (long) ((local833 << 2) + (local2096.anInt4769 > 0 ? 1024 : 2048) + (local2096.anInt4770 + 256 << 12) + (local2096.anInt4767 + 256 << 22)) + ((long) (local553 << 24) + (long) (local817 << 8) + (long) local844 << 32);

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

@ -681,17 +681,17 @@ public final class RawModel extends Entity {
n1.x += local112;
n1.y += local120;
n1.z += local128;
n1.triangles++;
n1.magnitude++;
@Pc(243) VertexNormal n2 = this.vertexNormals[local39];
n2.x += local112;
n2.y += local120;
n2.z += local128;
n2.triangles++;
n2.magnitude++;
@Pc(272) VertexNormal n3 = this.vertexNormals[local44];
n3.x += local112;
n3.y += local120;
n3.z += local128;
n3.triangles++;
n3.magnitude++;
} else if (info == 1) {
if (this.triangleNormals == null) {
this.triangleNormals = new TriangleNormal[this.triangleCount];
@ -1414,7 +1414,7 @@ public final class RawModel extends Entity {
@Pc(20) int local20;
for (local20 = 0; local20 < this.vertexCount; local20++) {
@Pc(29) VertexNormal local29 = this.vertexNormals[local20];
if (local29.triangles != 0) {
if (local29.magnitude != 0) {
@Pc(40) int local40 = this.vertexY[local20] - arg2;
if (local40 >= m.minY && local40 <= m.maxY) {
@Pc(56) int local56 = this.vertexX[local20] - arg1;
@ -1423,7 +1423,7 @@ public final class RawModel extends Entity {
if (local72 >= m.minZ && local72 <= m.maxZ) {
for (@Pc(83) int local83 = 0; local83 < local18; local83++) {
@Pc(91) VertexNormal local91 = m.vertexNormals[local83];
if (local56 == local15[local83] && local72 == m.vertexZ[local83] && local40 == m.vertexY[local83] && local91.triangles != 0) {
if (local56 == local15[local83] && local72 == m.vertexZ[local83] && local40 == m.vertexY[local83] && local91.magnitude != 0) {
if (this.aClass57Array2 == null) {
this.aClass57Array2 = new VertexNormal[this.vertexCount];
}
@ -1441,11 +1441,11 @@ public final class RawModel extends Entity {
local131.x += local91.x;
local131.y += local91.y;
local131.z += local91.z;
local131.triangles += local91.triangles;
local131.magnitude += local91.magnitude;
local148.x += local29.x;
local148.y += local29.y;
local148.z += local29.z;
local148.triangles += local29.triangles;
local148.magnitude += local29.magnitude;
local12++;
anIntArray194[local20] = anInt2138;
anIntArray199[local83] = anInt2138;

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

@ -386,21 +386,21 @@ public final class SoftwareModel extends Model {
} else {
local435 = model.aClass57Array2[this.triangleVertexA[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles) << 17;
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude) << 17;
this.anIntArray533[i] = local468 | ColorUtils.multiplyLightness2(local416, local468 >> 17);
if (model.aClass57Array2 == null || model.aClass57Array2[this.triangleVertexB[i]] == null) {
local435 = model.vertexNormals[this.triangleVertexB[i]];
} else {
local435 = model.aClass57Array2[this.triangleVertexB[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles) << 17;
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude) << 17;
this.anIntArray523[i] = local468 | ColorUtils.multiplyLightness2(local416, local468 >> 17);
if (model.aClass57Array2 == null || model.aClass57Array2[this.triangleVertexC[i]] == null) {
local435 = model.vertexNormals[this.triangleVertexC[i]];
} else {
local435 = model.aClass57Array2[this.triangleVertexC[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles) << 17;
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude) << 17;
this.triangleInfo[i] = local468 | ColorUtils.multiplyLightness2(local416, local468 >> 17);
} else if (local366 == 1) {
local614 = model.triangleNormals[i];
@ -419,21 +419,21 @@ public final class SoftwareModel extends Model {
} else {
local435 = model.aClass57Array2[this.triangleVertexA[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles);
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude);
this.anIntArray533[i] = ColorUtils.method4582(local468);
if (model.aClass57Array2 == null || model.aClass57Array2[this.triangleVertexB[i]] == null) {
local435 = model.vertexNormals[this.triangleVertexB[i]];
} else {
local435 = model.aClass57Array2[this.triangleVertexB[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles);
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude);
this.anIntArray523[i] = ColorUtils.method4582(local468);
if (model.aClass57Array2 == null || model.aClass57Array2[this.triangleVertexC[i]] == null) {
local435 = model.vertexNormals[this.triangleVertexC[i]];
} else {
local435 = model.aClass57Array2[this.triangleVertexC[i]];
}
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.triangles);
local468 = arg1 + (arg3 * local435.x + arg4 * local435.y + arg5 * local435.z) / (local108 * local435.magnitude);
this.triangleInfo[i] = ColorUtils.method4582(local468);
} else if (local366 == 1) {
local614 = model.triangleNormals[i];

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

@ -11,7 +11,7 @@ public final class VertexNormal {
public int y;
@OriginalMember(owner = "client!hd", name = "d", descriptor = "I")
public int triangles;
public int magnitude;
@OriginalMember(owner = "client!hd", name = "m", descriptor = "I")
public int z;
@ -25,7 +25,7 @@ public final class VertexNormal {
@OriginalMember(owner = "client!hd", name = "<init>", descriptor = "(Lclient!hd;)V")
public VertexNormal(@OriginalArg(0) VertexNormal arg0) {
this.triangles = arg0.triangles;
this.magnitude = arg0.magnitude;
this.x = arg0.x;
this.y = arg0.y;
this.z = arg0.z;