ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Rename Region to Scene

Browse Source
This commit is contained in:
Max Weber
2018-07-16 02:39:03 -06:00
parent 10ad7897a8
commit d7473bdb07
34 changed files with 161 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java
View File

@@ -40,8 +40,8 @@ public abstract class CameraMixin implements RSClient
@Shadow("clientInstance")
static RSClient client;
@Shadow("isDrawingRegion")
static boolean isDrawingRegion;
@Shadow("isDrawingScene")
static boolean isDrawingScene;
@Inject
static boolean pitchRelaxEnabled = false;
@@ -91,13 +91,13 @@ public abstract class CameraMixin implements RSClient
lastPitch = pitch;
}
// All of this is to bypass a check in Region.drawRegion
// All of this is to bypass a check in Scene.drawScene
@FieldHook("pitchSin")
@Inject
static void onPitchSinChanged(int idx)
{
if (pitchRelaxEnabled && isDrawingRegion)
if (pitchRelaxEnabled && isDrawingScene)
{
client.setPitchSin(Perspective.SINE[client.getCameraPitch()]);
}
@@ -108,7 +108,7 @@ public abstract class CameraMixin implements RSClient
@Inject
static void onPitchCosChanged(int idx)
{
if (pitchRelaxEnabled && isDrawingRegion)
if (pitchRelaxEnabled && isDrawingScene)
{
client.setPitchCos(Perspective.COSINE[client.getCameraPitch()]);
}

6
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java
View File

@@ -34,11 +34,11 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSNPC;
import net.runelite.rs.api.RSPlayer;
import net.runelite.rs.api.RSProjectile;
import net.runelite.rs.api.RSRegion;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSRenderable;
@Mixin(RSRegion.class)
public abstract class EntityHiderMixin implements RSRegion
@Mixin(RSScene.class)
public abstract class EntityHiderMixin implements RSScene
{
@Shadow("clientInstance")
private static RSClient client;

8
runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java
View File

@@ -28,7 +28,7 @@ import static net.runelite.api.Perspective.SCENE_SIZE;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSRegion;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSSpritePixels;
@Mixin(RSClient.class)
@@ -41,7 +41,7 @@ public abstract class MinimapMixin implements RSClient
RSSpritePixels ourSprite = createSpritePixels(new int[512 * 512], 512, 512);
RSSpritePixels theirSprite = getMinimapSprite();
RSRegion region = getRegion();
RSScene scene = getScene();
int[] pixels = ourSprite.getPixels();
byte[][][] tileSettings = getTileSettings();
@@ -58,12 +58,12 @@ public abstract class MinimapMixin implements RSClient
{
if ((tileSettings[z][y][x] & 24) == 0)
{
region.drawTile(pixels, var4, 512, z, y, x);
scene.drawTile(pixels, var4, 512, z, y, x);
}
if (z < 3 && (tileSettings[z + 1][y][x] & 8) != 0)
{
region.drawTile(pixels, var4, 512, z + 1, y, x);
scene.drawTile(pixels, var4, 512, z + 1, y, x);
}
var4 += 4;

18
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -233,17 +233,17 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public Tile getSelectedRegionTile()
public Tile getSelectedSceneTile()
{
int tileX = getSelectedRegionTileX();
int tileY = getSelectedRegionTileY();
int tileX = getSelectedSceneTileX();
int tileY = getSelectedSceneTileY();
if (tileX == -1 || tileY == -1)
{
return null;
}
return getRegion().getTiles()[getPlane()][tileX][tileY];
return getScene().getTiles()[getPlane()][tileX][tileY];
}
@Inject
@@ -590,11 +590,11 @@ public abstract class RSClientMixin implements RSClient
@Nullable
public LocalPoint getLocalDestinationLocation()
{
int regionX = getDestinationX();
int regionY = getDestinationY();
if (regionX != 0 && regionY != 0)
int sceneX = getDestinationX();
int sceneY = getDestinationY();
if (sceneX != 0 && sceneY != 0)
{
return LocalPoint.fromRegion(regionX, regionY);
return LocalPoint.fromScene(sceneX, sceneY);
}
return null;
}
@@ -604,7 +604,7 @@ public abstract class RSClientMixin implements RSClient
public void changeMemoryMode(boolean lowMemory)
{
setLowMemory(lowMemory);
setRegionLowMemory(lowMemory);
setSceneLowMemory(lowMemory);
setAudioHighMemory(true);
setObjectCompositionLowDetail(lowMemory);
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java
View File

@@ -45,14 +45,14 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Inject
@Override
public Point getRegionMinLocation()
public Point getSceneMinLocation()
{
return new Point(getRelativeX(), getRelativeY());
}
@Inject
@Override
public Point getRegionMaxLocation()
public Point getSceneMaxLocation()
{
return new Point(getOffsetX(), getOffsetY());
}

24
runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSSceneMixin.java
View File

@@ -36,33 +36,33 @@ import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSDecorativeObject;
import net.runelite.rs.api.RSGroundObject;
import net.runelite.rs.api.RSItemLayer;
import net.runelite.rs.api.RSRegion;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSWallObject;
@Mixin(RSRegion.class)
public abstract class RSRegionMixin implements RSRegion
@Mixin(RSScene.class)
public abstract class RSSceneMixin implements RSScene
{
@Shadow("clientInstance")
private static RSClient client;
@Inject
static boolean isDrawingRegion;
static boolean isDrawingScene;
@Copy("drawRegion")
abstract void rs$drawRegion(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane);
@Copy("drawScene")
abstract void rs$drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane);
@Replace("drawRegion")
void rl$drawRegion(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane)
@Replace("drawScene")
void rl$drawScene(int cameraX, int cameraY, int cameraZ, int cameraPitch, int cameraYaw, int plane)
{
try
{
isDrawingRegion = true;
rs$drawRegion(cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, plane);
client.getCallbacks().drawRegion();
isDrawingScene = true;
rs$drawScene(cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, plane);
client.getCallbacks().drawScene();
}
finally
{
isDrawingRegion = false;
isDrawingScene = false;
}
}

12
runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
View File

@@ -87,12 +87,12 @@ public abstract class RSTileMixin implements RSTile
@Override
public WorldPoint getWorldLocation()
{
return WorldPoint.fromRegion(client, getX(), getY(), getPlane());
return WorldPoint.fromScene(client, getX(), getY(), getPlane());
}
@Inject
@Override
public Point getRegionLocation()
public Point getSceneLocation()
{
return new Point(getX(), getY());
}
@@ -101,7 +101,7 @@ public abstract class RSTileMixin implements RSTile
@Override
public LocalPoint getLocalLocation()
{
return LocalPoint.fromRegion(getX(), getY());
return LocalPoint.fromScene(getX(), getY());
}
@FieldHook("wallObject")
@@ -272,7 +272,7 @@ public abstract class RSTileMixin implements RSTile
{
if (client.getGameState() != GameState.LOGGED_IN)
{
// during region loading this gets set to null 104x104 times
// during loading this gets set to null 104x104 times
return;
}
@@ -295,8 +295,8 @@ public abstract class RSTileMixin implements RSTile
int z = this.getPlane();
int[][] collisionDataFlags = collisionData[z].getFlags();
Point p1 = this.getRegionLocation();
Point p2 = other.getRegionLocation();
Point p1 = this.getSceneLocation();
Point p2 = other.getSceneLocation();
if (p1.getX() == p2.getX() && p1.getY() == p2.getY())
{
return true;