Skip to content

Commit 8a285ad

Browse files
committed
refactor: renaming for rendering
1 parent 33a2c25 commit 8a285ad

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

src/main/java/org/runejs/client/Main.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -803,12 +803,12 @@ public static void setConfigToDefaults() {
803803

804804
public static void method353() {
805805
MovedStatics.anInt2628++;
806-
SpotAnim.method833(0, true);
807-
ItemDefinition.method749(true);
808-
SpotAnim.method833(0, false);
809-
ItemDefinition.method749(false);
810-
MovedStatics.method335();
811-
MovedStatics.method1000();
806+
SpotAnim.renderPlayers(0, true);
807+
ItemDefinition.renderNPCs(true);
808+
SpotAnim.renderPlayers(0, false);
809+
ItemDefinition.renderNPCs(false);
810+
MovedStatics.renderProjectiles();
811+
MovedStatics.renderSpotAnims();
812812
if(!Player.cutsceneActive) {
813813
int pitch = Main.playerCamera.getPitch();
814814
if(SceneCamera.cameraTerrainMinScaledPitch / 256 > pitch) {
@@ -834,23 +834,23 @@ public static void method353() {
834834
Point3d shakeOffsetPosition = new Point3d(0, 0, 0);
835835
CameraRotation shakeOffsetRotation = new CameraRotation(0, 0);
836836

837-
for(int i_6_ = 0; i_6_ < 5; i_6_++) {
838-
if(SceneCamera.customCameraActive[i_6_]) {
839-
int i_7_ = (int) ((double) (SceneCamera.customCameraJitter[i_6_] * 2 + 1) * Math.random() - (double) SceneCamera.customCameraJitter[i_6_] + Math.sin((double) SceneCamera.customCameraTimer[i_6_] * ((double) SceneCamera.customCameraFrequency[i_6_] / 100.0)) * (double) SceneCamera.customCameraAmplitude[i_6_]);
840-
if(i_6_ == 1) {
841-
shakeOffsetPosition = shakeOffsetPosition.addZ(i_7_);
837+
for(int cameraType = 0; cameraType < 5; cameraType++) {
838+
if(SceneCamera.customCameraActive[cameraType]) {
839+
int shakeAmount = (int) ((double) (SceneCamera.customCameraJitter[cameraType] * 2 + 1) * Math.random() - (double) SceneCamera.customCameraJitter[cameraType] + Math.sin((double) SceneCamera.customCameraTimer[cameraType] * ((double) SceneCamera.customCameraFrequency[cameraType] / 100.0)) * (double) SceneCamera.customCameraAmplitude[cameraType]);
840+
if(cameraType == 1) {
841+
shakeOffsetPosition = shakeOffsetPosition.addZ(shakeAmount);
842842
}
843-
if(i_6_ == 0) {
844-
shakeOffsetPosition = shakeOffsetPosition.addX(i_7_);
843+
if(cameraType == 0) {
844+
shakeOffsetPosition = shakeOffsetPosition.addX(shakeAmount);
845845
}
846-
if(i_6_ == 2) {
847-
shakeOffsetPosition = shakeOffsetPosition.addY(i_7_);
846+
if(cameraType == 2) {
847+
shakeOffsetPosition = shakeOffsetPosition.addY(shakeAmount);
848848
}
849-
if(i_6_ == 4) {
850-
shakeOffsetRotation = shakeOffsetRotation.addPitch(i_7_);
849+
if(cameraType == 4) {
850+
shakeOffsetRotation = shakeOffsetRotation.addPitch(shakeAmount);
851851
}
852-
if(i_6_ == 3) {
853-
shakeOffsetRotation = shakeOffsetRotation.addYaw(i_7_);
852+
if(cameraType == 3) {
853+
shakeOffsetRotation = shakeOffsetRotation.addYaw(shakeAmount);
854854
}
855855
}
856856
}

src/main/java/org/runejs/client/MovedStatics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public static void initiateVertexHeights(int offsetY, int sizeY, int sizeX, int
334334
}
335335
}
336336

337-
public static void method1000() {
337+
public static void renderSpotAnims() {
338338
for (SpotAnim spotAnim = (SpotAnim) Class57.aLinkedList_1332.peekFirst(); spotAnim != null; spotAnim = (SpotAnim) Class57.aLinkedList_1332.pollFirst()) {
339339
if (Player.worldLevel == spotAnim.plane && !spotAnim.animationFinished) {
340340
if (pulseCycle >= spotAnim.startCycle) {
@@ -435,7 +435,7 @@ public static RSString intToStr(int arg0) {
435435
return PacketBuffer.method521(false, 10, arg0);
436436
}
437437

438-
public static void method335() {
438+
public static void renderProjectiles() {
439439
Projectile projectile = (Projectile) Class43.projectileQueue.peekFirst();
440440
for (/**/; projectile != null; projectile = (Projectile) Class43.projectileQueue.pollFirst()) {
441441
if (Player.worldLevel == projectile.anInt2981 && pulseCycle <= projectile.endCycle) {

src/main/java/org/runejs/client/SpotAnim.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ else if(lightness > 126)
5858
return lightness + (hsl & 0xff80);
5959
}
6060

61-
public static void method833(int arg0, boolean arg1) {
61+
public static void renderPlayers(int arg0, boolean arg1) {
6262
if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY)
6363
MovedStatics.destinationX = 0;
6464
int i = Player.localPlayerCount;

src/main/java/org/runejs/client/cache/def/ItemDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public static boolean checkForAlternateAction(GameInterface gameInterface) {
158158
return true;
159159
}
160160

161-
public static void method749(boolean arg0) {
161+
public static void renderNPCs(boolean arg0) {
162162
for(int i = 0; Player.npcCount > i; i++) {
163163
Npc npc = Player.npcs[Player.npcIds[i]];
164164
int i_15_ = 536870912 + (Player.npcIds[i] << 14);

0 commit comments

Comments
 (0)