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

Properly name Perspective methods, remove unused

Browse Source 
- Properly rename world->local Perspective methods and force them to
accept LocalPoint to prevent confusion
- Remove unused params from Perspective methods

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-07-30 17:38:40 +02:00
parent 40637f8f92
commit 73dbea874a
24 changed files with 95 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,23 +163,23 @@ public abstract class RSActorMixin implements RSActor
@Inject
@Override
public Point getCanvasImageLocation(Graphics2D graphics, BufferedImage image, int zOffset)
public Point getCanvasImageLocation(BufferedImage image, int zOffset)
{
return Perspective.getCanvasImageLocation(client, graphics, getLocalLocation(), image, zOffset);
return Perspective.getCanvasImageLocation(client, getLocalLocation(), image, zOffset);
}
@Inject
@Override
public Point getCanvasSpriteLocation(Graphics2D graphics, SpritePixels sprite, int zOffset)
public Point getCanvasSpriteLocation(SpritePixels sprite, int zOffset)
{
return Perspective.getCanvasSpriteLocation(client, graphics, getLocalLocation(), sprite, zOffset);
return Perspective.getCanvasSpriteLocation(client, getLocalLocation(), sprite, zOffset);
}
@Inject
@Override
public Point getMinimapLocation()
{
return Perspective.worldToMiniMap(client, getX(), getY());
return Perspective.localToMinimap(client, getLocalLocation());
}
@FieldHook("animation")

2
runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java
View File

@@ -86,7 +86,7 @@ public abstract class RSDecorativeObjectMixin implements RSDecorativeObject
@Override
public Area getClickbox()
{
return Perspective.getClickbox(client, getModel(), getOrientation(), getX(), getY());
return Perspective.getClickbox(client, getModel(), getOrientation(), getLocalLocation());
}
@Inject

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

@@ -80,7 +80,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override
public Area getClickbox()
{
return Perspective.getClickbox(client, getModel(), getRsOrientation(), getX(), getY());
return Perspective.getClickbox(client, getModel(), getRsOrientation(), getLocalLocation());
}
@Inject

2
runelite-mixins/src/main/java/net/runelite/mixins/RSGroundObjectMixin.java
View File

@@ -80,6 +80,6 @@ public abstract class RSGroundObjectMixin implements RSGroundObject
@Override
public Area getClickbox()
{
return Perspective.getClickbox(client, getModel(), 0, getX(), getY());
return Perspective.getClickbox(client, getModel(), 0, getLocalLocation());
}
}

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

@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
@@ -250,9 +251,8 @@ public abstract class RSModelMixin implements RSModel
for (Vertex v : vertices)
{
// Compute canvas location of vertex
Point p = Perspective.worldToCanvas(client,
localX - v.getX(),
localY - v.getZ(),
Point p = Perspective.localToCanvas(client,
new LocalPoint(localX - v.getX(), localY - v.getZ()),
client.getPlane(),
-v.getY());
if (p != null)

16
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
View File

@@ -37,6 +37,7 @@ import static net.runelite.api.HeadIcon.SMITE;
import net.runelite.api.Model;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -129,21 +130,18 @@ public abstract class RSPlayerMixin implements RSPlayer
Vertex vy = triangle.getB();
Vertex vz = triangle.getC();
Point x = Perspective.worldToCanvas(client,
localX - vx.getX(),
localY - vx.getZ(),
Point x = Perspective.localToCanvas(client,
new LocalPoint(localX - vx.getX(), localY - vx.getZ()),
client.getPlane(),
-vx.getY());
Point y = Perspective.worldToCanvas(client,
localX - vy.getX(),
localY - vy.getZ(),
Point y = Perspective.localToCanvas(client,
new LocalPoint(localX - vy.getX(), localY - vy.getZ()),
client.getPlane(),
-vy.getY());
Point z = Perspective.worldToCanvas(client,
localX - vz.getX(),
localY - vz.getZ(),
Point z = Perspective.localToCanvas(client,
new LocalPoint(localX - vz.getX(), localY - vz.getZ()),
client.getPlane(),
-vz.getY());

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

@@ -101,8 +101,8 @@ public abstract class RSWallObjectMixin implements RSWallObject
{
Area clickbox = new Area();
Area clickboxA = Perspective.getClickbox(client, getModelA(), getOrientationA(), getX(), getY());
Area clickboxB = Perspective.getClickbox(client, getModelB(), getOrientationB(), getX(), getY());
Area clickboxA = Perspective.getClickbox(client, getModelA(), getOrientationA(), getLocalLocation());
Area clickboxB = Perspective.getClickbox(client, getModelB(), getOrientationB(), getLocalLocation());
if (clickboxA == null && clickboxB == null)
{

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

@@ -87,7 +87,7 @@ public abstract class TileObjectMixin implements TileObject
@Inject
public Point getCanvasLocation(int zOffset)
{
return Perspective.worldToCanvas(client, getX(), getY(), getPlane(), zOffset);
return Perspective.localToCanvas(client, getLocalLocation(), getPlane(), zOffset);
}
@Override
@@ -108,6 +108,6 @@ public abstract class TileObjectMixin implements TileObject
@Inject
public Point getMinimapLocation()
{
return Perspective.worldToMiniMap(client, getX(), getY());
return Perspective.localToMinimap(client, getLocalLocation());
}
}