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

Remove duplicated and unused OverlayUtil code

Browse Source 
- Use OverlayUtil in implings plugin
- Remove unused code in OverlayUtil

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-03-07 10:57:45 +01:00
parent 6c6212299d
commit 88c2804ed4
2 changed files with 4 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
View File

@@ -25,7 +25,6 @@
package net.runelite.client.plugins.implings; package net.runelite.client.plugins.implings;
import com.google.common.primitives.Ints; import com.google.common.primitives.Ints;
import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
@@ -42,6 +41,7 @@ import net.runelite.api.queries.NPCQuery;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.QueryRunner; import net.runelite.client.util.QueryRunner;
/** /**
@@ -156,34 +156,19 @@ public class ImplingsOverlay extends Overlay
Polygon poly = actor.getCanvasTilePoly(); Polygon poly = actor.getCanvasTilePoly();
if (poly != null) if (poly != null)
{ {
graphics.setColor(color); OverlayUtil.renderPolygon(graphics, poly, color);
graphics.setStroke(new BasicStroke(2));
graphics.drawPolygon(poly);
graphics.setColor(new Color(0, 0, 0, 50));
graphics.fillPolygon(poly);
} }
Point minimapLocation = actor.getMinimapLocation(); Point minimapLocation = actor.getMinimapLocation();
if (minimapLocation != null) if (minimapLocation != null)
{ {
graphics.setColor(color); OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color);
graphics.fillOval(minimapLocation.getX(), minimapLocation.getY(), 5, 5);
graphics.setColor(Color.WHITE);
graphics.setStroke(new BasicStroke(1));
graphics.drawOval(minimapLocation.getX(), minimapLocation.getY(), 5, 5);
} }
Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getLogicalHeight()); Point textLocation = actor.getCanvasTextLocation(graphics, text, actor.getLogicalHeight());
if (textLocation != null) if (textLocation != null)
{ {
int x = textLocation.getX(); OverlayUtil.renderTextLocation(graphics, textLocation, text, color);
int y = textLocation.getY();
graphics.setColor(Color.BLACK);
graphics.drawString(text, x + 1, y + 1);
graphics.setColor(color);
graphics.drawString(text, x, y);
} }
} }

54
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java
View File

@@ -32,10 +32,7 @@ import java.awt.Polygon;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.SpritePixels;
import net.runelite.api.TileObject; import net.runelite.api.TileObject;
import net.runelite.client.ui.FontManager; import net.runelite.client.ui.FontManager;
@@ -83,14 +80,6 @@ public class OverlayUtil
graphics.drawImage(image, x, y, null); graphics.drawImage(image, x, y, null);
} }
public static void renderSpriteLocation(Graphics2D graphics, Point imgLoc, SpritePixels sprite)
{
int x = imgLoc.getX();
int y = imgLoc.getY();
sprite.drawAt(x, y);
}
public static void renderActorOverlay(Graphics2D graphics, Actor actor, String text, Color color) public static void renderActorOverlay(Graphics2D graphics, Actor actor, String text, Color color)
{ {
Polygon poly = actor.getCanvasTilePoly(); Polygon poly = actor.getCanvasTilePoly();
@@ -121,27 +110,6 @@ public class OverlayUtil
} }
} }
public static void renderActorOverlaySprite(Graphics2D graphics, Actor actor, SpritePixels sprite, Color color)
{
Polygon poly = actor.getCanvasTilePoly();
if (poly != null)
{
renderPolygon(graphics, poly, color);
}
Point minimapLocation = actor.getMinimapLocation();
if (minimapLocation != null)
{
renderMinimapLocation(graphics, minimapLocation, color);
}
Point imageLocation = actor.getCanvasSpriteLocation(graphics, sprite, actor.getLogicalHeight());
if (imageLocation != null)
{
renderSpriteLocation(graphics, imageLocation, sprite);
}
}
public static void renderTileOverlay(Graphics2D graphics, TileObject tileObject, String text, Color color) public static void renderTileOverlay(Graphics2D graphics, TileObject tileObject, String text, Color color)
{ {
Polygon poly = tileObject.getCanvasTilePoly(); Polygon poly = tileObject.getCanvasTilePoly();
@@ -163,28 +131,6 @@ public class OverlayUtil
} }
} }
public static void renderTilePointOverlay(Graphics2D graphics, Client client, Point point, String text, Color color)
{
Polygon poly = Perspective.getCanvasTilePoly(client, point);
if (poly != null)
{
renderPolygon(graphics, poly, color);
}
Point minimapLocation = Perspective.worldToMiniMap(client, point.getX(), point.getY());
if (minimapLocation != null)
{
renderMinimapLocation(graphics, minimapLocation, color);
}
Point textLocation = Perspective.getCanvasTextLocation(client, graphics, point, text, 0);
if (textLocation != null)
{
renderTextLocation(graphics, textLocation, text, color);
}
}
public static void setGraphicProperties(Graphics2D graphics) public static void setGraphicProperties(Graphics2D graphics)
{ {
graphics.setFont(FontManager.getRunescapeFont()); graphics.setFont(FontManager.getRunescapeFont());