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

more RSClient refactoring

Browse Source
This commit is contained in:
Lucwousin
2019-07-10 00:02:08 +02:00
parent 02ba0bbe57
commit 91fbcf3d6b
83 changed files with 670 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
runescape-client/src/main/java/Font.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
@ObfuscatedName("kk")
@Implements("Font")
public final class Font extends AbstractFont {
public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
super(var1, var2, var3, var4, var5, var6, var7);
public Font(byte[] data, int[] leftBearings, int[] topBearings, int[] widths, int[] heights, int[] var6, byte[][] pixels) {
super(data, leftBearings, topBearings, widths, heights, var6, pixels);
}
public Font(byte[] var1) {
@@ -15,86 +15,86 @@ public final class Font extends AbstractFont {
@ObfuscatedName("m")
@Export("drawGlyph")
final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2;
int var8 = Rasterizer2D.Rasterizer2D_width - var4;
final void drawGlyph(byte[] pixels, int x, int y, int width, int height, int color) {
int var7 = y * Rasterizer2D.Rasterizer2D_width + x;
int var8 = Rasterizer2D.Rasterizer2D_width - width;
int var9 = 0;
int var10 = 0;
int var11;
if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
var5 -= var11;
var3 = Rasterizer2D.Rasterizer2D_yClipStart;
var10 += var11 * var4;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var11 = Rasterizer2D.Rasterizer2D_yClipStart - y;
height -= var11;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var10 += var11 * width;
var7 += var11 * Rasterizer2D.Rasterizer2D_width;
}
if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
var4 -= var11;
var2 = Rasterizer2D.Rasterizer2D_xClipStart;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var11 = Rasterizer2D.Rasterizer2D_xClipStart - x;
width -= var11;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var10 += var11;
var7 += var11;
var9 += var11;
var8 += var11;
}
if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
var4 -= var11;
if (x + width > Rasterizer2D.Rasterizer2D_xClipEnd) {
var11 = x + width - Rasterizer2D.Rasterizer2D_xClipEnd;
width -= var11;
var9 += var11;
var8 += var11;
}
if (var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9);
if (width > 0 && height > 0) {
AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var10, var7, width, height, var8, var9);
}
}
@ObfuscatedName("f")
@Export("drawGlyphAlpha")
final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2;
int var9 = Rasterizer2D.Rasterizer2D_width - var4;
final void drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha) {
int var8 = y * Rasterizer2D.Rasterizer2D_width + x;
int var9 = Rasterizer2D.Rasterizer2D_width - width;
int var10 = 0;
int var11 = 0;
int var12;
if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
var5 -= var12;
var3 = Rasterizer2D.Rasterizer2D_yClipStart;
var11 += var12 * var4;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var12 = Rasterizer2D.Rasterizer2D_yClipStart - y;
height -= var12;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var11 += var12 * width;
var8 += var12 * Rasterizer2D.Rasterizer2D_width;
}
if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
var4 -= var12;
var2 = Rasterizer2D.Rasterizer2D_xClipStart;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var12 = Rasterizer2D.Rasterizer2D_xClipStart - x;
width -= var12;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var11 += var12;
var8 += var12;
var10 += var12;
var9 += var12;
}
if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
var4 -= var12;
if (x + width > Rasterizer2D.Rasterizer2D_xClipEnd) {
var12 = x + width - Rasterizer2D.Rasterizer2D_xClipEnd;
width -= var12;
var10 += var12;
var9 += var12;
}
if (var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7);
if (width > 0 && height > 0) {
AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var11, var8, width, height, var9, var10, alpha);
}
}