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

Fix rasterizer2d fillRectangleAlpha import/export

Browse Source
This commit is contained in:
Lucas
2019-06-12 23:33:50 +02:00
parent 85359f6280
commit 653780b8db
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java
View File

@@ -42,7 +42,7 @@ public class RasterizerHook
private static final String circle_alpha = "Rasterizer2D_drawCircleAlpha"; private static final String circle_alpha = "Rasterizer2D_drawCircleAlpha";
private static final String line_alpha = "Rasterizer2D_drawHorizontalLineAlpha"; private static final String line_alpha = "Rasterizer2D_drawHorizontalLineAlpha";
private static final String line_alpha2 = "Rasterizer2D_drawVerticalLineAlpha"; private static final String line_alpha2 = "Rasterizer2D_drawVerticalLineAlpha";
private static final String more_alpha = "Rasterizer2D_moreAlpha"; private static final String fill_rect_alpha = "Rasterizer2D_fillRectangleAlpha";
private static final String r3d_vert = "Rasterizer3D_vertAlpha"; private static final String r3d_vert = "Rasterizer3D_vertAlpha";
private static final String r3d_horiz = "Rasterizer3D_horizAlpha"; private static final String r3d_horiz = "Rasterizer3D_horizAlpha";
private static final String r3d_field = "Rasterizer3D_alpha"; private static final String r3d_field = "Rasterizer3D_alpha";
@@ -94,7 +94,7 @@ public class RasterizerHook
runAlpha(circle_alpha, 2, 4); runAlpha(circle_alpha, 2, 4);
runAlpha(line_alpha, 1, 4); runAlpha(line_alpha, 1, 4);
runAlpha(line_alpha2, 1, 4); runAlpha(line_alpha2, 1, 4);
runAlpha(more_alpha, 1, 5); runAlpha(fill_rect_alpha, 1, 5);
runAlpha(sprite_alpha1, 1, 9, 0); runAlpha(sprite_alpha1, 1, 9, 0);
runAlpha(sprite_alpha2, 1, 12, 0); runAlpha(sprite_alpha2, 1, 12, 0);
} }

2
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -976,7 +976,7 @@ public interface RSClient extends RSGameShell, Client
@Import("drawGradient") @Import("drawGradient")
void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
@Import("Rasterizer2D_drawRectangleAlpha") @Import("Rasterizer2D_fillRectangleAlpha")
void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a); void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a);
@Import("Rasterizer2D_drawRectangle") @Import("Rasterizer2D_drawRectangle")

4
runescape-client/src/main/java/Client.java
View File

@@ -4762,9 +4762,9 @@ public final class Client extends GameShell implements Usernamed {
if(gameDrawingMode == 3) { if(gameDrawingMode == 3) {
for(var1 = 0; var1 < rootWidgetCount; ++var1) { for(var1 = 0; var1 < rootWidgetCount; ++var1) {
if(__client_oq[var1]) { if(__client_oq[var1]) {
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128); Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
} else if(__client_ot[var1]) { } else if(__client_ot[var1]) {
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128); Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
} }
} }
} }

2
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -474,7 +474,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
if(var14 == 0) { if(var14 == 0) {
Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
} else { } else {
Rasterizer2D.Rasterizer2D_moreAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
} }
} }
} else if(var14 == 0) { } else if(var14 == 0) {

4
runescape-client/src/main/java/Rasterizer2D.java
View File

@@ -348,8 +348,8 @@ public class Rasterizer2D extends DualNode {
} }
@ObfuscatedName("dl") @ObfuscatedName("dl")
@Export("Rasterizer2D_moreAlpha") @Export("Rasterizer2D_fillRectangleAlpha")
public static void Rasterizer2D_moreAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
if(var0 < Rasterizer2D_xClipStart) { if(var0 < Rasterizer2D_xClipStart) {
var2 -= Rasterizer2D_xClipStart - var0; var2 -= Rasterizer2D_xClipStart - var0;
var0 = Rasterizer2D_xClipStart; var0 = Rasterizer2D_xClipStart;

2
runescape-client/src/main/java/WorldMap.java
View File

@@ -857,7 +857,7 @@ public class WorldMap {
var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu)); var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu));
} }
Rasterizer2D.Rasterizer2D_moreAlpha(var1, var2, var3, var4, 0, 128); Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128);
if(1.0F == var10) { if(1.0F == var10) {
this.sprite.__v_510(var13, var14, 192); this.sprite.__v_510(var13, var14, 192);
} else { } else {