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

overlay renderer: reduce graphics properties copying

Browse Source
This commit is contained in:
Adam
2019-08-13 17:30:57 -04:00
parent ac5b2ff82a
commit eb118c24de
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -203,6 +203,15 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition(); final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition();
final Point mouse = new Point(mouseCanvasPosition.getX(), mouseCanvasPosition.getY()); final Point mouse = new Point(mouseCanvasPosition.getX(), mouseCanvasPosition.getY());
// Save graphics2d properties so we can restore them later
final AffineTransform transform = graphics.getTransform();
final Stroke stroke = graphics.getStroke();
final Composite composite = graphics.getComposite();
final Paint paint = graphics.getPaint();
final Color color = graphics.getColor();
final RenderingHints renderingHints = graphics.getRenderingHints();
final Color background = graphics.getBackground();
for (Overlay overlay : overlays) for (Overlay overlay : overlays)
{ {
OverlayPosition overlayPosition = overlay.getPosition(); OverlayPosition overlayPosition = overlay.getPosition();
@@ -267,26 +276,34 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
} }
safeRender(client, overlay, layer, graphics, location); safeRender(client, overlay, layer, graphics, location);
final Rectangle bounds = overlay.getBounds(); final Rectangle bounds = overlay.getBounds();
if (bounds.isEmpty()) if (!bounds.isEmpty())
{ {
continue; if (inOverlayDraggingMode)
} {
final Color previous = graphics.getColor();
graphics.setColor(movedOverlay == overlay ? MOVING_OVERLAY_ACTIVE_COLOR : MOVING_OVERLAY_COLOR);
graphics.draw(bounds);
graphics.setColor(previous);
}
if (inOverlayDraggingMode) if (menuEntries == null && !client.isMenuOpen() && bounds.contains(mouse))
{ {
final Color previous = graphics.getColor(); menuEntries = createRightClickMenuEntries(overlay);
graphics.setColor(movedOverlay == overlay ? MOVING_OVERLAY_ACTIVE_COLOR : MOVING_OVERLAY_COLOR); }
graphics.draw(bounds);
graphics.setColor(previous);
}
if (menuEntries == null && !client.isMenuOpen() && bounds.contains(mouse))
{
menuEntries = createRightClickMenuEntries(overlay);
} }
} }
// Restore graphics2d properties
graphics.setTransform(transform);
graphics.setStroke(stroke);
graphics.setComposite(composite);
graphics.setPaint(paint);
graphics.setColor(color);
graphics.setRenderingHints(renderingHints);
graphics.setBackground(background);
} }
} }
@@ -466,15 +483,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
graphics.setFont(runeLiteConfig.interfaceFontType().getFont()); graphics.setFont(runeLiteConfig.interfaceFontType().getFont());
} }
// Save graphics2d properties so we can restore them later
final AffineTransform transform = graphics.getTransform();
final Stroke stroke = graphics.getStroke();
final Composite composite = graphics.getComposite();
final Paint paint = graphics.getPaint();
final Color color = graphics.getColor();
final RenderingHints renderingHints = graphics.getRenderingHints();
final Color background = graphics.getBackground();
graphics.translate(point.x, point.y); graphics.translate(point.x, point.y);
final Dimension overlayDimension; final Dimension overlayDimension;
@@ -487,17 +495,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
log.warn("Error during overlay rendering", ex); log.warn("Error during overlay rendering", ex);
return; return;
} }
finally
{
// Restore graphics2d properties
graphics.setTransform(transform);
graphics.setStroke(stroke);
graphics.setComposite(composite);
graphics.setPaint(paint);
graphics.setColor(color);
graphics.setRenderingHints(renderingHints);
graphics.setBackground(background);
}
final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension()); final Dimension dimension = MoreObjects.firstNonNull(overlayDimension, new Dimension());
overlay.setBounds(new Rectangle(point, dimension)); overlay.setBounds(new Rectangle(point, dimension));