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

Merge pull request #6292 from WooxSolo/fix-tile-outline

Browse Source 
Fix localToCanvas on fixed screen
This commit is contained in:
Tomas Slusny
2018-11-03 19:04:01 +01:00
committed by GitHub
parent 44934690ae 2eabb70422
commit 185fa52a20
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,9 @@ public class Perspective
{ {
int pointX = client.getViewportWidth() / 2 + x * client.getScale() / y; int pointX = client.getViewportWidth() / 2 + x * client.getScale() / y;
int pointY = client.getViewportHeight() / 2 + var8 * client.getScale() / y; int pointY = client.getViewportHeight() / 2 + var8 * client.getScale() / y;
return new Point(pointX, pointY); return new Point(
pointX + client.getViewportXOffset(),
pointY + client.getViewportYOffset());
} }
} }
@@ -593,15 +595,6 @@ public class Perspective
int maxX = Math.max(Math.max(a.getX(), b.getX()), c.getX()) + 4; int maxX = Math.max(Math.max(a.getX(), b.getX()), c.getX()) + 4;
int maxY = Math.max(Math.max(a.getY(), b.getY()), c.getY()) + 4; int maxY = Math.max(Math.max(a.getY(), b.getY()), c.getY()) + 4;
// ...and the rectangles in the fixed client are shifted 4 pixels right and down
if (!client.isResized())
{
minX += client.getViewportXOffset();
minY += client.getViewportYOffset();
maxX += client.getViewportXOffset();
maxY += client.getViewportYOffset();
}
Rectangle clickableRect = new Rectangle( Rectangle clickableRect = new Rectangle(
minX - radius, minY - radius, minX - radius, minY - radius,
maxX - minX + radius, maxY - minY + radius maxX - minX + radius, maxY - minY + radius

4
runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
View File

@@ -94,9 +94,7 @@ public class DemonicGorillaOverlay extends Overlay
gorilla.getNpc().getLogicalHeight() + 16); gorilla.getNpc().getLogicalHeight() + 16);
if (point != null) if (point != null)
{ {
point = new Point( point = new Point(point.getX(), point.getY());
client.getViewportXOffset() + point.getX(),
client.getViewportYOffset() + point.getY());
List<DemonicGorilla.AttackStyle> attackStyles = gorilla.getNextPosibleAttackStyles(); List<DemonicGorilla.AttackStyle> attackStyles = gorilla.getNextPosibleAttackStyles();
List<BufferedImage> icons = new ArrayList<>(); List<BufferedImage> icons = new ArrayList<>();

4
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
View File

@@ -80,8 +80,8 @@ class PrayerBarOverlay extends Overlay
final Point canvasPoint = Perspective.localToCanvas(client, localLocation, client.getPlane(), height); final Point canvasPoint = Perspective.localToCanvas(client, localLocation, client.getPlane(), height);
// Draw bar // Draw bar
final int barX = canvasPoint.getX() + client.getViewportXOffset() - 15; final int barX = canvasPoint.getX() - 15;
final int barY = canvasPoint.getY() + client.getViewportYOffset(); final int barY = canvasPoint.getY();
final int barWidth = PRAYER_BAR_SIZE.width; final int barWidth = PRAYER_BAR_SIZE.width;
final int barHeight = PRAYER_BAR_SIZE.height; final int barHeight = PRAYER_BAR_SIZE.height;
final float ratio = (float) client.getBoostedSkillLevel(Skill.PRAYER) / client.getRealSkillLevel(Skill.PRAYER); final float ratio = (float) client.getBoostedSkillLevel(Skill.PRAYER) / client.getRealSkillLevel(Skill.PRAYER);