overlay renderer: clip above scene and under widgets to viewport on fixed
The minimap on fixed is drawn before above scene and under widgets
This commit is contained in:
@@ -76,6 +76,10 @@ public interface Client extends GameEngine
|
|||||||
|
|
||||||
int getViewportWidth();
|
int getViewportWidth();
|
||||||
|
|
||||||
|
int getViewportXOffset();
|
||||||
|
|
||||||
|
int getViewportYOffset();
|
||||||
|
|
||||||
int getScale();
|
int getScale();
|
||||||
|
|
||||||
Point getMouseCanvasPosition();
|
Point getMouseCanvasPosition();
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ public class OverlayRenderer extends MouseListener implements KeyListener
|
|||||||
|
|
||||||
if (overlayPosition == OverlayPosition.DYNAMIC || overlayPosition == OverlayPosition.TOOLTIP)
|
if (overlayPosition == OverlayPosition.DYNAMIC || overlayPosition == OverlayPosition.TOOLTIP)
|
||||||
{
|
{
|
||||||
safeRender(overlay, graphics, new Point());
|
safeRender(client, overlay, layer, graphics, new Point());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -338,7 +338,7 @@ public class OverlayRenderer extends MouseListener implements KeyListener
|
|||||||
location.setLocation(overlay.getPreferredLocation());
|
location.setLocation(overlay.getPreferredLocation());
|
||||||
}
|
}
|
||||||
|
|
||||||
safeRender(overlay, graphics, location);
|
safeRender(client, overlay, layer, graphics, location);
|
||||||
dimension.setSize(overlay.getBounds().getSize());
|
dimension.setSize(overlay.getBounds().getSize());
|
||||||
|
|
||||||
if (dimension.width == 0 && dimension.height == 0)
|
if (dimension.width == 0 && dimension.height == 0)
|
||||||
@@ -488,9 +488,16 @@ public class OverlayRenderer extends MouseListener implements KeyListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void safeRender(Overlay overlay, Graphics2D graphics, Point point)
|
private void safeRender(Client client, Overlay overlay, OverlayLayer layer, Graphics2D graphics, Point point)
|
||||||
{
|
{
|
||||||
final Graphics2D subGraphics = (Graphics2D) graphics.create();
|
final Graphics2D subGraphics = (Graphics2D) graphics.create();
|
||||||
|
if (!isResizeable && (layer == OverlayLayer.ABOVE_SCENE || layer == OverlayLayer.UNDER_WIDGETS))
|
||||||
|
{
|
||||||
|
subGraphics.setClip(client.getViewportXOffset(),
|
||||||
|
client.getViewportYOffset(),
|
||||||
|
client.getViewportWidth(),
|
||||||
|
client.getViewportHeight());
|
||||||
|
}
|
||||||
subGraphics.translate(point.x, point.y);
|
subGraphics.translate(point.x, point.y);
|
||||||
final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension());
|
final Dimension dimension = MoreObjects.firstNonNull(overlay.render(subGraphics), new Dimension());
|
||||||
subGraphics.dispose();
|
subGraphics.dispose();
|
||||||
|
|||||||
@@ -251,6 +251,14 @@ public interface RSClient extends RSGameEngine, Client
|
|||||||
@Override
|
@Override
|
||||||
int getViewportWidth();
|
int getViewportWidth();
|
||||||
|
|
||||||
|
@Import("Viewport_xOffset")
|
||||||
|
@Override
|
||||||
|
int getViewportXOffset();
|
||||||
|
|
||||||
|
@Import("Viewport_yOffset")
|
||||||
|
@Override
|
||||||
|
int getViewportYOffset();
|
||||||
|
|
||||||
@Import("isResized")
|
@Import("isResized")
|
||||||
@Override
|
@Override
|
||||||
boolean isResized();
|
boolean isResized();
|
||||||
|
|||||||
Reference in New Issue
Block a user