2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2026-08-17 08:25:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to JOGL 2.4.0

Browse source
This commit is contained in:
Pazaz 2022-04-20 14:21:52 -04:00
parent f462316fce
commit c97bf0d48a
144 changed files with 859 additions and 13754 deletions
Download patch file Download diff file Expand all files Collapse all files

52
client/src/main/java/GlFont.java
View file

@ -1,5 +1,5 @@
import java.nio.ByteBuffer;
import javax.media.opengl.GL;
import com.jogamp.opengl.*;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@ -50,10 +50,10 @@ public final class GlFont extends Font {
@OriginalMember(owner = "client!mb", name = "a", descriptor = "(IIIIIIZ)V")
@Override
protected final void method2854(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
@Pc(4) GL local4;
@Pc(4) GL2 local4;
if (Static46.aClass3_Sub2_Sub1_Sub2_1 == null) {
Static239.method4151();
local4 = Static239.aGL1;
local4 = Static239.gl;
Static239.method4177(this.anInt3638);
local4.glColor3ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5);
local4.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F);
@ -62,7 +62,7 @@ public final class GlFont extends Font {
return;
}
Static239.method4151();
local4 = Static239.aGL1;
local4 = Static239.gl;
local4.glColor3ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5);
local4.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F);
@Pc(32) float local32 = (float) (arg0 % 16) / 16.0F;
@ -71,33 +71,33 @@ public final class GlFont extends Font {
@Pc(63) float local63 = local39 + (float) this.anIntArray345[arg0] / (float) this.anInt3640;
Static239.method4177(this.anInt3638);
@Pc(68) GlSprite local68 = Static46.aClass3_Sub2_Sub1_Sub2_1;
local4.glActiveTexture(GL.GL_TEXTURE1);
local4.glEnable(GL.GL_TEXTURE_2D);
local4.glBindTexture(GL.GL_TEXTURE_2D, local68.anInt1872);
local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_RGB, GL.GL_REPLACE);
local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_RGB, GL.GL_PREVIOUS);
local4.glActiveTexture(GL2.GL_TEXTURE1);
local4.glEnable(GL2.GL_TEXTURE_2D);
local4.glBindTexture(GL2.GL_TEXTURE_2D, local68.anInt1872);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_REPLACE);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_PREVIOUS);
@Pc(98) float local98 = (float) (arg1 - Static46.anInt1439) / (float) local68.anInt1870;
@Pc(107) float local107 = (float) (arg2 - Static46.anInt1438) / (float) local68.anInt1874;
@Pc(118) float local118 = (float) (arg1 + arg3 - Static46.anInt1439) / (float) local68.anInt1870;
@Pc(129) float local129 = (float) (arg2 + arg4 - Static46.anInt1438) / (float) local68.anInt1874;
local4.glBegin(GL.GL_TRIANGLE_FAN);
local4.glMultiTexCoord2f(GL.GL_TEXTURE1, local118, local107);
local4.glBegin(GL2.GL_TRIANGLE_FAN);
local4.glMultiTexCoord2f(GL2.GL_TEXTURE1, local118, local107);
local4.glTexCoord2f(local51, local39);
local4.glVertex2f((float) this.anIntArray343[arg0], 0.0F);
local4.glMultiTexCoord2f(GL.GL_TEXTURE1, local98, local107);
local4.glMultiTexCoord2f(GL2.GL_TEXTURE1, local98, local107);
local4.glTexCoord2f(local32, local39);
local4.glVertex2f(0.0F, 0.0F);
local4.glMultiTexCoord2f(GL.GL_TEXTURE1, local98, local129);
local4.glMultiTexCoord2f(GL2.GL_TEXTURE1, local98, local129);
local4.glTexCoord2f(local32, local63);
local4.glVertex2f(0.0F, (float) -this.anIntArray345[arg0]);
local4.glMultiTexCoord2f(GL.GL_TEXTURE1, local118, local129);
local4.glMultiTexCoord2f(GL2.GL_TEXTURE1, local118, local129);
local4.glTexCoord2f(local51, local63);
local4.glVertex2f((float) this.anIntArray343[arg0], (float) -this.anIntArray345[arg0]);
local4.glEnd();
local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_RGB, GL.GL_MODULATE);
local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_RGB, GL.GL_TEXTURE);
local4.glDisable(GL.GL_TEXTURE_2D);
local4.glActiveTexture(GL.GL_TEXTURE0);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
local4.glDisable(GL2.GL_TEXTURE_2D);
local4.glActiveTexture(GL2.GL_TEXTURE0);
local4.glLoadIdentity();
}
@ -105,7 +105,7 @@ public final class GlFont extends Font {
@Override
protected final void method2855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
Static239.method4151();
@Pc(2) GL local2 = Static239.aGL1;
@Pc(2) GL2 local2 = Static239.gl;
Static239.method4177(this.anInt3638);
local2.glColor4ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5, arg6 > 255 ? -1 : (byte) arg6);
local2.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F);
@ -119,15 +119,15 @@ public final class GlFont extends Font {
return;
}
this.anIntArray349 = new int[256];
@Pc(9) GL local9 = Static239.aGL1;
@Pc(9) GL2 local9 = Static239.gl;
for (@Pc(11) int local11 = 0; local11 < 256; local11++) {
@Pc(21) float local21 = (float) (local11 % 16) / 16.0F;
@Pc(28) float local28 = (float) (local11 / 16) / 16.0F;
@Pc(40) float local40 = local21 + (float) this.anIntArray343[local11] / (float) this.anInt3640;
@Pc(52) float local52 = local28 + (float) this.anIntArray345[local11] / (float) this.anInt3640;
this.anIntArray349[local11] = local9.glGenLists(1);
local9.glNewList(this.anIntArray349[local11], GL.GL_COMPILE);
local9.glBegin(GL.GL_TRIANGLE_FAN);
local9.glNewList(this.anIntArray349[local11], GL2.GL_COMPILE);
local9.glBegin(GL2.GL_TRIANGLE_FAN);
local9.glTexCoord2f(local40, local28);
local9.glVertex2f((float) this.anIntArray343[local11], 0.0F);
local9.glTexCoord2f(local21, local28);
@ -182,7 +182,7 @@ public final class GlFont extends Font {
}
}
@Pc(153) ByteBuffer local153 = ByteBuffer.wrap(local66);
@Pc(155) GL local155 = Static239.aGL1;
@Pc(155) GL2 local155 = Static239.gl;
if (this.anInt3638 == -1) {
@Pc(162) int[] local162 = new int[1];
local155.glGenTextures(1, local162, 0);
@ -190,10 +190,10 @@ public final class GlFont extends Font {
this.anInt3639 = Static63.anInt1943;
}
Static239.method4177(this.anInt3638);
local155.glTexImage2D(GL.GL_TEXTURE_2D, 0, GL.GL_LUMINANCE_ALPHA, this.anInt3640, this.anInt3640, 0, GL.GL_LUMINANCE_ALPHA, GL.GL_UNSIGNED_BYTE, local153);
local155.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, this.anInt3640, this.anInt3640, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, local153);
Static63.anInt1944 += local153.limit() - this.anInt3637;
this.anInt3637 = local153.limit();
local155.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
local155.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST);
local155.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST);
local155.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST);
}
}