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

perspective: account for minimap being hidden or moved in worldToMiniMap

Browse Source
This commit is contained in:
Adam
2018-07-22 10:37:32 -04:00
parent 0297f7684c
commit 381696fddd
1 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,13 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.model.Jarvis; import net.runelite.api.model.Jarvis;
import net.runelite.api.model.Triangle; import net.runelite.api.model.Triangle;
import net.runelite.api.model.Vertex; import net.runelite.api.model.Vertex;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
/** /**
* A utility class containing methods to help with conversion between * A utility class containing methods to help with conversion between
@@ -188,6 +191,7 @@ public class Perspective
* @return a {@link Point} on screen corresponding to the position in * @return a {@link Point} on screen corresponding to the position in
* 3D-space * 3D-space
*/ */
@Nullable
public static Point worldToMiniMap(@Nonnull Client client, int x, int y) public static Point worldToMiniMap(@Nonnull Client client, int x, int y)
{ {
return worldToMiniMap(client, x, y, 6400); return worldToMiniMap(client, x, y, 6400);
@@ -204,30 +208,52 @@ public class Perspective
* @return a {@link Point} on screen corresponding to the position in * @return a {@link Point} on screen corresponding to the position in
* 3D-space * 3D-space
*/ */
@Nullable
public static Point worldToMiniMap(@Nonnull Client client, int x, int y, int distance) public static Point worldToMiniMap(@Nonnull Client client, int x, int y, int distance)
{ {
int angle = client.getMapAngle() & 0x7FF;
LocalPoint localLocation = client.getLocalPlayer().getLocalLocation(); LocalPoint localLocation = client.getLocalPlayer().getLocalLocation();
x = x / 32 - localLocation.getX() / 32; final int sceneX = x >>> LOCAL_COORD_BITS;
y = y / 32 - localLocation.getY() / 32; final int sceneY = y >>> LOCAL_COORD_BITS;
x = sceneX * 4 + 2 - localLocation.getX() / 32;
y = sceneY * 4 + 2 - localLocation.getY() / 32;
int dist = x * x + y * y; int dist = x * x + y * y;
if (dist < distance) if (dist < distance)
{ {
int sin = SINE[angle]; Widget minimapDrawWidget;
int cos = COSINE[angle]; if (client.isResized())
{
if (client.getVar(Varbits.SIDE_PANELS) == 1)
{
minimapDrawWidget = client.getWidget(WidgetInfo.RESIZABLE_MINIMAP_DRAW_AREA);
}
else
{
minimapDrawWidget = client.getWidget(WidgetInfo.RESIZABLE_MINIMAP_STONES_DRAW_AREA);
}
}
else
{
minimapDrawWidget = client.getWidget(WidgetInfo.FIXED_VIEWPORT_MINIMAP_DRAW_AREA);
}
int xx = y * sin + cos * x >> 16; if (minimapDrawWidget == null || minimapDrawWidget.isHidden())
int yy = sin * x - y * cos >> 16; {
return null;
}
int miniMapX = client.isResized() final int angle = client.getMapAngle() & 0x7FF;
? client.getCanvas().getWidth() - 167
: Constants.GAME_FIXED_WIDTH - 208;
x = (miniMapX + 167 / 2) + xx; final int sin = SINE[angle];
y = (167 / 2 - 1) + yy; final int cos = COSINE[angle];
return new Point(x, y);
final int xx = y * sin + cos * x >> 16;
final int yy = sin * x - y * cos >> 16;
Point loc = minimapDrawWidget.getCanvasLocation();
int miniMapX = loc.getX() + xx + minimapDrawWidget.getWidth() / 2;
int miniMapY = minimapDrawWidget.getHeight() / 2 + loc.getY() + yy;
return new Point(miniMapX, miniMapY);
} }
return null; return null;