Upgrade to JOGL 2.4.0

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

View file

@ -1,5 +1,5 @@
import java.nio.ByteBuffer;
import javax.media.opengl.GL;
import com.jogamp.opengl.*;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -50,30 +50,30 @@ public final class Static151 {
@OriginalMember(owner = "client!lm", name = "b", descriptor = "()V")
public static void method2808() {
@Pc(4) GL local4;
@Pc(4) GL2 local4;
@Pc(11) int[] local11;
if (anInt3587 != -1) {
local4 = Static239.aGL1;
local4 = Static239.gl;
local11 = new int[] { anInt3587 };
local4.glDeleteTextures(1, local11, 0);
anInt3587 = -1;
Static63.anInt1942 -= aByteBuffer7.limit() * 2;
}
if (anIntArray341 != null) {
local4 = Static239.aGL1;
local4 = Static239.gl;
local4.glDeleteTextures(64, anIntArray341, 0);
anIntArray341 = null;
Static63.anInt1942 -= aByteBuffer7.limit() * 2;
}
if (anInt3588 != -1) {
local4 = Static239.aGL1;
local4 = Static239.gl;
local11 = new int[] { anInt3588 };
local4.glDeleteTextures(1, local11, 0);
anInt3588 = -1;
Static63.anInt1942 -= aByteBuffer6.limit() * 2;
}
if (anIntArray340 != null) {
local4 = Static239.aGL1;
local4 = Static239.gl;
local4.glDeleteTextures(64, anIntArray340, 0);
anIntArray340 = null;
Static63.anInt1942 -= aByteBuffer6.limit() * 2;
@ -90,15 +90,15 @@ public final class Static151 {
@OriginalMember(owner = "client!lm", name = "e", descriptor = "()V")
private static void method2811() {
@Pc(1) GL local1 = Static239.aGL1;
@Pc(1) GL2 local1 = Static239.gl;
if (aBoolean176) {
@Pc(6) int[] local6 = new int[1];
local1.glGenTextures(1, local6, 0);
local1.glBindTexture(GL.GL_TEXTURE_3D, local6[0]);
local1.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]);
aByteBuffer7.position(0);
local1.glTexImage3D(GL.GL_TEXTURE_3D, 0, GL.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL.GL_LUMINANCE_ALPHA, GL.GL_UNSIGNED_BYTE, aByteBuffer7);
local1.glTexParameteri(GL.GL_TEXTURE_3D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR);
local1.glTexParameteri(GL.GL_TEXTURE_3D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
local1.glTexImage3D(GL2.GL_TEXTURE_3D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer7);
local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
anInt3587 = local6[0];
Static63.anInt1942 += aByteBuffer7.limit() * 2;
return;
@ -108,24 +108,24 @@ public final class Static151 {
for (@Pc(65) int local65 = 0; local65 < 64; local65++) {
Static239.method4177(anIntArray341[local65]);
aByteBuffer7.position(local65 * 64 * 64 * 2);
local1.glTexImage2D(GL.GL_TEXTURE_2D, 0, GL.GL_LUMINANCE_ALPHA, 64, 64, 0, GL.GL_LUMINANCE_ALPHA, GL.GL_UNSIGNED_BYTE, aByteBuffer7);
local1.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR);
local1.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
local1.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer7);
local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
}
Static63.anInt1942 += aByteBuffer7.limit() * 2;
}
@OriginalMember(owner = "client!lm", name = "f", descriptor = "()V")
private static void method2812() {
@Pc(1) GL local1 = Static239.aGL1;
@Pc(1) GL2 local1 = Static239.gl;
if (aBoolean176) {
@Pc(6) int[] local6 = new int[1];
local1.glGenTextures(1, local6, 0);
local1.glBindTexture(GL.GL_TEXTURE_3D, local6[0]);
local1.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]);
aByteBuffer6.position(0);
local1.glTexImage3D(GL.GL_TEXTURE_3D, 0, GL.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL.GL_LUMINANCE_ALPHA, GL.GL_UNSIGNED_BYTE, aByteBuffer6);
local1.glTexParameteri(GL.GL_TEXTURE_3D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR);
local1.glTexParameteri(GL.GL_TEXTURE_3D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
local1.glTexImage3D(GL2.GL_TEXTURE_3D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer6);
local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
local1.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
anInt3588 = local6[0];
Static63.anInt1942 += aByteBuffer6.limit() * 2;
return;
@ -135,9 +135,9 @@ public final class Static151 {
for (@Pc(65) int local65 = 0; local65 < 64; local65++) {
Static239.method4177(anIntArray340[local65]);
aByteBuffer6.position(local65 * 64 * 64 * 2);
local1.glTexImage2D(GL.GL_TEXTURE_2D, 0, GL.GL_LUMINANCE_ALPHA, 64, 64, 0, GL.GL_LUMINANCE_ALPHA, GL.GL_UNSIGNED_BYTE, aByteBuffer6);
local1.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR);
local1.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
local1.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer6);
local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
}
Static63.anInt1942 += aByteBuffer6.limit() * 2;
}