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

forgot draw line methods

Browse Source
This commit is contained in:
ThatGamerBlue
2020-12-11 06:16:45 +00:00
parent 463bc42f5f
commit ad5ce8f2fe
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runescape-client/src/main/java/AbstractFont.java
View File

@@ -722,11 +722,11 @@ public abstract class AbstractFont extends Rasterizer2D {
int var13 = this.advances[var7]; // L: 504
if (AbstractFont_strike != -1) { // L: 505
Rasterizer2D.method6097(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
}
if (AbstractFont_underline != -1) { // L: 506
Rasterizer2D.method6097(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
}
var2 += var13; // L: 507
@@ -840,11 +840,11 @@ public abstract class AbstractFont extends Rasterizer2D {
int var18 = this.advances[var10]; // L: 582
if (AbstractFont_strike != -1) { // L: 583
Rasterizer2D.method6097(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
}
if (AbstractFont_underline != -1) { // L: 584
Rasterizer2D.method6097(var2, var3 + this.ascent, var18, AbstractFont_underline);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
}
var2 += var18; // L: 585

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

@@ -607,10 +607,10 @@ public class Rasterizer2D extends DualNode {
@ObfuscatedName("dz")
@Export("Rasterizer2D_drawRectangle")
public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
method6097(var0, var1, var2, var4); // L: 383
method6097(var0, var3 + var1 - 1, var2, var4); // L: 384
method6068(var0, var1, var3, var4); // L: 385
method6068(var0 + var2 - 1, var1, var3, var4); // L: 386
Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383
Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384
Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); // L: 385
Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386
} // L: 387
@ObfuscatedName("es")
@@ -626,7 +626,8 @@ public class Rasterizer2D extends DualNode {
} // L: 396
@ObfuscatedName("eq")
public static void method6097(int var0, int var1, int var2, int var3) {
@Export("Rasterizer2D_drawHorizontalLine")
public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399
if (var0 < Rasterizer2D_xClipStart) { // L: 400
var2 -= Rasterizer2D_xClipStart - var0; // L: 401
@@ -677,7 +678,8 @@ public class Rasterizer2D extends DualNode {
} // L: 431
@ObfuscatedName("eg")
public static void method6068(int var0, int var1, int var2, int var3) {
@Export("Rasterizer2D_drawVerticalLine")
public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434
if (var1 < Rasterizer2D_yClipStart) { // L: 435
var2 -= Rasterizer2D_yClipStart - var1; // L: 436
@@ -735,16 +737,16 @@ public class Rasterizer2D extends DualNode {
var3 -= var1; // L: 471
if (var3 == 0) { // L: 472
if (var2 >= 0) { // L: 473
method6097(var0, var1, var2 + 1, var4);
Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4);
} else {
method6097(var0 + var2, var1, -var2 + 1, var4); // L: 474
Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); // L: 474
}
} else if (var2 == 0) { // L: 477
if (var3 >= 0) { // L: 478
method6068(var0, var1, var3 + 1, var4);
Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
} else {
method6068(var0, var3 + var1, -var3 + 1, var4); // L: 479
Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); // L: 479
}
} else {

20
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -583,19 +583,19 @@ public class WorldMapRegion {
if (var8.decoration == WorldMapDecorationType.field2747.id) { // L: 444
if (var8.rotation == 0) { // L: 445
Rasterizer2D.method6097(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
}
if (var8.rotation == 1) {
Rasterizer2D.method6097(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 446
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 446
}
if (var8.rotation == 2) { // L: 447
Rasterizer2D.method6097(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
}
if (var8.rotation == 3) { // L: 448
Rasterizer2D.method6097(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
}
}
@@ -604,11 +604,11 @@ public class WorldMapRegion {
int var12;
if (var11 == 0) { // L: 452
for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 453
Rasterizer2D.method6097(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 454
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 454
}
} else {
for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 458
Rasterizer2D.method6097(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 459
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 459
}
}
}
@@ -911,19 +911,19 @@ public class WorldMapRegion {
void method503(int var1, int var2, int var3, int var4) {
var3 %= 4; // L: 685
if (var3 == 0) { // L: 686
Rasterizer2D.method6068(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 1) { // L: 687
Rasterizer2D.method6097(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 2) { // L: 688
Rasterizer2D.method6068(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
}
if (var3 == 3) {
Rasterizer2D.method6097(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 689
Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 689
}
} // L: 690

16
runescape-client/src/main/java/class89.java
View File

@@ -142,13 +142,13 @@ public class class89 {
int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9569
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field712); // L: 9570
Rasterizer2D.method6068(var0, var6 + var1 + 16, var5, Client.field714); // L: 9571
Rasterizer2D.method6068(var0 + 1, var6 + var1 + 16, var5, Client.field714); // L: 9572
Rasterizer2D.method6097(var0, var6 + var1 + 16, 16, Client.field714); // L: 9573
Rasterizer2D.method6097(var0, var6 + var1 + 17, 16, Client.field714); // L: 9574
Rasterizer2D.method6068(var0 + 15, var6 + var1 + 16, var5, Client.field713); // L: 9575
Rasterizer2D.method6068(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field713); // L: 9576
Rasterizer2D.method6097(var0, var5 + var6 + var1 + 15, 16, Client.field713); // L: 9577
Rasterizer2D.method6097(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field713); // L: 9578
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field714); // L: 9571
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field714); // L: 9572
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field714); // L: 9573
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field714); // L: 9574
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field713); // L: 9575
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field713); // L: 9576
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field713); // L: 9577
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field713); // L: 9578
} // L: 9579
}