2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-20 05:20:24 -07: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

136
client/src/main/java/WaterMaterialRenderer.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;
@ -29,76 +29,76 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
@OriginalMember(owner = "client!pd", name = "d", descriptor = "()V")
private void method3435() {
@Pc(2) byte[] local2 = new byte[] { 0, -1 };
@Pc(12) GL local12 = Static239.aGL1;
@Pc(12) GL2 local12 = Static239.gl;
@Pc(15) int[] local15 = new int[1];
local12.glGenTextures(1, local15, 0);
local12.glBindTexture(GL.GL_TEXTURE_1D, local15[0]);
local12.glTexImage1D(GL.GL_TEXTURE_1D, 0, GL.GL_ALPHA, 2, 0, GL.GL_ALPHA, GL.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local2));
local12.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR);
local12.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
local12.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_EDGE);
local12.glBindTexture(GL2.GL_TEXTURE_1D, local15[0]);
local12.glTexImage1D(GL2.GL_TEXTURE_1D, 0, GL2.GL_ALPHA, 2, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local2));
local12.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);
local12.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR);
local12.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE);
this.anInt4441 = local15[0];
}
@OriginalMember(owner = "client!pd", name = "f", descriptor = "()V")
private void method3437() {
@Pc(1) GL local1 = Static239.aGL1;
@Pc(1) GL2 local1 = Static239.gl;
this.anInt4440 = local1.glGenLists(2);
local1.glNewList(this.anInt4440, GL.GL_COMPILE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_OPERAND0_RGB, GL.GL_SRC_COLOR);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC1_RGB, GL.GL_CONSTANT);
local1.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_RGB_SCALE, 2.0F);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC1_ALPHA, GL.GL_CONSTANT);
local1.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_OBJECT_LINEAR);
local1.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_OBJECT_LINEAR);
local1.glTexGenfv(GL.GL_S, GL.GL_OBJECT_PLANE, new float[] { 9.765625E-4F, 0.0F, 0.0F, 0.0F }, 0);
local1.glTexGenfv(GL.GL_T, GL.GL_OBJECT_PLANE, new float[] { 0.0F, 0.0F, 9.765625E-4F, 0.0F }, 0);
local1.glEnable(GL.GL_TEXTURE_GEN_S);
local1.glEnable(GL.GL_TEXTURE_GEN_T);
local1.glNewList(this.anInt4440, GL2.GL_COMPILE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC1_RGB, GL2.GL_CONSTANT);
local1.glTexEnvf(GL2.GL_TEXTURE_ENV, GL2.GL_RGB_SCALE, 2.0F);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2GL3.GL_SRC1_ALPHA, GL2.GL_CONSTANT);
local1.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR);
local1.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR);
local1.glTexGenfv(GL2.GL_S, GL2.GL_OBJECT_PLANE, new float[] { 9.765625E-4F, 0.0F, 0.0F, 0.0F }, 0);
local1.glTexGenfv(GL2.GL_T, GL2.GL_OBJECT_PLANE, new float[] { 0.0F, 0.0F, 9.765625E-4F, 0.0F }, 0);
local1.glEnable(GL2.GL_TEXTURE_GEN_S);
local1.glEnable(GL2.GL_TEXTURE_GEN_T);
if (Static151.aBoolean176) {
local1.glBindTexture(GL.GL_TEXTURE_3D, Static151.anInt3587);
local1.glTexGeni(GL.GL_R, GL.GL_TEXTURE_GEN_MODE, GL.GL_OBJECT_LINEAR);
local1.glTexGeni(GL.GL_Q, GL.GL_TEXTURE_GEN_MODE, GL.GL_OBJECT_LINEAR);
local1.glTexGenfv(GL.GL_Q, GL.GL_OBJECT_PLANE, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
local1.glEnable(GL.GL_TEXTURE_GEN_R);
local1.glEnable(GL.GL_TEXTURE_GEN_Q);
local1.glEnable(GL.GL_TEXTURE_3D);
local1.glBindTexture(GL2.GL_TEXTURE_3D, Static151.anInt3587);
local1.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR);
local1.glTexGeni(GL2.GL_Q, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR);
local1.glTexGenfv(GL2.GL_Q, GL2.GL_OBJECT_PLANE, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
local1.glEnable(GL2.GL_TEXTURE_GEN_R);
local1.glEnable(GL2.GL_TEXTURE_GEN_Q);
local1.glEnable(GL2.GL_TEXTURE_3D);
}
local1.glActiveTexture(GL.GL_TEXTURE1);
local1.glEnable(GL.GL_TEXTURE_1D);
local1.glBindTexture(GL.GL_TEXTURE_1D, this.anInt4441);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_RGB, GL.GL_INTERPOLATE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_RGB, GL.GL_CONSTANT);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC2_RGB, GL.GL_TEXTURE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_ALPHA, GL.GL_INTERPOLATE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_ALPHA, GL.GL_CONSTANT);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC2_ALPHA, GL.GL_TEXTURE);
local1.glEnable(GL.GL_TEXTURE_GEN_S);
local1.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_EYE_LINEAR);
local1.glActiveTexture(GL2.GL_TEXTURE1);
local1.glEnable(GL2.GL_TEXTURE_1D);
local1.glBindTexture(GL2.GL_TEXTURE_1D, this.anInt4441);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_INTERPOLATE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_TEXTURE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_INTERPOLATE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_CONSTANT);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_ALPHA, GL2.GL_TEXTURE);
local1.glEnable(GL2.GL_TEXTURE_GEN_S);
local1.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR);
local1.glPushMatrix();
local1.glLoadIdentity();
local1.glEndList();
local1.glNewList(this.anInt4440 + 1, GL.GL_COMPILE);
local1.glActiveTexture(GL.GL_TEXTURE1);
local1.glDisable(GL.GL_TEXTURE_1D);
local1.glDisable(GL.GL_TEXTURE_GEN_S);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_RGB, GL.GL_MODULATE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_RGB, GL.GL_TEXTURE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC2_RGB, GL.GL_CONSTANT);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_COMBINE_ALPHA, GL.GL_MODULATE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_ALPHA, GL.GL_TEXTURE);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC2_ALPHA, GL.GL_CONSTANT);
local1.glActiveTexture(GL.GL_TEXTURE0);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_OPERAND0_RGB, GL.GL_SRC_COLOR);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC1_RGB, GL.GL_PREVIOUS);
local1.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_RGB_SCALE, 1.0F);
local1.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC1_ALPHA, GL.GL_PREVIOUS);
local1.glDisable(GL.GL_TEXTURE_GEN_S);
local1.glDisable(GL.GL_TEXTURE_GEN_T);
local1.glNewList(this.anInt4440 + 1, GL2.GL_COMPILE);
local1.glActiveTexture(GL2.GL_TEXTURE1);
local1.glDisable(GL2.GL_TEXTURE_1D);
local1.glDisable(GL2.GL_TEXTURE_GEN_S);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_CONSTANT);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_ALPHA, GL2.GL_CONSTANT);
local1.glActiveTexture(GL2.GL_TEXTURE0);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC1_RGB, GL2.GL_PREVIOUS);
local1.glTexEnvf(GL2.GL_TEXTURE_ENV, GL2.GL_RGB_SCALE, 1.0F);
local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2GL3.GL_SRC1_ALPHA, GL2.GL_PREVIOUS);
local1.glDisable(GL2.GL_TEXTURE_GEN_S);
local1.glDisable(GL2.GL_TEXTURE_GEN_T);
if (Static151.aBoolean176) {
local1.glDisable(GL.GL_TEXTURE_GEN_R);
local1.glDisable(GL.GL_TEXTURE_GEN_Q);
local1.glDisable(GL.GL_TEXTURE_3D);
local1.glDisable(GL2.GL_TEXTURE_GEN_R);
local1.glDisable(GL2.GL_TEXTURE_GEN_Q);
local1.glDisable(GL2.GL_TEXTURE_3D);
}
local1.glEndList();
}
@ -106,16 +106,16 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
@OriginalMember(owner = "client!pd", name = "a", descriptor = "()V")
@Override
public final void method4602() {
Static239.aGL1.glCallList(this.anInt4440 + 1);
Static239.gl.glCallList(this.anInt4440 + 1);
}
@OriginalMember(owner = "client!pd", name = "a", descriptor = "(I)V")
@Override
public final void method4604(@OriginalArg(0) int arg0) {
@Pc(1) GL local1 = Static239.aGL1;
local1.glActiveTexture(GL.GL_TEXTURE1);
local1.glTexEnvfv(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_COLOR, Static257.aFloatArray2, 0);
local1.glActiveTexture(GL.GL_TEXTURE0);
@Pc(1) GL2 local1 = Static239.gl;
local1.glActiveTexture(GL2.GL_TEXTURE1);
local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static257.aFloatArray2, 0);
local1.glActiveTexture(GL2.GL_TEXTURE0);
if ((arg0 & 0x1) == 1) {
if (!Static151.aBoolean176) {
Static239.method4177(Static151.anIntArray341[Static239.anInt5323 * 64 / 100 % 64]);
@ -124,7 +124,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
this.aFloatArray23[1] = 0.0F;
this.aFloatArray23[2] = 0.0F;
this.aFloatArray23[3] = (float) Static239.anInt5323 * 0.005F;
local1.glTexGenfv(GL.GL_R, GL.GL_OBJECT_PLANE, this.aFloatArray23, 0);
local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0);
this.anInt4442 = Static239.anInt5323;
}
} else if (Static151.aBoolean176) {
@ -132,7 +132,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
this.aFloatArray23[1] = 0.0F;
this.aFloatArray23[2] = 0.0F;
this.aFloatArray23[3] = 0.0F;
local1.glTexGenfv(GL.GL_R, GL.GL_OBJECT_PLANE, this.aFloatArray23, 0);
local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0);
} else {
Static239.method4177(Static151.anIntArray341[0]);
}
@ -141,7 +141,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
@OriginalMember(owner = "client!pd", name = "b", descriptor = "()V")
@Override
public final void method4603() {
@Pc(1) GL local1 = Static239.aGL1;
@Pc(1) GL2 local1 = Static239.gl;
Static239.method4183(2);
Static239.method4174(2);
Static239.method4150();
@ -155,10 +155,10 @@ public final class WaterMaterialRenderer implements MaterialRenderer {
this.aFloatArray23[1] = 0.0F;
this.aFloatArray23[2] = 1.0F / (local12 - 3328.0F);
this.aFloatArray23[3] = local12 / (local12 - 3328.0F);
local1.glTexGenfv(GL.GL_S, GL.GL_EYE_PLANE, this.aFloatArray23, 0);
local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray23, 0);
local1.glPopMatrix();
local1.glActiveTexture(GL.GL_TEXTURE0);
local1.glTexEnvfv(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_COLOR, Static188.aFloatArray22, 0);
local1.glActiveTexture(GL2.GL_TEXTURE0);
local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static188.aFloatArray22, 0);
}
@OriginalMember(owner = "client!pd", name = "c", descriptor = "()I")