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

grounditems: Render ground items tile overlay at correct height (#12586)

Browse Source
This commit is contained in:
Joona
2020-10-23 20:15:01 +03:00
committed by GitHub
parent 4dd413bf63
commit 0b221d3121
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runelite-api/src/main/java/net/runelite/api/Perspective.java
View File

@@ -364,6 +364,20 @@ public class Perspective
return getCanvasTileAreaPoly(client, localLocation, 1); return getCanvasTileAreaPoly(client, localLocation, 1);
} }
/**
* Calculates a tile polygon from offset worldToScreen() points.
*
* @param client the game client
* @param localLocation local location of the tile
* @param zOffset offset from ground plane
* @return a {@link Polygon} on screen corresponding to the given
* localLocation.
*/
public static Polygon getCanvasTilePoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int zOffset)
{
return getCanvasTileAreaPoly(client, localLocation, 1, zOffset);
}
/** /**
* Returns a polygon representing an area. * Returns a polygon representing an area.
* *
@@ -373,6 +387,24 @@ public class Perspective
* @return a polygon representing the tiles in the area * @return a polygon representing the tiles in the area
*/ */
public static Polygon getCanvasTileAreaPoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int size) public static Polygon getCanvasTileAreaPoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int size)
{
return getCanvasTileAreaPoly(client, localLocation, size, 0);
}
/**
* Returns a polygon representing an area.
*
* @param client the game client
* @param localLocation the center location of the AoE
* @param size the size of the area (ie. 3x3 AoE evaluates to size 3)
* @param zOffset offset from ground plane
* @return a polygon representing the tiles in the area
*/
public static Polygon getCanvasTileAreaPoly(
@Nonnull Client client,
@Nonnull LocalPoint localLocation,
int size,
int zOffset)
{ {
final int plane = client.getPlane(); final int plane = client.getPlane();
@@ -404,10 +436,10 @@ public class Perspective
tilePlane = plane + 1; tilePlane = plane + 1;
} }
final int swHeight = getHeight(client, swX, swY, tilePlane); final int swHeight = getHeight(client, swX, swY, tilePlane) - zOffset;
final int nwHeight = getHeight(client, nwX, nwY, tilePlane); final int nwHeight = getHeight(client, nwX, nwY, tilePlane) - zOffset;
final int neHeight = getHeight(client, neX, neY, tilePlane); final int neHeight = getHeight(client, neX, neY, tilePlane) - zOffset;
final int seHeight = getHeight(client, seX, seY, tilePlane); final int seHeight = getHeight(client, seX, seY, tilePlane) - zOffset;
Point p1 = localToCanvas(client, swX, swY, swHeight); Point p1 = localToCanvas(client, swX, swY, swHeight);
Point p2 = localToCanvas(client, nwX, nwY, nwHeight); Point p2 = localToCanvas(client, nwX, nwY, nwHeight);

2
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
View File

@@ -210,7 +210,7 @@ public class GroundItemsOverlay extends Overlay
if (config.highlightTiles()) if (config.highlightTiles())
{ {
final Polygon poly = Perspective.getCanvasTilePoly(client, groundPoint); final Polygon poly = Perspective.getCanvasTilePoly(client, groundPoint, item.getHeight());
if (poly != null) if (poly != null)
{ {