mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2026-08-19 01:15:19 -06:00
Upgrade to JOGL 2.4.0
This commit is contained in:
Pazaz
parent
f462316fce
commit
c97bf0d48a
144 changed files with 859 additions and 13754 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import java.nio.IntBuffer;
|
||||
import javax.media.opengl.GL;
|
||||
import com.jogamp.opengl.*;
|
||||
import org.openrs2.deob.annotation.OriginalArg;
|
||||
import org.openrs2.deob.annotation.OriginalMember;
|
||||
import org.openrs2.deob.annotation.Pc;
|
||||
|
|
@ -32,8 +32,8 @@ public final class Static46 {
|
|||
@Pc(5) float local5 = (float) arg0 + 0.3F;
|
||||
@Pc(10) float local10 = local5 + (float) arg2;
|
||||
@Pc(18) float local18 = (float) Static239.anInt5329 - (float) arg1 - 0.3F;
|
||||
@Pc(20) GL local20 = Static239.aGL1;
|
||||
local20.glBegin(GL.GL_LINES);
|
||||
@Pc(20) GL2 local20 = Static239.gl;
|
||||
local20.glBegin(GL2.GL_LINES);
|
||||
local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3);
|
||||
local20.glVertex2f(local5, local18);
|
||||
local20.glVertex2f(local10, local18);
|
||||
|
|
@ -46,8 +46,8 @@ public final class Static46 {
|
|||
@Pc(5) float local5 = (float) arg0 + 0.3F;
|
||||
@Pc(13) float local13 = (float) Static239.anInt5329 - (float) arg1 - 0.3F;
|
||||
@Pc(18) float local18 = local13 - (float) arg2;
|
||||
@Pc(20) GL local20 = Static239.aGL1;
|
||||
local20.glBegin(GL.GL_LINES);
|
||||
@Pc(20) GL2 local20 = Static239.gl;
|
||||
local20.glBegin(GL2.GL_LINES);
|
||||
local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3);
|
||||
local20.glVertex2f(local5, local13);
|
||||
local20.glVertex2f(local5, local18);
|
||||
|
|
@ -60,22 +60,22 @@ public final class Static46 {
|
|||
anInt1438 = 0;
|
||||
anInt1440 = Static239.anInt5332;
|
||||
anInt1441 = Static239.anInt5329;
|
||||
@Pc(9) GL local9 = Static239.aGL1;
|
||||
local9.glDisable(GL.GL_SCISSOR_TEST);
|
||||
@Pc(9) GL2 local9 = Static239.gl;
|
||||
local9.glDisable(GL2.GL_SCISSOR_TEST);
|
||||
method1173();
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!dj", name = "a", descriptor = "([IIIII)V")
|
||||
public static void method1178(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
|
||||
Static239.method4162();
|
||||
@Pc(2) GL local2 = Static239.aGL1;
|
||||
@Pc(2) GL2 local2 = Static239.gl;
|
||||
local2.glRasterPos2i(arg1, Static239.anInt5329 - arg2);
|
||||
local2.glPixelZoom(1.0F, -1.0F);
|
||||
local2.glDisable(GL.GL_BLEND);
|
||||
local2.glDisable(GL.GL_ALPHA_TEST);
|
||||
local2.glDrawPixels(arg3, arg4, GL.GL_BGRA, Static239.aBoolean263 ? GL.GL_UNSIGNED_INT_8_8_8_8_REV : GL.GL_UNSIGNED_BYTE, IntBuffer.wrap(arg0));
|
||||
local2.glEnable(GL.GL_ALPHA_TEST);
|
||||
local2.glEnable(GL.GL_BLEND);
|
||||
local2.glDisable(GL2.GL_BLEND);
|
||||
local2.glDisable(GL2.GL_ALPHA_TEST);
|
||||
local2.glDrawPixels(arg3, arg4, GL2.GL_BGRA, Static239.aBoolean263 ? GL2.GL_UNSIGNED_INT_8_8_8_8_REV : GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(arg0));
|
||||
local2.glEnable(GL2.GL_ALPHA_TEST);
|
||||
local2.glEnable(GL2.GL_BLEND);
|
||||
local2.glPixelZoom(1.0F, 1.0F);
|
||||
}
|
||||
|
||||
|
|
@ -86,8 +86,8 @@ public final class Static46 {
|
|||
@Pc(12) float local12 = local5 + (float) (arg2 - 1);
|
||||
@Pc(20) float local20 = (float) Static239.anInt5329 - (float) arg1 - 0.3F;
|
||||
@Pc(27) float local27 = local20 - (float) (arg3 - 1);
|
||||
@Pc(29) GL local29 = Static239.aGL1;
|
||||
local29.glBegin(GL.GL_LINE_LOOP);
|
||||
@Pc(29) GL2 local29 = Static239.gl;
|
||||
local29.glBegin(GL2.GL_LINE_LOOP);
|
||||
local29.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4);
|
||||
local29.glVertex2f(local5, local20);
|
||||
local29.glVertex2f(local5, local27);
|
||||
|
|
@ -103,8 +103,8 @@ public final class Static46 {
|
|||
@Pc(12) float local12 = local5 + (float) (arg2 - 1);
|
||||
@Pc(20) float local20 = (float) Static239.anInt5329 - (float) arg1 - 0.3F;
|
||||
@Pc(27) float local27 = local20 - (float) (arg3 - 1);
|
||||
@Pc(29) GL local29 = Static239.aGL1;
|
||||
local29.glBegin(GL.GL_LINE_LOOP);
|
||||
@Pc(29) GL2 local29 = Static239.gl;
|
||||
local29.glBegin(GL2.GL_LINE_LOOP);
|
||||
local29.glColor4ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4, arg5 > 255 ? -1 : (byte) arg5);
|
||||
local29.glVertex2f(local5, local20);
|
||||
local29.glVertex2f(local5, local27);
|
||||
|
|
@ -146,9 +146,9 @@ public final class Static46 {
|
|||
@Pc(115) int local115 = arg1 + local7 - local81;
|
||||
@Pc(121) int local121 = arg1 + local7 + local73;
|
||||
Static239.method4162();
|
||||
@Pc(124) GL local124 = Static239.aGL1;
|
||||
@Pc(124) GL2 local124 = Static239.gl;
|
||||
local124.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4);
|
||||
local124.glBegin(GL.GL_TRIANGLE_FAN);
|
||||
local124.glBegin(GL2.GL_TRIANGLE_FAN);
|
||||
if (local43 <= local37) {
|
||||
local124.glVertex2f((float) local101, (float) (Static239.anInt5329 - local121));
|
||||
local124.glVertex2f((float) local95, (float) (Static239.anInt5329 - local115));
|
||||
|
|
@ -170,8 +170,8 @@ public final class Static46 {
|
|||
@Pc(8) float local8 = local3 + (float) arg2;
|
||||
@Pc(13) float local13 = (float) (Static239.anInt5329 - arg1);
|
||||
@Pc(18) float local18 = local13 - (float) arg3;
|
||||
@Pc(20) GL local20 = Static239.aGL1;
|
||||
local20.glBegin(GL.GL_TRIANGLE_FAN);
|
||||
@Pc(20) GL2 local20 = Static239.gl;
|
||||
local20.glBegin(GL2.GL_TRIANGLE_FAN);
|
||||
local20.glColor4ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4, arg5 > 255 ? -1 : (byte) arg5);
|
||||
local20.glVertex2f(local3, local13);
|
||||
local20.glVertex2f(local3, local18);
|
||||
|
|
@ -194,8 +194,8 @@ public final class Static46 {
|
|||
if (anInt1441 > arg3) {
|
||||
anInt1441 = arg3;
|
||||
}
|
||||
@Pc(21) GL local21 = Static239.aGL1;
|
||||
local21.glEnable(GL.GL_SCISSOR_TEST);
|
||||
@Pc(21) GL2 local21 = Static239.gl;
|
||||
local21.glEnable(GL2.GL_SCISSOR_TEST);
|
||||
if (anInt1439 <= anInt1440 && anInt1438 <= anInt1441) {
|
||||
local21.glScissor(anInt1439, Static239.anInt5329 - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438);
|
||||
} else {
|
||||
|
|
@ -206,7 +206,7 @@ public final class Static46 {
|
|||
|
||||
@OriginalMember(owner = "client!dj", name = "d", descriptor = "()V")
|
||||
public static void method1184() {
|
||||
Static239.aGL1.glClear(GL.GL_DEPTH_BUFFER_BIT | GL.GL_COLOR_BUFFER_BIT);
|
||||
Static239.gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT);
|
||||
}
|
||||
|
||||
@OriginalMember(owner = "client!dj", name = "b", descriptor = "(IIIII)V")
|
||||
|
|
@ -216,8 +216,8 @@ public final class Static46 {
|
|||
@Pc(10) float local10 = (float) arg2 + 0.3F;
|
||||
@Pc(18) float local18 = (float) Static239.anInt5329 - (float) arg1 - 0.3F;
|
||||
@Pc(26) float local26 = (float) Static239.anInt5329 - (float) arg3 - 0.3F;
|
||||
@Pc(28) GL local28 = Static239.aGL1;
|
||||
local28.glBegin(GL.GL_LINE_LOOP);
|
||||
@Pc(28) GL2 local28 = Static239.gl;
|
||||
local28.glBegin(GL2.GL_LINE_LOOP);
|
||||
local28.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4);
|
||||
local28.glVertex2f(local5, local18);
|
||||
local28.glVertex2f(local10, local26);
|
||||
|
|
@ -231,8 +231,8 @@ public final class Static46 {
|
|||
@Pc(8) float local8 = local3 + (float) arg2;
|
||||
@Pc(13) float local13 = (float) (Static239.anInt5329 - arg1);
|
||||
@Pc(18) float local18 = local13 - (float) arg3;
|
||||
@Pc(20) GL local20 = Static239.aGL1;
|
||||
local20.glBegin(GL.GL_TRIANGLE_FAN);
|
||||
@Pc(20) GL2 local20 = Static239.gl;
|
||||
local20.glBegin(GL2.GL_TRIANGLE_FAN);
|
||||
local20.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4);
|
||||
local20.glVertex2f(local3, local13);
|
||||
local20.glVertex2f(local3, local18);
|
||||
|
|
@ -259,8 +259,8 @@ public final class Static46 {
|
|||
anInt1438 = arg1;
|
||||
anInt1440 = arg2;
|
||||
anInt1441 = arg3;
|
||||
@Pc(27) GL local27 = Static239.aGL1;
|
||||
local27.glEnable(GL.GL_SCISSOR_TEST);
|
||||
@Pc(27) GL2 local27 = Static239.gl;
|
||||
local27.glEnable(GL2.GL_SCISSOR_TEST);
|
||||
if (anInt1439 <= anInt1440 && anInt1438 <= anInt1441) {
|
||||
local27.glScissor(anInt1439, Static239.anInt5329 - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue