WIP Frame renderer rework

src/main/java/org/runejs/client/MovedStatics.java

@@ -314,7 +314,7 @@ public class MovedStatics {
     public static boolean aBoolean512;
     public static int[] anIntArray3111;
     public static Signlink signlink;
-    public static ProducingGraphicsBuffer tabPieveLowerRight;
+    public static ProducingGraphicsBuffer tabPieceLowerRight;
     public static GameSocket lostConnectionSocket;
     public static ProducingGraphicsBuffer tabPieceLeft;
     public static int anInt3048 = 1;
@@ -1459,7 +1459,7 @@ private static void method344(int arg0) {
                 tabHighlightImageBottomLeft = null;
                 tabHighlightImageBottomLeftEdge = null;
                 fullScreenTextureArray = null;
-                tabPieveLowerRight = null;
+                tabPieceLowerRight = null;
                 framePieceTop = null;
                 chatboxBackgroundImage = null;
             }
@@ -1921,7 +1921,7 @@ public static void drawWelcomeScreenGraphics() {
                 framePieceTop.drawGraphics(0, 0, graphics);
                 mapBackRight.drawGraphics(516, 4, graphics);
                 tabPieceUpperRight.drawGraphics(516, 205, graphics);
-                tabPieveLowerRight.drawGraphics(496, 357, graphics);
+                tabPieceLowerRight.drawGraphics(496, 357, graphics);
                 chatboxTop.drawGraphics(0, 338, graphics);
             }
         } catch(Exception exception) {
@@ -1971,7 +1971,7 @@ public static void method763(Component arg0, CacheArchive arg2) {
             tabPieceUpperRight = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
             image.drawInverse(0, 0);
             image = method1028(arg2, Native.imgBackvmid3, Native.aClass1_305);
-            tabPieveLowerRight = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
+            tabPieceLowerRight = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);
             image.drawInverse(0, 0);
             image = method1028(arg2, Native.imgBackhmid2, Native.aClass1_305);
             chatboxTop = createGraphicsBuffer(image.imageWidth, image.imageHeight, arg0);

src/main/java/org/runejs/client/frame/ChatBoxRenderer.java

@@ -0,0 +1,41 @@
+package org.runejs.client.frame;
+
+import org.runejs.client.Game;
+import org.runejs.client.MovedStatics;
+import org.runejs.client.ProducingGraphicsBuffer;
+import org.runejs.client.media.RasterizerInstanced;
+
+/**
+ * Renders the chat box.
+ */
+public class ChatBoxRenderer extends FramePieceRenderer {
+    private final ProducingGraphicsBuffer graphics;
+
+    public ChatBoxRenderer() {
+        super(
+            new FramePieceAnchor(
+                FramePieceAnchor.Anchor.BOTTOM | FramePieceAnchor.Anchor.LEFT,
+                0,
+                -22
+            ),
+            516,
+            184
+        );
+
+        graphics = MovedStatics.createGraphicsBuffer(this.width, this.height, Game.gameCanvas);
+        rasterizerInstanced = new RasterizerInstanced(graphics);
+    }
+
+    public ProducingGraphicsBuffer getDrawable() {
+        return graphics;
+    }
+
+    public void render() {
+        copyProducer(ChatBox.chatBoxImageProducer, 17, 16);
+        copyProducer(MovedStatics.chatModes, 0, 112);
+        copyProducerCutOff(MovedStatics.tabBottom, 496, 125, 20, MovedStatics.tabBottom.height, 0, 0);
+        copyProducer(MovedStatics.chatboxRight, 0, 16);
+        copyProducerCutOff(MovedStatics.chatboxTop, 0, 0, MovedStatics.chatboxTop.width - 37, MovedStatics.chatboxTop.height - 3, 0, 3);
+        copyProducerCutOff(MovedStatics.tabPieceLowerRight, 496, 16, 20, MovedStatics.tabPieceLowerRight.height, 0, 0);
+    }
+}

src/main/java/org/runejs/client/frame/FramePieceAnchor.java

@@ -0,0 +1,68 @@
+package org.runejs.client.frame;
+
+/**
+ * Represents an anchor for a {@link FramePieceRenderer},
+ * i.e. the position of the piece relative to the overall window.
+ */
+public class FramePieceAnchor {
+    /**
+     * The different anchor types.
+     * 
+     * These are bit flags, so they can be combined.
+     */
+    public static class Anchor {
+        public static final int LEFT   = 0b0001;
+        public static final int RIGHT  = 0b0010;
+        public static final int TOP    = 0b0100;
+        public static final int BOTTOM = 0b1000;
+    }
+
+    /**
+     * The anchor type, composed of the {@link Anchor} flags.
+     */
+    public final int anchor;
+
+    /**
+     * The margin from the anchor in the X direction.
+     */
+    public final int marginX;
+
+    /**
+     * The margin from the anchor in the Y direction.
+     */
+    public final int marginY;
+
+    public FramePieceAnchor(int anchor, int marginX, int marginY) {
+        this.anchor = anchor;
+        this.marginX = marginX;
+        this.marginY = marginY;
+    }
+
+    /**
+     * Gets the position of the piece relative to the overall window.
+     * 
+     * @param drawWidth The width of the window.
+     * @param drawHeight The height of the window.
+     * @param sizeX The width of the piece.
+     * @param sizeY The height of the piece.
+     * @return The position of the piece.
+     */
+    public int[] getPosition(int drawWidth, int drawHeight, int sizeX, int sizeY) {
+        int x = 0;
+        int y = 0;
+
+        if ((anchor & Anchor.LEFT) == Anchor.LEFT) {
+            x = marginX;
+        } else if ((anchor & Anchor.RIGHT) == Anchor.RIGHT) {
+            x = drawWidth - sizeX - marginX;
+        }
+
+        if ((anchor & Anchor.TOP) == Anchor.TOP) {
+            y = marginY;
+        } else if ((anchor & Anchor.BOTTOM) == Anchor.BOTTOM) {
+            y = drawHeight - sizeY - marginY;
+        }
+
+        return new int[]{x, y};
+    }
+}

src/main/java/org/runejs/client/frame/FramePieceRenderer.java

@@ -1,11 +1,71 @@
 package org.runejs.client.frame;
 
+import org.runejs.client.ProducingGraphicsBuffer;
 import org.runejs.client.cache.media.ImageRGB;
 import org.runejs.client.media.RasterizerInstanced;
 
-public class FramePieceRenderer {
+public abstract class FramePieceRenderer {
     public RasterizerInstanced rasterizerInstanced;
 
+    public final FramePieceAnchor anchor;
+    public final int width;
+    public final int height;
+
+    public FramePieceRenderer(FramePieceAnchor anchor, int width, int height) {
+        this.anchor = anchor;
+        this.width = width;
+        this.height = height;
+    }
+
+    public abstract ProducingGraphicsBuffer getDrawable();
+
+    /**
+     * Draws the piece.
+     * @param drawWidth The width of the window.
+     * @param drawHeight The height of the window.
+     * 
+     * TODO (jkm) refactor this to not use static `ScreenController`.
+     */
+    public void draw(int drawWidth, int drawHeight) {
+        int[] position = this.anchor.getPosition(drawWidth, drawHeight, this.width, this.height);
+
+        ScreenController.drawFramePiece(
+            getDrawable(),
+            position[0],
+            position[1]
+        );
+    }
+
+    /**
+     * Copies the pixels from a ProducingGraphicsBuffer to the rasterizer.
+     * 
+     * See {@link RasterizerInstanced#copyPixels} for more information.
+     * 
+     * @param producer The ProducingGraphicsBuffer to copy from.
+     * @param x The X position to copy to.
+     * @param y The Y position to copy to.
+     */
+    protected void copyProducer(ProducingGraphicsBuffer producer, int x, int y) {
+        rasterizerInstanced.copyPixels(producer.pixels, producer.width, producer.height, x, y);
+    }
+
+    /**
+     * Copies the pixels from a ProducingGraphicsBuffer to the rasterizer.
+     * 
+     * See {@link RasterizerInstanced#copyPixelsCutOff} for more information.
+     * 
+     * @param producer The ProducingGraphicsBuffer to copy from.
+     * @param x The X position to copy to.
+     * @param y The Y position to copy to.
+     * @param width The width of the area to copy.
+     * @param height The height of the area to copy.
+     * @param offsetX The X offset to copy from.
+     * @param offsetY The Y offset to copy from.
+     */
+    protected void copyProducerCutOff(ProducingGraphicsBuffer producer, int x, int y, int width, int height, int offsetX, int offsetY) {
+        rasterizerInstanced.copyPixelsCutOff(producer.pixels, producer.width, producer.height, x, y, width, height, offsetX, offsetY);
+    }
+
     public void shapeImageToPixels(ImageRGB image, int x, int y, int width, int height, int arg4, int arg5, int k1, int zoom, int[] arg8, int[] arg9) {
         try {
             int centerX = -width / 2;

src/main/java/org/runejs/client/frame/Minimap.java

@@ -48,6 +48,16 @@ public class Minimap extends FramePieceRenderer {
     private static int[] resizableMinimapLineOffsets;
 
     public Minimap() {
+        super(
+            new FramePieceAnchor(
+                FramePieceAnchor.Anchor.TOP | FramePieceAnchor.Anchor.RIGHT,
+                0,
+                0
+            ),
+            210,
+            210
+        );
+
         this.tempResizableMiniMapimage = MovedStatics.createGraphicsBuffer(210, 210, Game.gameCanvas);
         resizableMinimapOffsets1 = new int[200];
         resizableMinimapOffsets2 = new int[200];
@@ -422,8 +432,8 @@ public static void drawMapBack() {
         }
     }
 
-    public void drawResizableMiniMapArea(int x, int y) {
-        ScreenController.drawFramePiece(resizableMiniMapimage, x, y);
+    public ProducingGraphicsBuffer getDrawable() {
+        return resizableMiniMapimage;
     }
 
     public void RenderResizableMiniMapArea(int x, int y) {

src/main/java/org/runejs/client/frame/ResizableFrameRenderer.java

@@ -6,20 +6,21 @@
 public class ResizableFrameRenderer implements FrameRenderer {
     private final Minimap minimap;
     private final TabProducer tabProducer;
+    private final ChatBoxRenderer chatbox;
 
-    public ResizableFrameRenderer(Minimap minimap, TabProducer tabProducer) {
+    public ResizableFrameRenderer(Minimap minimap, TabProducer tabProducer, ChatBoxRenderer chatbox) {
         this.minimap = minimap;
         this.tabProducer = tabProducer;
+        this.chatbox = chatbox;
     }
 
     @Override
     public void run() {
         while(true){
             if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
                 minimap.RenderResizableMiniMapArea(ScreenController.drawWidth - 210, 0);
-            }
-            if(Game.gameStatusCode <= 35 && Game.gameStatusCode >= 30){
                 tabProducer.RenderResizableSideBarArea();
+                chatbox.render();
             }
             try {
                 Thread.sleep(1);

src/main/java/org/runejs/client/frame/ScreenController.java

@@ -27,6 +27,7 @@ public class ScreenController {
     public static int drawHeight = 540;
     public static Minimap minimap = new Minimap();
     public static TabProducer tabProducer = new TabProducer();
+    public static ChatBoxRenderer chatBoxRenderer = new ChatBoxRenderer();
     private static Thread drawingThread;
     private static FrameRenderer renderer;
     public static boolean DebugView = false;
@@ -129,15 +130,14 @@ public static void setBounds() {
      */
     public static void RenderResizableUI() {
         if (drawingThread == null) {
-            renderer = new ResizableFrameRenderer(minimap, tabProducer);
+            renderer = new ResizableFrameRenderer(minimap, tabProducer, chatBoxRenderer);
             drawingThread = new Thread(renderer);
             drawingThread.start();
         }
-        minimap.drawResizableMiniMapArea(drawWidth - 210, 0);
-        RenderTabArea(drawWidth - 234, drawHeight - (337));
-        RenderChatArea(0, drawHeight - (162));
 
-        tabProducer.drawResizableSideBarArea(drawWidth - 241, drawHeight - (334));
+        minimap.draw(drawWidth, drawHeight);
+        tabProducer.draw(drawWidth, drawHeight);
+        chatBoxRenderer.draw(drawWidth, drawHeight);
 
         if (DebugView) {
             int mX = MouseHandler.mouseX;
@@ -200,37 +200,6 @@ public static Dimension getInnerSize(Frame frame) {
         return size;
     }
 
-    /**
-     * TODO (jkm) move all this to ResizableFrameRenderer
-     */
-    public static void RenderTabArea(int x, int y) {
-        // height 337
-        // width 234
-        drawFramePiece(MovedStatics.tabPieceLeft, x + 212, y + 39);
-        drawFramePieceCutout(MovedStatics.tabPieceUpperRight, x, y + 39, MovedStatics.tabPieceUpperRight.width - 15, MovedStatics.tabPieceUpperRight.height, 15, 0);
-        drawFramePieceCutout(MovedStatics.tabPieveLowerRight, x, y + 191, MovedStatics.tabPieveLowerRight.width - 35, MovedStatics.tabPieveLowerRight.height, 35, 0);
-        drawFramePieceCutout(MovedStatics.chatboxTop, x, y + 172, MovedStatics.chatboxTop.width - 531, MovedStatics.chatboxTop.height, 531, 0);
-        drawFramePieceCutout(MovedStatics.tabBottom, x, y + 300, MovedStatics.tabBottom.width - 35, MovedStatics.tabBottom.height, 35, 0);
-        drawFramePieceCutout(MovedStatics.tabTop, x, y, MovedStatics.tabTop.width - 15, MovedStatics.tabTop.height - 6, 15, 6);
-        drawFramePiece(MovedStatics.tabImageProducer, x + 22, y + 39);
-    }
-
-    /**
-     * TODO (jkm) move all this to ResizableFrameRenderer
-     */
-    public static void RenderChatArea(int x, int y) {
-        //width 516
-        //height 184
-        drawFramePiece(ChatBox.chatBoxImageProducer, x + 17, y + 16);
-        drawFramePiece(MovedStatics.chatModes, x, y + 112);
-        drawFramePieceCutout(MovedStatics.tabBottom, x + 496, y + 125, 20, MovedStatics.tabBottom.height, 0, 0);
-        drawFramePiece(MovedStatics.chatboxRight, x, y + 16);
-        drawFramePieceCutout(MovedStatics.chatboxTop, x, y, MovedStatics.chatboxTop.width - 37, MovedStatics.chatboxTop.height - 3, 0, 3);
-        //        System.out.println(Class40_Sub5_Sub1.chatboxRight.height + (Class17.chatboxTop.height-3) + HuffmanEncoding.aProducingGraphicsBuffer_1541.height);
-
-        drawFramePieceCutout(MovedStatics.tabPieveLowerRight, x + 496, y + 16, 20, MovedStatics.tabPieveLowerRight.height, 0, 0);
-    }
-
     public static void drawFramePiece(ProducingGraphicsBuffer framePiece, int x, int y) {
         Rasterizer.copyPixels(framePiece.pixels, framePiece.width, framePiece.height, x, y);
     }

src/main/java/org/runejs/client/frame/tab/TabProducer.java

@@ -5,8 +5,8 @@
 import org.runejs.client.ProducingGraphicsBuffer;
 import org.runejs.client.cache.media.ImageRGB;
 import org.runejs.client.cache.media.gameInterface.GameInterface;
+import org.runejs.client.frame.FramePieceAnchor;
 import org.runejs.client.frame.FramePieceRenderer;
-import org.runejs.client.frame.ScreenController;
 import org.runejs.client.frame.tab.parts.TabParts;
 import org.runejs.client.media.RasterizerInstanced;
 
@@ -44,6 +44,16 @@ public class TabProducer extends FramePieceRenderer {
 
 
     public TabProducer() {
+        super(
+            new FramePieceAnchor(
+                FramePieceAnchor.Anchor.BOTTOM | FramePieceAnchor.Anchor.RIGHT,
+                0,
+                0
+            ),
+            241,
+            334
+        );
+
         this.tempResizableSideBar = MovedStatics.createGraphicsBuffer(241, 334, Game.gameCanvas);
         resizableSideBarImage = MovedStatics.createGraphicsBuffer(241, 334, Game.gameCanvas);
         rasterizerInstanced = new RasterizerInstanced(this.tempResizableSideBar);
@@ -155,8 +165,8 @@ public int[] getTabButtonBox(int tabButtonIndex) {
 
 
 
-    public void drawResizableSideBarArea(int x, int y) {
-        ScreenController.drawFramePiece(resizableSideBarImage, x, y);
+    public ProducingGraphicsBuffer getDrawable() {
+        return resizableSideBarImage;
     }
 
     public int[] getTabInterfaceCoordSize(int baseX, int baseY) {