mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2026-08-25 12:25:18 -06:00
Added more CS2 opcodes, need to adopt NXT naming next
This commit is contained in:
Pazaz
parent
3531b1c57c
commit
5f4a83c394
45 changed files with 2725 additions and 601 deletions
|
|
@ -1,9 +1,12 @@
|
|||
package rt4;
|
||||
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
||||
public class Camera {
|
||||
@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
|
||||
public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
|
||||
@OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
|
||||
public static double pitchTarget = 128;
|
||||
|
||||
|
|
@ -17,6 +20,30 @@ public class Camera {
|
|||
public static int cameraZ;
|
||||
@OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
|
||||
public static int cameraX;
|
||||
@OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
|
||||
public static int cameraPitch;
|
||||
@OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
|
||||
public static int cameraYaw;
|
||||
@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
|
||||
public static int cameraType;
|
||||
@OriginalMember(owner = "client!g", name = "d", descriptor = "I")
|
||||
public static int anInt2119 = 0;
|
||||
@OriginalMember(owner = "client!eb", name = "t", descriptor = "I")
|
||||
public static int anInt1694 = -1;
|
||||
@OriginalMember(owner = "client!j", name = "K", descriptor = "I")
|
||||
public static int anInt5843 = 0;
|
||||
@OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
|
||||
public static int anInt5101 = 0;
|
||||
@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
|
||||
public static int anInt5224 = 0;
|
||||
@OriginalMember(owner = "client!k", name = "i", descriptor = "I")
|
||||
public static int anInt3125 = 0;
|
||||
@OriginalMember(owner = "client!me", name = "k", descriptor = "I")
|
||||
public static int anInt3718 = -1;
|
||||
@OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
|
||||
public static int originZ;
|
||||
@OriginalMember(owner = "client!se", name = "a", descriptor = "I")
|
||||
public static int originX;
|
||||
|
||||
public static double mod(double a, double b) {
|
||||
return ((a % b) + b) % b;
|
||||
|
|
@ -126,19 +153,19 @@ public class Camera {
|
|||
local268 = 383;
|
||||
}
|
||||
@Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
|
||||
if (Static240.cameraPitch < local268) {
|
||||
Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000;
|
||||
if (Static240.cameraPitch > local268) {
|
||||
Static240.cameraPitch = local268;
|
||||
if (cameraPitch < local268) {
|
||||
cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
|
||||
if (cameraPitch > local268) {
|
||||
cameraPitch = local268;
|
||||
}
|
||||
}
|
||||
if (Static240.cameraPitch > local268) {
|
||||
Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
|
||||
if (Static240.cameraPitch < local268) {
|
||||
Static240.cameraPitch = local268;
|
||||
if (cameraPitch > local268) {
|
||||
cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
|
||||
if (cameraPitch < local268) {
|
||||
cameraPitch = local268;
|
||||
}
|
||||
}
|
||||
@Pc(350) int local350 = local292 - Static184.cameraYaw;
|
||||
@Pc(350) int local350 = local292 - cameraYaw;
|
||||
if (local350 > 1024) {
|
||||
local350 -= 2048;
|
||||
}
|
||||
|
|
@ -146,14 +173,14 @@ public class Camera {
|
|||
local350 += 2048;
|
||||
}
|
||||
if (local350 > 0) {
|
||||
Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
|
||||
Static184.cameraYaw &= 0x7FF;
|
||||
cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
|
||||
cameraYaw &= 0x7FF;
|
||||
}
|
||||
if (local350 < 0) {
|
||||
Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
|
||||
Static184.cameraYaw &= 0x7FF;
|
||||
cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
|
||||
cameraYaw &= 0x7FF;
|
||||
}
|
||||
@Pc(404) int local404 = local292 - Static184.cameraYaw;
|
||||
@Pc(404) int local404 = local292 - cameraYaw;
|
||||
if (local404 > 1024) {
|
||||
local404 -= 2048;
|
||||
}
|
||||
|
|
@ -161,20 +188,20 @@ public class Camera {
|
|||
local404 += 2048;
|
||||
}
|
||||
if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
|
||||
Static184.cameraYaw = local292;
|
||||
cameraYaw = local292;
|
||||
}
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
|
||||
public static void updateLoginScreenCamera() {
|
||||
if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) {
|
||||
if (anInt3718 == -1 || anInt1694 == -1) {
|
||||
return;
|
||||
}
|
||||
@Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101;
|
||||
@Pc(27) int local27 = (anInt5224 * (anInt5843 - anInt5101) >> 16) + anInt5101;
|
||||
@Pc(30) float[] renderCoordinates = new float[3];
|
||||
Static233.anInt5224 += local27;
|
||||
if (Static233.anInt5224 >= 65535) {
|
||||
Static233.anInt5224 = 65535;
|
||||
anInt5224 += local27;
|
||||
if (anInt5224 >= 65535) {
|
||||
anInt5224 = 65535;
|
||||
if (Static186.aBoolean205) {
|
||||
Static13.aBoolean16 = false;
|
||||
} else {
|
||||
|
|
@ -185,8 +212,8 @@ public class Camera {
|
|||
Static186.aBoolean205 = false;
|
||||
Static13.aBoolean16 = false;
|
||||
}
|
||||
@Pc(66) float local66 = (float) Static233.anInt5224 / 65535.0F;
|
||||
@Pc(70) int local70 = Static127.anInt3125 * 2;
|
||||
@Pc(66) float local66 = (float) anInt5224 / 65535.0F;
|
||||
@Pc(70) int local70 = anInt3125 * 2;
|
||||
@Pc(141) int local141;
|
||||
@Pc(131) int local131;
|
||||
@Pc(111) int local111;
|
||||
|
|
@ -195,28 +222,28 @@ public class Camera {
|
|||
@Pc(155) int local155;
|
||||
@Pc(173) int local173;
|
||||
for (@Pc(72) int local72 = 0; local72 < 3; local72++) {
|
||||
local111 = (Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] - Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 3][local72]) * 3;
|
||||
local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72];
|
||||
local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3;
|
||||
local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3;
|
||||
local111 = (anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + anIntArrayArrayArray9[anInt3718][local70 + 2][local72] - anIntArrayArrayArray9[anInt3718][local70 + 3][local72]) * 3;
|
||||
local119 = anIntArrayArrayArray9[anInt3718][local70][local72];
|
||||
local131 = anIntArrayArrayArray9[anInt3718][local70 + 1][local72] * 3;
|
||||
local141 = anIntArrayArrayArray9[anInt3718][local70][local72] * 3;
|
||||
local146 = local131 - local141;
|
||||
local155 = local111 + local141 - local131 * 2;
|
||||
local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111;
|
||||
local173 = anIntArrayArrayArray9[anInt3718][local70 + 2][local72] + local131 - local119 - local111;
|
||||
renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66;
|
||||
}
|
||||
Static5.anInt40 = (int) renderCoordinates[1] * -1;
|
||||
Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128;
|
||||
Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128;
|
||||
Static138.renderX = (int) renderCoordinates[0] - originX * 128;
|
||||
Static134.renderZ = (int) renderCoordinates[2] - originZ * 128;
|
||||
@Pc(226) float[] local226 = new float[3];
|
||||
local141 = Static75.anInt2119 * 2;
|
||||
local141 = anInt2119 * 2;
|
||||
for (local131 = 0; local131 < 3; local131++) {
|
||||
local111 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131] * 3;
|
||||
local146 = (Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] - Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 3][local131]) * 3;
|
||||
local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131];
|
||||
local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3;
|
||||
local111 = anIntArrayArrayArray9[anInt1694][local141][local131] * 3;
|
||||
local146 = (anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + anIntArrayArrayArray9[anInt1694][local141 + 2][local131] - anIntArrayArrayArray9[anInt1694][local141 + 3][local131]) * 3;
|
||||
local155 = anIntArrayArrayArray9[anInt1694][local141][local131];
|
||||
local119 = anIntArrayArrayArray9[anInt1694][local141 + 1][local131] * 3;
|
||||
local173 = local119 - local111;
|
||||
@Pc(313) int local313 = local146 + local111 - local119 * 2;
|
||||
@Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + local119 - local146 - local155;
|
||||
@Pc(331) int local331 = anIntArrayArrayArray9[anInt1694][local141 + 2][local131] + local119 - local146 - local155;
|
||||
local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173);
|
||||
}
|
||||
@Pc(363) float local363 = local226[0] - renderCoordinates[0];
|
||||
|
|
@ -225,7 +252,61 @@ public class Camera {
|
|||
@Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
|
||||
Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
|
||||
Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
|
||||
Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
|
||||
Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
|
||||
cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
|
||||
cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
|
||||
public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
|
||||
Static133.anInt5230 = arg2;
|
||||
Static265.anInt5765 = arg1;
|
||||
Static233.anInt5217 = arg4;
|
||||
Static251.anInt5449 = arg3;
|
||||
Static260.anInt1744 = arg0;
|
||||
if (Static233.anInt5217 >= 100) {
|
||||
@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
|
||||
@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
|
||||
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744;
|
||||
@Pc(49) int local49 = local44 - Static5.anInt40;
|
||||
@Pc(54) int local54 = local30 - Static138.renderX;
|
||||
@Pc(59) int local59 = local36 - Static134.renderZ;
|
||||
@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
|
||||
cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
|
||||
cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
|
||||
if (cameraPitch < 128) {
|
||||
cameraPitch = 128;
|
||||
}
|
||||
if (cameraPitch > 383) {
|
||||
cameraPitch = 383;
|
||||
}
|
||||
}
|
||||
cameraType = 2;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
|
||||
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
|
||||
Static113.anInt4612 = arg3;
|
||||
Static231.anInt5203 = arg2;
|
||||
Static245.anInt5375 = arg5;
|
||||
Static233.anInt5225 = arg1;
|
||||
Static248.anInt4232 = arg4;
|
||||
if (arg0 && Static113.anInt4612 >= 100) {
|
||||
Static138.renderX = Static245.anInt5375 * 128 + 64;
|
||||
Static134.renderZ = Static248.anInt4232 * 128 + 64;
|
||||
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
|
||||
}
|
||||
cameraType = 2;
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V")
|
||||
public static void resetCameraEffects() {
|
||||
for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
|
||||
Static176.customCameraActive[local3] = false;
|
||||
}
|
||||
Static133.anInt5230 = 0;
|
||||
Static233.anInt5217 = 0;
|
||||
anInt3718 = -1;
|
||||
anInt1694 = -1;
|
||||
cameraType = 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue