WIP Frame renderer rework

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

@@ -513,7 +513,7 @@ private void createRegion(CollisionMap[] collisionMaps) {
                                 }
                                 int underlayMinimapColour = 0;
                                 if(hslBitsetRandomised != -1)
-                                    underlayMinimapColour = Rasterizer3D.hsl2rgb[mixLightness(hslBitsetRandomised, 96)];
+                                    underlayMinimapColour = Rasterizer3D.palette.hsl2rgb[mixLightness(hslBitsetRandomised, 96)];
                                 if(overlayId != 0) {
                                     int shape = 1 + tile_underlay_path[_plane][x][y];
                                     byte rotation = tile_overlay_rotation[_plane][x][y];
@@ -540,7 +540,7 @@ else if(s > 255)
                                     }
                                     int rgb = 0;
                                     if(overlayMinimapColour != -2)
-                                        rgb = Rasterizer3D.hsl2rgb[MovedStatics.mixLightnessSigned(overlayMinimapColour, 96)];
+                                        rgb = Rasterizer3D.palette.hsl2rgb[MovedStatics.mixLightnessSigned(overlayMinimapColour, 96)];
                                     if(overlayDefinition.secondaryColor != -1) {
                                         int i_54_ = 0xff & randomiserHue + overlayDefinition.otherHue;
                                         int i_55_ = overlayDefinition.otherSaturation + randomiserLightness;
@@ -550,7 +550,7 @@ else if(s > 255)
                                         } else
                                             i_55_ = 0;
                                         overlayMinimapColour = generateHslBitset(overlayDefinition.otherLightness, i_55_, i_54_);
-                                        rgb = Rasterizer3D.hsl2rgb[MovedStatics.mixLightnessSigned(overlayMinimapColour, 96)];
+                                        rgb = Rasterizer3D.palette.hsl2rgb[MovedStatics.mixLightnessSigned(overlayMinimapColour, 96)];
                                     }
                                     this.scene.addTile(_plane, x, y, shape, rotation, textureId, vertexHeightSW, vertexHeightSE, vertexHeightNE, vertexHeightNW, mixLightness(hslBitsetOriginal, lightIntensitySW), mixLightness(hslBitsetOriginal, lightIntensitySE), mixLightness(hslBitsetOriginal, lightIntensityNE), mixLightness(hslBitsetOriginal, lightIntensityNW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySW), MovedStatics.mixLightnessSigned(hslBitset, lightIntensitySE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNE), MovedStatics.mixLightnessSigned(hslBitset, lightIntensityNW), underlayMinimapColour, rgb);
                                 } else

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

@@ -1,6 +1,7 @@
 package org.runejs.client;
 
 import org.runejs.client.media.Rasterizer;
+import org.runejs.client.media.RasterizerInstanced;
 
 import java.awt.*;
 
@@ -11,11 +12,20 @@ public abstract class ProducingGraphicsBuffer {
     public Image image;
 
     public abstract void method1041(int i, int i_2_, Component component, int i_3_);
+    public abstract void method1041(int i, int i_2_, Component component, int i_3_, RasterizerInstanced rasterizerInstance);
 
     public abstract void drawGraphics(int x, int y, Graphics graphics);
     public abstract void paintComponent(int x, int y, Graphics graphics);
 
+    public void prepareRasterizer(RasterizerInstanced rasterizerInstance) {
+        if (rasterizerInstance == null) {
+            Rasterizer.prepare(pixels, width, height);
+        } else {
+            rasterizerInstance.prepare(pixels, width, height);
+        }
+    }
+
     public void prepareRasterizer() {
-        Rasterizer.prepare(pixels, width, height);
+        prepareRasterizer(null);
     }
 }

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

@@ -1,6 +1,7 @@
 package org.runejs.client;
 
 import org.runejs.client.media.Rasterizer;
+import org.runejs.client.media.RasterizerInstanced;
 
 import java.awt.*;
 import java.awt.image.*;
@@ -50,7 +51,7 @@ public synchronized void addConsumer(ImageConsumer arg0) {
         arg0.setHints(14);
     }
 
-    public void method1041(int arg0, int arg1, Component arg2, int arg3) {
+    public void method1041(int arg0, int arg1, Component arg2, int arg3, RasterizerInstanced rasterizerInstanced) {
         pixels = new int[1 + arg1 * arg3];
         width = arg1;
         height = arg3;
@@ -64,7 +65,11 @@ public void method1041(int arg0, int arg1, Component arg2, int arg3) {
         arg2.prepareImage(image, this);
         drawPixels();
         arg2.prepareImage(image, this);
-        this.prepareRasterizer();
+        this.prepareRasterizer(rasterizerInstanced);
+    }
+
+    public void method1041(int arg0, int arg1, Component arg2, int arg3) {
+        method1041(arg0, arg1, arg2, arg3, null);
     }
 
     public void startProduction(ImageConsumer arg0) {

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

@@ -1,5 +1,7 @@
 package org.runejs.client;
 
+import org.runejs.client.media.RasterizerInstanced;
+
 import java.awt.*;
 import java.awt.image.*;
 import java.util.Hashtable;
@@ -14,7 +16,7 @@ public void paintComponent(int arg1, int arg3, Graphics arg2) {
         arg2.drawImage(image, arg1, arg3, aComponent2214);
     }
 
-    public void method1041(int arg0, int arg1, Component arg2, int arg3) {
+    public void method1041(int arg0, int arg1, Component arg2, int arg3, RasterizerInstanced rasterizerInstance) {
         width = arg1;
         if(arg0 > 4) {
             pixels = new int[1 + arg3 * arg1];
@@ -24,7 +26,11 @@ public void method1041(int arg0, int arg1, Component arg2, int arg3) {
             WritableRaster writableraster = Raster.createWritableRaster(directcolormodel.createCompatibleSampleModel(width, height), databufferint, null);
             image = new BufferedImage(directcolormodel, writableraster, false, new Hashtable());
             aComponent2214 = arg2;
-            prepareRasterizer();
+            prepareRasterizer(rasterizerInstance);
         }
     }
+
+    public void method1041(int arg0, int arg1, Component arg2, int arg3) {
+        method1041(arg0, arg1, arg2, arg3, null);
+    }
 }

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

@@ -2,6 +2,7 @@
 
 import org.runejs.client.cache.CacheArchive;
 import org.runejs.client.cache.media.IndexedImage;
+import org.runejs.client.media.ColorUtils;
 import org.runejs.client.node.Node;
 import org.runejs.client.io.Buffer;
 import org.runejs.client.media.Rasterizer3D;
@@ -136,7 +137,7 @@ public boolean method869(double arg0, int textureSize, CacheArchive imageArchive
                 }
             }
             for(int i_19_ = 0; i_19_ < imgPalette.length; i_19_++)
-                imgPalette[i_19_] = Rasterizer3D.adjustBrightness(imgPalette[i_19_], arg0);
+                imgPalette[i_19_] = ColorUtils.adjustBrightness(imgPalette[i_19_], arg0);
             int i_20_;
             if(i_12_ == 0)
                 i_20_ = 0;

src/main/java/org/runejs/client/cache/def/ItemDefinition.java

@@ -4,6 +4,7 @@
 import org.runejs.client.cache.media.ImageRGB;
 import org.runejs.client.io.Buffer;
 import org.runejs.client.language.English;
+import org.runejs.client.media.Constants3D;
 import org.runejs.client.media.Rasterizer;
 import org.runejs.client.media.Rasterizer3D;
 import org.runejs.client.media.renderable.Model;
@@ -168,8 +169,8 @@ public static ImageRGB sprite(int stackSize, int id, int backColour) {
         if(backColour > 0)
             i_11_ *= 1.04;
         Rasterizer3D.notTextured = false;
-        int i_12_ = Rasterizer3D.sinetable[definition.xan2d] * i_11_ >> 16;
-        int i_13_ = i_11_ * Rasterizer3D.cosinetable[definition.xan2d] >> 16;
+        int i_12_ = Constants3D.sinetable[definition.xan2d] * i_11_ >> 16;
+        int i_13_ = i_11_ * Constants3D.cosinetable[definition.xan2d] >> 16;
         model.method799();
         model.drawModel(0, definition.yan2d, definition.zan2d, definition.xan2d, definition.xOffset2d, definition.yOffset2d + model.modelHeight / 2 + i_12_, i_13_ + definition.yOffset2d);
         for(int i_14_ = 31; i_14_ >= 0; i_14_--) {

src/main/java/org/runejs/client/cache/media/ImageRGB.java

@@ -3,12 +3,14 @@
 import org.runejs.client.MovedStatics;
 import org.runejs.client.cache.CacheArchive;
 import org.runejs.client.media.Rasterizer;
+import org.runejs.client.media.RasterizerInstanced;
+import org.runejs.client.node.CachedNode;
 import org.runejs.client.util.BitUtils;
 
 import java.awt.*;
 import java.awt.image.PixelGrabber;
 
-public class ImageRGB extends Rasterizer {
+public class ImageRGB extends CachedNode {
     public int offsetY;
     public int imageHeight;
     public int imageWidth;
@@ -355,6 +357,43 @@ public void drawImageWithTexture(int x, int y, int textureId, int arg3) {
         method722(maxWidth << 3, maxHeight << 3, x << 4, y << 4, textureId, arg3);
     }
 
+    public void drawImage(RasterizerInstanced rasterizer, int x, int y) {
+        x += offsetX;
+        y += offsetY;
+        int dest_offset = x + y * rasterizer.destinationWidth;
+        int source_offset = 0;
+        int line_count = imageHeight;
+        int line_width = imageWidth;
+        int line_offset_dest = rasterizer.destinationWidth - line_width;
+        int line_offset_source = 0;
+        if(y < rasterizer.viewportTop) {
+            int clip_height = rasterizer.viewportTop - y;
+            line_count -= clip_height;
+            y = rasterizer.viewportTop;
+            source_offset += clip_height * line_width;
+            dest_offset += clip_height * rasterizer.destinationWidth;
+        }
+        if(y + line_count > rasterizer.viewportBottom)
+            line_count -= y + line_count - rasterizer.viewportBottom;
+        if(x < rasterizer.viewportLeft) {
+            int clip_width = rasterizer.viewportLeft - x;
+            line_width -= clip_width;
+            x = rasterizer.viewportLeft;
+            source_offset += clip_width;
+            dest_offset += clip_width;
+            line_offset_source += clip_width;
+            line_offset_dest += clip_width;
+        }
+        if(x + line_width > rasterizer.viewportRight) {
+            int clip_width = x + line_width - rasterizer.viewportRight;
+            line_width -= clip_width;
+            line_offset_source += clip_width;
+            line_offset_dest += clip_width;
+        }
+        if(line_width > 0 && line_count > 0)
+            blockCopyTrans(rasterizer.destinationPixels, pixels, 0, source_offset, dest_offset, line_width, line_count, line_offset_dest, line_offset_source);
+    }
+
     public void drawImage(int x, int y) {
         x += offsetX;
         y += offsetY;
@@ -782,11 +821,11 @@ public void method722(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5
         }
     }
 
-    public void prepareRasterizer() {
-        Rasterizer.prepare(pixels, imageWidth, imageHeight);
+    public void prepareRasterizer(RasterizerInstanced rasterizer) {
+        rasterizer.prepare(pixels, imageWidth, imageHeight);
     }
 
-    public void shapeImageToPixels(int x, int y, int width, int height, int arg4, int arg5, int k1, int zoom, int[] arg8, int[] arg9) {
+    public void shapeImageToPixels(RasterizerInstanced rasterizer, 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;
             int centerY = -height / 2;
@@ -796,7 +835,7 @@ public void shapeImageToPixels(int x, int y, int width, int height, int arg4, in
             cosine = cosine * zoom >> 8;
             int i_125_ = (arg4 << 16) + centerY * sine + centerX * cosine;
             int i_126_ = (arg5 << 16) + centerY * cosine - centerX * sine;
-            int destinationOffset = x + y * Rasterizer.destinationWidth;
+            int destinationOffset = x + y * rasterizer.destinationWidth;
 
             for(y = 0; y < height; y++) {
                 int i_128_ = arg8[y];
@@ -809,55 +848,55 @@ public void shapeImageToPixels(int x, int y, int width, int height, int arg4, in
                     if(!(pixels.length < pixelToGet || pixelToGet < 0)){
                         colour = pixels[pixelToGet];
                     }
-                    Rasterizer.destinationPixels[i_129_++] = colour;
+                    rasterizer.destinationPixels[i_129_++] = colour;
                     i_130_ += cosine;
                     i_131_ -= sine;
                 }
                 i_125_ += sine;
                 i_126_ += cosine;
-                destinationOffset += Rasterizer.destinationWidth;
+                destinationOffset += rasterizer.destinationWidth;
             }
         } catch(Exception exception) {
             /* empty */
             exception.printStackTrace();
         }
     }
 
-    public void drawTo(IndexedImage indexedImage, int x, int y) {
+    public void drawTo(RasterizerInstanced rasterizer, IndexedImage indexedImage, int x, int y) {
         x += offsetX;
         y += offsetY;
-        int dest_ptr = x + y * Rasterizer.destinationWidth;
+        int dest_ptr = x + y * rasterizer.destinationWidth;
         int source_ptr = 0;
         int line_count = imageHeight;
         int line_width = imageWidth;
-        int line_offset_dest = Rasterizer.destinationWidth - line_width;
+        int line_offset_dest = rasterizer.destinationWidth - line_width;
         int line_offset_src = 0;
-        if(y < Rasterizer.viewportTop) {
-            int clip_height = Rasterizer.viewportTop - y;
+        if(y < rasterizer.viewportTop) {
+            int clip_height = rasterizer.viewportTop - y;
             line_count -= clip_height;
-            y = Rasterizer.viewportTop;
+            y = rasterizer.viewportTop;
             source_ptr += clip_height * line_width;
-            dest_ptr += clip_height * Rasterizer.destinationWidth;
+            dest_ptr += clip_height * rasterizer.destinationWidth;
         }
-        if(y + line_count > Rasterizer.viewportBottom)
-            line_count -= y + line_count - Rasterizer.viewportBottom;
-        if(x < Rasterizer.viewportLeft) {
-            int clip_width = Rasterizer.viewportLeft - x;
+        if(y + line_count > rasterizer.viewportBottom)
+            line_count -= y + line_count - rasterizer.viewportBottom;
+        if(x < rasterizer.viewportLeft) {
+            int clip_width = rasterizer.viewportLeft - x;
             line_width -= clip_width;
-            x = Rasterizer.viewportLeft;
+            x = rasterizer.viewportLeft;
             source_ptr += clip_width;
             dest_ptr += clip_width;
             line_offset_src += clip_width;
             line_offset_dest += clip_width;
         }
-        if(x + line_width > Rasterizer.viewportRight) {
-            int clip_width = x + line_width - Rasterizer.viewportRight;
+        if(x + line_width > rasterizer.viewportRight) {
+            int clip_width = x + line_width - rasterizer.viewportRight;
             line_width -= clip_width;
             line_offset_src += clip_width;
             line_offset_dest += clip_width;
         }
         if(line_width > 0 && line_count > 0)
-            blockCopyMask(Rasterizer.destinationPixels, pixels, 0, source_ptr, dest_ptr, line_width, line_count, line_offset_dest, line_offset_src, indexedImage.imgPixels);
+            blockCopyMask(rasterizer.destinationPixels, pixels, 0, source_ptr, dest_ptr, line_width, line_count, line_offset_dest, line_offset_src, indexedImage.imgPixels);
     }
 
     public void trim() {
@@ -875,6 +914,43 @@ public void trim() {
         }
     }
 
+    public void drawInverse(RasterizerInstanced rasterizer, int x, int y) {
+        x += offsetX;
+        y += offsetY;
+        int rasterizerPixel = x + y * rasterizer.destinationWidth;
+        int pixel = 0;
+        int newHeight = imageHeight;
+        int newWidth = imageWidth;
+        int rasterizerPixelOffset = rasterizer.destinationWidth - newWidth;
+        int pixelOffset = 0;
+        if(y < rasterizer.viewportTop) {
+            int yOffset = rasterizer.viewportTop - y;
+            newHeight -= yOffset;
+            y = rasterizer.viewportTop;
+            pixel += yOffset * newWidth;
+            rasterizerPixel += yOffset * rasterizer.destinationWidth;
+        }
+        if(y + newHeight > rasterizer.viewportBottom)
+            newHeight -= y + newHeight - rasterizer.viewportBottom;
+        if(x < rasterizer.viewportLeft) {
+            int xOffset = rasterizer.viewportLeft - x;
+            newWidth -= xOffset;
+            x = rasterizer.viewportLeft;
+            pixel += xOffset;
+            rasterizerPixel += xOffset;
+            pixelOffset += xOffset;
+            rasterizerPixelOffset += xOffset;
+        }
+        if(x + newWidth > rasterizer.viewportRight) {
+            int widthOffset = x + newWidth - rasterizer.viewportRight;
+            newWidth -= widthOffset;
+            pixelOffset += widthOffset;
+            rasterizerPixelOffset += widthOffset;
+        }
+        if(newWidth > 0 && newHeight > 0)
+            copyPixels(rasterizer.destinationPixels, pixels, pixel, rasterizerPixel, newWidth, newHeight, rasterizerPixelOffset, pixelOffset);
+    }
+
     public void drawInverse(int x, int y) {
         x += offsetX;
         y += offsetY;
@@ -949,7 +1025,7 @@ public void drawImageWithOpacity(int x, int y, int opacity) {
             method730(Rasterizer.destinationPixels, pixels, 0, i_149_, i, i_151_, i_150_, i_152_, i_153_, opacity);
     }
 
-    public void drawRotated(int x, int y, int pivotX, int pivotY, int width, int height, int zoom, double angle) {
+    public void drawRotated(RasterizerInstanced rasterizer, int x, int y, int pivotX, int pivotY, int width, int height, int zoom, double angle) {
         try {
             int centerX = -width / 2;
             int centerY = -height / 2;
@@ -959,23 +1035,23 @@ public void drawRotated(int x, int y, int pivotX, int pivotY, int width, int hei
             cosine = cosine * zoom >> 8;
             int sourceOffsetX = (pivotX << 16) + centerY * sine + centerX * cosine;
             int sourceoffsetY = (pivotY << 16) + centerY * cosine - centerX * sine;
-            int destinationOffset = x + y * Rasterizer.destinationWidth;
+            int destinationOffset = x + y * rasterizer.destinationWidth;
             for(y = 0; y < height; y++) {
                 int i = destinationOffset;
                 int offsetX = sourceOffsetX;
                 int offsetY = sourceoffsetY;
                 for(x = -width; x < 0; x++) {
                     int i_166_ = pixels[(offsetX >> 16) + (offsetY >> 16) * imageWidth];
                     if(i_166_ != 0)
-                        Rasterizer.destinationPixels[i++] = i_166_;
+                        rasterizer.destinationPixels[i++] = i_166_;
                     else
                         i++;
                     offsetX += cosine;
                     offsetY -= sine;
                 }
                 sourceOffsetX += sine;
                 sourceoffsetY += cosine;
-                destinationOffset += Rasterizer.destinationWidth;
+                destinationOffset += rasterizer.destinationWidth;
             }
         } catch(Exception exception) {
             /* empty */