diff --git a/client/src/main/java/rt4/Cs1ScriptRunner.java b/client/src/main/java/rt4/Cs1ScriptRunner.java index cf7cd09..2a6c092 100644 --- a/client/src/main/java/rt4/Cs1ScriptRunner.java +++ b/client/src/main/java/rt4/Cs1ScriptRunner.java @@ -733,7 +733,7 @@ public class Cs1ScriptRunner { SoftwareRaster.fillRectAlpha(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } } else if (GlRenderer.enabled) { - GlRaster.method1180(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); + GlRaster.drawRectAlpha(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } else { SoftwareRaster.method2487(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } @@ -1188,14 +1188,14 @@ public class Cs1ScriptRunner { } GlRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, anInt4306); GlRaster.fillRect(arg2, arg3 + local54 + 16, 16, local35, anInt1704); - GlRaster.method1176(arg2, local54 + arg3 + 16, local35, anInt4938); - GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 16, 16, anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 17, 16, anInt4938); - GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, anInt671); - GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, anInt671); - GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, anInt671); - GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671); + GlRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, anInt4938); + GlRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, anInt4938); + GlRaster.drawHorizontalLine(arg2, local54 + arg3 + 16, 16, anInt4938); + GlRaster.drawHorizontalLine(arg2, local54 + arg3 + 17, 16, anInt4938); + GlRaster.drawVerticalLine(arg2 + 15, arg3 + (16 - -local54), local35, anInt671); + GlRaster.drawVerticalLine(arg2 + 14, arg3 - -local54 + 17, local35 - 1, anInt671); + GlRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, anInt671); + GlRaster.drawHorizontalLine(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671); } @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") diff --git a/client/src/main/java/rt4/Font.java b/client/src/main/java/rt4/Font.java index c25dc84..555e471 100644 --- a/client/src/main/java/rt4/Font.java +++ b/client/src/main/java/rt4/Font.java @@ -303,14 +303,14 @@ public abstract class Font extends SecondaryNode { @Pc(323) int local323 = this.glyphWidths[local22]; if (strikethroughColor != -1) { if (GlRenderer.enabled) { - GlRaster.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, strikethroughColor); + GlRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, strikethroughColor); } else { SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, strikethroughColor); } } if (underlineColor != -1) { if (GlRenderer.enabled) { - GlRaster.method1174(arg1, local4 + this.lineHeight + 1, local323, underlineColor); + GlRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, underlineColor); } else { SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight + 1, local323, underlineColor); } @@ -995,14 +995,14 @@ public abstract class Font extends SecondaryNode { @Pc(387) int local387 = this.glyphWidths[local24]; if (strikethroughColor != -1) { if (GlRenderer.enabled) { - GlRaster.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, strikethroughColor); + GlRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, strikethroughColor); } else { SoftwareRaster.drawHorizontalLine(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, strikethroughColor); } } if (underlineColor != -1) { if (GlRenderer.enabled) { - GlRaster.method1174(arg1, local4 + this.lineHeight, local387, underlineColor); + GlRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, underlineColor); } else { SoftwareRaster.drawHorizontalLine(arg1, local4 + this.lineHeight, local387, underlineColor); } diff --git a/client/src/main/java/rt4/GlAlphaSprite.java b/client/src/main/java/rt4/GlAlphaSprite.java index d53762b..d717746 100644 --- a/client/src/main/java/rt4/GlAlphaSprite.java +++ b/client/src/main/java/rt4/GlAlphaSprite.java @@ -45,14 +45,14 @@ public final class GlAlphaSprite extends GlSprite { local22 += local32; } @Pc(94) ByteBuffer local94 = ByteBuffer.wrap(local20); - @Pc(96) GL2 local96 = GlRenderer.gl; + @Pc(96) GL2 gl = GlRenderer.gl; if (this.textureId == -1) { @Pc(103) int[] local103 = new int[1]; - local96.glGenTextures(1, local103, 0); + gl.glGenTextures(1, local103, 0); this.textureId = local103[0]; } GlRenderer.setTextureId(this.textureId); - local96.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local94); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local94); GlCleaner.onCard2d += local94.limit() - this.anInt1869; this.anInt1869 = local94.limit(); } diff --git a/client/src/main/java/rt4/GlCleaner.java b/client/src/main/java/rt4/GlCleaner.java index a001a59..f7b5b67 100644 --- a/client/src/main/java/rt4/GlCleaner.java +++ b/client/src/main/java/rt4/GlCleaner.java @@ -78,13 +78,13 @@ public final class GlCleaner { @OriginalMember(owner = "client!fa", name = "c", descriptor = "()V") public static synchronized void process() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; @Pc(3) int local3 = 0; while (true) { @Pc(8) IntNode local8 = (IntNode) aClass69_48.removeHead(); if (local8 == null) { if (local3 > 0) { - local1.glDeleteBuffers(local3, anIntArray151, 0); + gl.glDeleteBuffers(local3, anIntArray151, 0); local3 = 0; } while (true) { @@ -94,7 +94,7 @@ public final class GlCleaner { local8 = (IntNode) aClass69_50.removeHead(); if (local8 == null) { if (local3 > 0) { - local1.glDeleteTextures(local3, anIntArray151, 0); + gl.glDeleteTextures(local3, anIntArray151, 0); } while (true) { local8 = (IntNode) aClass69_51.removeHead(); @@ -106,13 +106,13 @@ public final class GlCleaner { return; } @Pc(126) int local126 = (int) local8.key; - local1.glDeleteLists(local126, 1); + gl.glDeleteLists(local126, 1); } } anIntArray151[local3++] = (int) local8.key; onCardTexture -= local8.value; if (local3 == 1000) { - local1.glDeleteTextures(local3, anIntArray151, 0); + gl.glDeleteTextures(local3, anIntArray151, 0); local3 = 0; } } @@ -120,7 +120,7 @@ public final class GlCleaner { anIntArray151[local3++] = (int) local8.key; onCard2d -= local8.value; if (local3 == 1000) { - local1.glDeleteTextures(local3, anIntArray151, 0); + gl.glDeleteTextures(local3, anIntArray151, 0); local3 = 0; } } @@ -128,7 +128,7 @@ public final class GlCleaner { anIntArray151[local3++] = (int) local8.key; onCardGeometry -= local8.value; if (local3 == 1000) { - local1.glDeleteBuffers(local3, anIntArray151, 0); + gl.glDeleteBuffers(local3, anIntArray151, 0); local3 = 0; } } diff --git a/client/src/main/java/rt4/GlFont.java b/client/src/main/java/rt4/GlFont.java index 3bcc54a..5e94e73 100644 --- a/client/src/main/java/rt4/GlFont.java +++ b/client/src/main/java/rt4/GlFont.java @@ -41,11 +41,11 @@ public final class GlFont extends Font { } @OriginalMember(owner = "client!dj", name = "a", descriptor = "(Lclient!cf;)V") - public static void method1188(@OriginalArg(0) GlSprite arg0) { - if (arg0.height != GlRaster.clipBottom - GlRaster.clipTop) { + public static void method1188(@OriginalArg(0) GlSprite sprite) { + if (sprite.height != GlRaster.clipBottom - GlRaster.clipTop) { throw new IllegalArgumentException(); } - masked = arg0; + masked = sprite; } @OriginalMember(owner = "client!mb", name = "finalize", descriptor = "()V") diff --git a/client/src/main/java/rt4/GlIndexedSprite.java b/client/src/main/java/rt4/GlIndexedSprite.java index 94096f3..9ab591a 100644 --- a/client/src/main/java/rt4/GlIndexedSprite.java +++ b/client/src/main/java/rt4/GlIndexedSprite.java @@ -67,15 +67,15 @@ public final class GlIndexedSprite extends IndexedSprite { local22 += (this.anInt4287 - this.width) * 4; } @Pc(93) ByteBuffer local93 = ByteBuffer.wrap(local20); - @Pc(95) GL2 local95 = GlRenderer.gl; + @Pc(95) GL2 gl = GlRenderer.gl; if (this.anInt4281 == -1) { @Pc(102) int[] local102 = new int[1]; - local95.glGenTextures(1, local102, 0); + gl.glGenTextures(1, local102, 0); this.anInt4281 = local102[0]; this.anInt4285 = GlCleaner.contextId; } GlRenderer.setTextureId(this.anInt4281); - local95.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt4287, this.anInt4286, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local93); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt4287, this.anInt4286, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local93); GlCleaner.onCard2d += local93.limit() - this.anInt4284; this.anInt4284 = local93.limit(); } @@ -86,22 +86,22 @@ public final class GlIndexedSprite extends IndexedSprite { GlRenderer.method4155(); @Pc(5) int local5 = arg0 + this.xOffset; @Pc(10) int local10 = arg1 + this.yOffset; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.anInt4281); this.method3338(); - local12.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); - local12.glCallList(this.anInt4282); - local12.glLoadIdentity(); + gl.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glCallList(this.anInt4282); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!oh", name = "b", descriptor = "(I)V") private void method3338() { if (this.anInt4283 != 1) { this.anInt4283 = 1; - @Pc(9) GL2 local9 = GlRenderer.gl; - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); + @Pc(9) GL2 gl = GlRenderer.gl; + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); } } @@ -111,12 +111,12 @@ public final class GlIndexedSprite extends IndexedSprite { GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.xOffset; @Pc(10) int local10 = arg1 + this.yOffset; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.anInt4281); this.method3338(); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); - local12.glCallList(this.anInt4282); - local12.glLoadIdentity(); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glCallList(this.anInt4282); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!oh", name = "finalize", descriptor = "()V") @@ -138,22 +138,22 @@ public final class GlIndexedSprite extends IndexedSprite { private void method3339() { @Pc(7) float local7 = (float) this.width / (float) this.anInt4287; @Pc(15) float local15 = (float) this.height / (float) this.anInt4286; - @Pc(17) GL2 local17 = GlRenderer.gl; + @Pc(17) GL2 gl = GlRenderer.gl; if (this.anInt4282 == -1) { - this.anInt4282 = local17.glGenLists(1); + this.anInt4282 = gl.glGenLists(1); this.anInt4285 = GlCleaner.contextId; } - local17.glNewList(this.anInt4282, GL2.GL_COMPILE); - local17.glBegin(GL2.GL_TRIANGLE_FAN); - local17.glTexCoord2f(local7, 0.0F); - local17.glVertex2f((float) this.width, 0.0F); - local17.glTexCoord2f(0.0F, 0.0F); - local17.glVertex2f(0.0F, 0.0F); - local17.glTexCoord2f(0.0F, local15); - local17.glVertex2f(0.0F, (float) -this.height); - local17.glTexCoord2f(local7, local15); - local17.glVertex2f((float) this.width, (float) -this.height); - local17.glEnd(); - local17.glEndList(); + gl.glNewList(this.anInt4282, GL2.GL_COMPILE); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glTexCoord2f(local7, 0.0F); + gl.glVertex2f((float) this.width, 0.0F); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f(0.0F, 0.0F); + gl.glTexCoord2f(0.0F, local15); + gl.glVertex2f(0.0F, (float) -this.height); + gl.glTexCoord2f(local7, local15); + gl.glVertex2f((float) this.width, (float) -this.height); + gl.glEnd(); + gl.glEndList(); } } diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java index ed6cc4c..51ab917 100644 --- a/client/src/main/java/rt4/GlModel.java +++ b/client/src/main/java/rt4/GlModel.java @@ -1108,14 +1108,14 @@ public final class GlModel extends Model { } } } - @Pc(744) GL2 local744 = GlRenderer.gl; - local744.glPushMatrix(); - local744.glTranslatef((float) arg5, (float) arg6, (float) arg7); - local744.glRotatef((float) arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); + @Pc(744) GL2 gl = GlRenderer.gl; + gl.glPushMatrix(); + gl.glTranslatef((float) arg5, (float) arg6, (float) arg7); + gl.glRotatef((float) arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); this.method4121(); - local744.glRotatef((float) -arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); - local744.glTranslatef((float) -arg5, (float) -arg6, (float) -arg7); - local744.glPopMatrix(); + gl.glRotatef((float) -arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); + gl.glTranslatef((float) -arg5, (float) -arg6, (float) -arg7); + gl.glPopMatrix(); } @OriginalMember(owner = "client!td", name = "m", descriptor = "()V") @@ -1366,20 +1366,20 @@ public final class GlModel extends Model { if (this.anInt5296 == 0) { return; } - @Pc(5) GL2 local5 = GlRenderer.gl; - local5.glPushMatrix(); + @Pc(5) GL2 gl = GlRenderer.gl; + gl.glPushMatrix(); if (arg2 != 0) { - local5.glRotatef((float) arg2 * 0.17578125F, 1.0F, 0.0F, 0.0F); + gl.glRotatef((float) arg2 * 0.17578125F, 1.0F, 0.0F, 0.0F); } - local5.glTranslatef((float) arg3, (float) arg4, (float) arg5); + gl.glTranslatef((float) arg3, (float) arg4, (float) arg5); if (arg0 != 0) { - local5.glRotatef((float) arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); + gl.glRotatef((float) arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); } if (arg1 != 0) { - local5.glRotatef((float) -arg1 * 0.17578125F, 0.0F, 0.0F, 1.0F); + gl.glRotatef((float) -arg1 * 0.17578125F, 0.0F, 0.0F, 1.0F); } this.method4121(); - local5.glPopMatrix(); + gl.glPopMatrix(); } @OriginalMember(owner = "client!td", name = "a", descriptor = "(Lclient!gb;IJIIIIFF)S") @@ -3272,7 +3272,7 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "w", descriptor = "()V") private void method4121() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; if (this.triangleCount == 0) { return; } @@ -3316,55 +3316,55 @@ public final class GlModel extends Model { if (this.vertexBuffer.vbo != null) { this.vertexBuffer.vbo.bindArray(); local172 = this.vertexBuffer.vbo; - local1.glVertexPointer(3, GL2.GL_FLOAT, this.vertexBuffer.stride, this.vertexBuffer.pointer); + gl.glVertexPointer(3, GL2.GL_FLOAT, this.vertexBuffer.stride, this.vertexBuffer.pointer); } if (this.colorBuffer.vbo != null) { if (local172 != this.colorBuffer.vbo) { this.colorBuffer.vbo.bindArray(); local172 = this.colorBuffer.vbo; } - local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.colorBuffer.stride, this.colorBuffer.pointer); + gl.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.colorBuffer.stride, this.colorBuffer.pointer); } if (Preferences.highDetailLighting && this.normalsBuffer.vbo != null) { if (local172 != this.normalsBuffer.vbo) { this.normalsBuffer.vbo.bindArray(); local172 = this.normalsBuffer.vbo; } - local1.glNormalPointer(GL2.GL_FLOAT, this.normalsBuffer.stride, this.normalsBuffer.pointer); + gl.glNormalPointer(GL2.GL_FLOAT, this.normalsBuffer.stride, this.normalsBuffer.pointer); } if (this.texCoordBuffer.vbo != null) { if (local172 != this.texCoordBuffer.vbo) { this.texCoordBuffer.vbo.bindArray(); local172 = this.texCoordBuffer.vbo; } - local1.glTexCoordPointer(2, GL2.GL_FLOAT, this.texCoordBuffer.stride, this.texCoordBuffer.pointer); + gl.glTexCoordPointer(2, GL2.GL_FLOAT, this.texCoordBuffer.stride, this.texCoordBuffer.pointer); } if (this.indexBuffer.vbo != null) { this.indexBuffer.vbo.bindElementArray(); } if (this.vertexBuffer.vbo == null || this.colorBuffer.vbo == null || Preferences.highDetailLighting && this.normalsBuffer.vbo == null || this.texCoordBuffer.vbo == null) { if (GlRenderer.arbVboSupported) { - local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } if (this.vertexBuffer.vbo == null) { this.vertexBuffer.buffer.position(this.vertexBuffer.pointer); - local1.glVertexPointer(3, GL2.GL_FLOAT, this.vertexBuffer.stride, this.vertexBuffer.buffer); + gl.glVertexPointer(3, GL2.GL_FLOAT, this.vertexBuffer.stride, this.vertexBuffer.buffer); } if (this.colorBuffer.vbo == null) { this.colorBuffer.buffer.position(this.colorBuffer.pointer); - local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.colorBuffer.stride, this.colorBuffer.buffer); + gl.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.colorBuffer.stride, this.colorBuffer.buffer); } if (Preferences.highDetailLighting && this.normalsBuffer.vbo == null) { this.normalsBuffer.buffer.position(this.normalsBuffer.pointer); - local1.glNormalPointer(GL2.GL_FLOAT, this.normalsBuffer.stride, this.normalsBuffer.buffer); + gl.glNormalPointer(GL2.GL_FLOAT, this.normalsBuffer.stride, this.normalsBuffer.buffer); } if (this.texCoordBuffer.vbo == null) { this.texCoordBuffer.buffer.position(this.texCoordBuffer.pointer); - local1.glTexCoordPointer(2, GL2.GL_FLOAT, this.texCoordBuffer.stride, this.texCoordBuffer.buffer); + gl.glTexCoordPointer(2, GL2.GL_FLOAT, this.texCoordBuffer.stride, this.texCoordBuffer.buffer); } } if (this.indexBuffer.vbo == null && GlRenderer.arbVboSupported) { - local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } @Pc(417) int local417 = this.anIntArray463.length - 1; for (@Pc(419) int local419 = 0; local419 < local417; local419++) { @@ -3379,9 +3379,9 @@ public final class GlModel extends Model { } if (this.indexBuffer.vbo == null) { this.indexBuffer.buffer.position(local427 * 12); - local1.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, this.indexBuffer.buffer); + gl.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, this.indexBuffer.buffer); } else { - local1.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, local427 * 12L); + gl.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, local427 * 12L); } } } diff --git a/client/src/main/java/rt4/GlRaster.java b/client/src/main/java/rt4/GlRaster.java index a3474f5..093f2ca 100644 --- a/client/src/main/java/rt4/GlRaster.java +++ b/client/src/main/java/rt4/GlRaster.java @@ -22,31 +22,31 @@ public final class GlRaster { public static int clipBottom = 0; @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIII)V") - public static void method1174(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + public static void drawHorizontalLine(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int length, @OriginalArg(3) int color) { GlRenderer.method4162(); - @Pc(5) float local5 = (float) arg0 + 0.3F; - @Pc(10) float local10 = local5 + (float) arg2; - @Pc(18) float local18 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; - @Pc(20) GL2 local20 = GlRenderer.gl; - local20.glBegin(GL2.GL_LINES); - local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3); - local20.glVertex2f(local5, local18); - local20.glVertex2f(local10, local18); - local20.glEnd(); + @Pc(5) float xCoordinateStart = (float) x + 0.3F; + @Pc(10) float xCoordinateEnd = xCoordinateStart + (float) length; + @Pc(18) float yCoordinate = (float) GlRenderer.canvasHeight - (float) y - 0.3F; + @Pc(20) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_LINES); + gl.glColor3ub((byte) (color >> 16), (byte) (color >> 8), (byte) color); + gl.glVertex2f(xCoordinateStart, yCoordinate); + gl.glVertex2f(xCoordinateEnd, yCoordinate); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "b", descriptor = "(IIII)V") - public static void method1176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + public static void drawVerticalLine(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int height, @OriginalArg(3) int color) { GlRenderer.method4162(); - @Pc(5) float local5 = (float) arg0 + 0.3F; - @Pc(13) float local13 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; - @Pc(18) float local18 = local13 - (float) arg2; - @Pc(20) GL2 local20 = GlRenderer.gl; - local20.glBegin(GL2.GL_LINES); - local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3); - local20.glVertex2f(local5, local13); - local20.glVertex2f(local5, local18); - local20.glEnd(); + @Pc(5) float xCoordinate = (float) x + 0.3F; + @Pc(13) float yCoordinateStart = (float) GlRenderer.canvasHeight - (float) y - 0.3F; + @Pc(18) float yCoordinateEnd = yCoordinateStart - (float) height; + @Pc(20) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_LINES); + gl.glColor3ub((byte) (color >> 16), (byte) (color >> 8), (byte) color); + gl.glVertex2f(xCoordinate, yCoordinateStart); + gl.glVertex2f(xCoordinate, yCoordinateEnd); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "c", descriptor = "()V") @@ -55,57 +55,57 @@ public final class GlRaster { clipTop = 0; clipRight = GlRenderer.canvasWidth; clipBottom = GlRenderer.canvasHeight; - @Pc(9) GL2 local9 = GlRenderer.gl; - local9.glDisable(GL2.GL_SCISSOR_TEST); + @Pc(9) GL2 gl = GlRenderer.gl; + gl.glDisable(GL2.GL_SCISSOR_TEST); GlFont.method1173(); } @OriginalMember(owner = "client!dj", name = "a", descriptor = "([IIIII)V") - public static void drawPixels(@OriginalArg(0) int[] arg0, @OriginalArg(1) int x, @OriginalArg(2) int y, @OriginalArg(3) int width, @OriginalArg(4) int height) { + public static void drawPixels(@OriginalArg(0) int[] pixels, @OriginalArg(1) int x, @OriginalArg(2) int y, @OriginalArg(3) int width, @OriginalArg(4) int height) { GlRenderer.method4162(); @Pc(2) GL2 gl = GlRenderer.gl; gl.glRasterPos2i(x, GlRenderer.canvasHeight - y); gl.glPixelZoom((float) GameShell.canvasScale, (float) -GameShell.canvasScale); gl.glDisable(GL2.GL_BLEND); gl.glDisable(GL2.GL_ALPHA_TEST); - gl.glDrawPixels(width, height, GL2.GL_BGRA, GlRenderer.bigEndian ? GL2.GL_UNSIGNED_INT_8_8_8_8_REV : GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(arg0)); + gl.glDrawPixels(width, height, GL2.GL_BGRA, GlRenderer.bigEndian ? GL2.GL_UNSIGNED_INT_8_8_8_8_REV : GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(pixels)); gl.glPixelZoom(1.0F, 1.0F); gl.glEnable(GL2.GL_ALPHA_TEST); gl.glEnable(GL2.GL_BLEND); } @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIIII)V") - public static void drawRect(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + public static void drawRect(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int width, @OriginalArg(3) int height, @OriginalArg(4) int color) { GlRenderer.method4162(); - @Pc(5) float local5 = (float) arg0 + 0.3F; - @Pc(12) float local12 = local5 + (float) (arg2 - 1); - @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; - @Pc(27) float local27 = local20 - (float) (arg3 - 1); - @Pc(29) GL2 local29 = GlRenderer.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); - local29.glVertex2f(local12, local27); - local29.glVertex2f(local12, local20); - local29.glEnd(); + @Pc(5) float local5 = (float) x + 0.3F; + @Pc(12) float local12 = local5 + (float) (width - 1); + @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) y - 0.3F; + @Pc(27) float local27 = local20 - (float) (height - 1); + @Pc(29) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_LINE_LOOP); + gl.glColor3ub((byte) (color >> 16), (byte) (color >> 8), (byte) color); + gl.glVertex2f(local5, local20); + gl.glVertex2f(local5, local27); + gl.glVertex2f(local12, local27); + gl.glVertex2f(local12, local20); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIIIII)V") - public static void method1180(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { + public static void drawRectAlpha(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int width, @OriginalArg(3) int height, @OriginalArg(4) int color, @OriginalArg(5) int alpha) { GlRenderer.method4162(); - @Pc(5) float local5 = (float) arg0 + 0.3F; - @Pc(12) float local12 = local5 + (float) (arg2 - 1); - @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; - @Pc(27) float local27 = local20 - (float) (arg3 - 1); - @Pc(29) GL2 local29 = GlRenderer.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); - local29.glVertex2f(local12, local27); - local29.glVertex2f(local12, local20); - local29.glEnd(); + @Pc(5) float local5 = (float) x + 0.3F; + @Pc(12) float local12 = local5 + (float) (width - 1); + @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) y - 0.3F; + @Pc(27) float local27 = local20 - (float) (height - 1); + @Pc(29) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_LINE_LOOP); + gl.glColor4ub((byte) (color >> 16), (byte) (color >> 8), (byte) color, alpha > 255 ? -1 : (byte) alpha); + gl.glVertex2f(local5, local20); + gl.glVertex2f(local5, local27); + gl.glVertex2f(local12, local27); + gl.glVertex2f(local12, local20); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "b", descriptor = "(IIIIII)V") @@ -141,38 +141,38 @@ public final class GlRaster { @Pc(115) int local115 = arg1 + local7 - local81; @Pc(121) int local121 = arg1 + local7 + local73; GlRenderer.method4162(); - @Pc(124) GL2 local124 = GlRenderer.gl; - local124.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); - local124.glBegin(GL2.GL_TRIANGLE_FAN); + @Pc(124) GL2 gl = GlRenderer.gl; + gl.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); + gl.glBegin(GL2.GL_TRIANGLE_FAN); if (local43 <= local37) { - local124.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); - local124.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); - local124.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); - local124.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); + gl.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); + gl.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); + gl.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); + gl.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); } else { - local124.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); - local124.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); - local124.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); - local124.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); + gl.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); + gl.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); + gl.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); + gl.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); } - local124.glEnd(); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIIIII)V") - public static void fillRectAlpha(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { + public static void fillRectAlpha(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int width, @OriginalArg(3) int height, @OriginalArg(4) int color, @OriginalArg(5) int alpha) { GlRenderer.method4162(); - @Pc(3) float local3 = (float) arg0; - @Pc(8) float local8 = local3 + (float) arg2; - @Pc(13) float local13 = (float) (GlRenderer.canvasHeight - arg1); - @Pc(18) float local18 = local13 - (float) arg3; - @Pc(20) GL2 local20 = GlRenderer.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); - local20.glVertex2f(local8, local18); - local20.glVertex2f(local8, local13); - local20.glEnd(); + @Pc(3) float local3 = (float) x; + @Pc(8) float local8 = local3 + (float) width; + @Pc(13) float local13 = (float) (GlRenderer.canvasHeight - y); + @Pc(18) float local18 = local13 - (float) height; + @Pc(20) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor4ub((byte) (color >> 16), (byte) (color >> 8), (byte) color, alpha > 255 ? -1 : (byte) alpha); + gl.glVertex2f(local3, local13); + gl.glVertex2f(local3, local18); + gl.glVertex2f(local8, local18); + gl.glVertex2f(local8, local13); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIII)V") @@ -211,12 +211,12 @@ public final class GlRaster { @Pc(10) float local10 = (float) arg2 + 0.3F; @Pc(18) float local18 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; @Pc(26) float local26 = (float) GlRenderer.canvasHeight - (float) arg3 - 0.3F; - @Pc(28) GL2 local28 = GlRenderer.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); - local28.glEnd(); + @Pc(28) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_LINE_LOOP); + gl.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); + gl.glVertex2f(local5, local18); + gl.glVertex2f(local10, local26); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIIII)V") @@ -226,14 +226,14 @@ public final class GlRaster { @Pc(8) float local8 = local3 + (float) arg2; @Pc(13) float local13 = (float) (GlRenderer.canvasHeight - arg1); @Pc(18) float local18 = local13 - (float) arg3; - @Pc(20) GL2 local20 = GlRenderer.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); - local20.glVertex2f(local8, local18); - local20.glVertex2f(local8, local13); - local20.glEnd(); + @Pc(20) GL2 gl = GlRenderer.gl; + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); + gl.glVertex2f(local3, local13); + gl.glVertex2f(local3, local18); + gl.glVertex2f(local8, local18); + gl.glVertex2f(local8, local13); + gl.glEnd(); } @OriginalMember(owner = "client!dj", name = "d", descriptor = "(IIII)V") @@ -254,12 +254,12 @@ public final class GlRaster { clipTop = arg1; clipRight = arg2; clipBottom = arg3; - @Pc(27) GL2 local27 = GlRenderer.gl; - local27.glEnable(GL2.GL_SCISSOR_TEST); + @Pc(27) GL2 gl = GlRenderer.gl; + gl.glEnable(GL2.GL_SCISSOR_TEST); if (clipLeft <= clipRight && clipTop <= clipBottom) { - local27.glScissor((int) (clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int) ((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int) ((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int) ((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY)); + gl.glScissor((int) (clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int) ((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int) ((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int) ((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY)); } else { - local27.glScissor(0, 0, 0, 0); + gl.glScissor(0, 0, 0, 0); } GlFont.method1173(); } diff --git a/client/src/main/java/rt4/GlRenderer.java b/client/src/main/java/rt4/GlRenderer.java index f163e65..b42e0de 100644 --- a/client/src/main/java/rt4/GlRenderer.java +++ b/client/src/main/java/rt4/GlRenderer.java @@ -262,8 +262,8 @@ public final class GlRenderer { gl.glPolygonMode(GL2.GL_FRONT, GL2.GL_FILL); gl.glEnable(GL2.GL_CULL_FACE); gl.glCullFace(GL2.GL_BACK); - gl.glEnable(GL2.GL_BLEND); - gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA); + gl.glEnable(GL2.GL_BLEND); // Enable the OpenGL Blending functionality + gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA); // Set the blend mode to blend our current RGBA with what is already in the buffer gl.glEnable(GL2.GL_ALPHA_TEST); gl.glAlphaFunc(GL2.GL_GREATER, 0.0F); gl.glEnableClientState(GL2.GL_VERTEX_ARRAY); @@ -360,12 +360,12 @@ public final class GlRenderer { if (aBoolean266) { return; } - gl.glMatrixMode(GL2.GL_PROJECTION); - gl.glLoadIdentity(); + gl.glMatrixMode(GL2.GL_PROJECTION); // Switch to the projection matrix so that we can manipulate how our scene is viewed + gl.glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up) gl.glOrtho(0, canvasWidth, 0, canvasHeight, -1.0D, 1.0D); setViewportBounds(0, 0, canvasWidth, canvasHeight); - gl.glMatrixMode(GL2.GL_MODELVIEW); - gl.glLoadIdentity(); + gl.glMatrixMode(GL2.GL_MODELVIEW); // Switch back to the model view matrix, so that we can start drawing shapes correctly + gl.glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up) aBoolean266 = true; } diff --git a/client/src/main/java/rt4/GlSprite.java b/client/src/main/java/rt4/GlSprite.java index 5fa4f73..939175b 100644 --- a/client/src/main/java/rt4/GlSprite.java +++ b/client/src/main/java/rt4/GlSprite.java @@ -62,13 +62,13 @@ public class GlSprite extends Sprite { return; } this.anInt1873 = arg0; - @Pc(9) GL2 local9 = GlRenderer.gl; + @Pc(9) GL2 gl = GlRenderer.gl; if (arg0 == 2) { - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); } else { - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); } } @@ -80,47 +80,47 @@ public class GlSprite extends Sprite { GlRenderer.method4149(); GlRenderer.setTextureId(arg2.textureId); arg2.method1424(1); - @Pc(11) GL2 local11 = GlRenderer.gl; + @Pc(11) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); - local11.glActiveTexture(GL2.GL_TEXTURE1); - local11.glEnable(GL2.GL_TEXTURE_2D); - local11.glBindTexture(GL2.GL_TEXTURE_2D, arg2.textureId); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_REPLACE); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_PREVIOUS); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glEnable(GL2.GL_TEXTURE_2D); + gl.glBindTexture(GL2.GL_TEXTURE_2D, arg2.textureId); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_REPLACE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_PREVIOUS); @Pc(47) float local47 = (float) (arg0 - GlRaster.clipLeft) / (float) arg2.powerOfTwoWidth; @Pc(56) float local56 = (float) (arg1 - GlRaster.clipTop) / (float) arg2.powerOfTwoHeight; @Pc(68) float local68 = (float) (arg0 + this.width - GlRaster.clipLeft) / (float) arg2.powerOfTwoWidth; @Pc(80) float local80 = (float) (arg1 + this.height - GlRaster.clipTop) / (float) arg2.powerOfTwoHeight; @Pc(85) int local85 = arg0 + this.anInt1863; @Pc(90) int local90 = arg1 + this.anInt1861; - local11.glBegin(GL2.GL_TRIANGLE_FAN); - local11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @Pc(107) float local107 = (float) this.width / (float) this.powerOfTwoWidth; @Pc(115) float local115 = (float) this.height / (float) this.powerOfTwoHeight; - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local56); - local11.glTexCoord2f(local107, 0.0F); - local11.glVertex2f((float) (local85 + this.width), (float) (GlRenderer.canvasHeight - local90)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local56); - local11.glTexCoord2f(0.0F, 0.0F); - local11.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local80); - local11.glTexCoord2f(0.0F, local115); - local11.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90 - this.height)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local80); - local11.glTexCoord2f(local107, local115); - local11.glVertex2f((float) (local85 + this.width), (float) (GlRenderer.canvasHeight - local90 - this.height)); - local11.glEnd(); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); - local11.glDisable(GL2.GL_TEXTURE_2D); - local11.glActiveTexture(GL2.GL_TEXTURE0); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local56); + gl.glTexCoord2f(local107, 0.0F); + gl.glVertex2f((float) (local85 + this.width), (float) (GlRenderer.canvasHeight - local90)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local56); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local80); + gl.glTexCoord2f(0.0F, local115); + gl.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90 - this.height)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local80); + gl.glTexCoord2f(local107, local115); + gl.glVertex2f((float) (local85 + this.width), (float) (GlRenderer.canvasHeight - local90 - this.height)); + gl.glEnd(); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); + gl.glDisable(GL2.GL_TEXTURE_2D); + gl.glActiveTexture(GL2.GL_TEXTURE0); } @OriginalMember(owner = "client!cf", name = "c", descriptor = "(IIIII)V") public final void method1426(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { GlRenderer.method4155(); - @Pc(2) GL2 local2 = GlRenderer.gl; + @Pc(2) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); @Pc(16) float local16 = (float) this.width / (float) this.powerOfTwoWidth; @@ -132,17 +132,17 @@ public class GlSprite extends Sprite { @Pc(53) int local53 = GlRenderer.canvasHeight - arg1 - this.anInt1861; @Pc(60) int local60 = local53 - this.height * arg4; @Pc(65) float local65 = (float) arg2 / 256.0F; - local2.glBegin(GL2.GL_TRIANGLE_FAN); - local2.glColor4f(1.0F, 1.0F, 1.0F, local65); - local2.glTexCoord2f(local29, 0.0F); - local2.glVertex2f((float) local46, (float) local53); - local2.glTexCoord2f(0.0F, 0.0F); - local2.glVertex2f((float) local39, (float) local53); - local2.glTexCoord2f(0.0F, local34); - local2.glVertex2f((float) local39, (float) local60); - local2.glTexCoord2f(local29, local34); - local2.glVertex2f((float) local46, (float) local60); - local2.glEnd(); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor4f(1.0F, 1.0F, 1.0F, local65); + gl.glTexCoord2f(local29, 0.0F); + gl.glVertex2f((float) local46, (float) local53); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f((float) local39, (float) local53); + gl.glTexCoord2f(0.0F, local34); + gl.glVertex2f((float) local39, (float) local60); + gl.glTexCoord2f(local29, local34); + gl.glVertex2f((float) local46, (float) local60); + gl.glEnd(); } @OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIIIIIIILclient!cf;)V") @@ -153,18 +153,18 @@ public class GlSprite extends Sprite { GlRenderer.method4149(); GlRenderer.setTextureId(arg8.textureId); arg8.method1424(1); - @Pc(11) GL2 local11 = GlRenderer.gl; + @Pc(11) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); if (GlobalConfig.BILINEAR_MINIMAP) { this.method1424(2); } else { this.method1424(1); } - local11.glActiveTexture(GL2.GL_TEXTURE1); - local11.glEnable(GL2.GL_TEXTURE_2D); - local11.glBindTexture(GL2.GL_TEXTURE_2D, arg8.textureId); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_REPLACE); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_PREVIOUS); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glEnable(GL2.GL_TEXTURE_2D); + gl.glBindTexture(GL2.GL_TEXTURE_2D, arg8.textureId); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_REPLACE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_PREVIOUS); @Pc(43) int local43 = -arg2 / 2; @Pc(48) int local48 = -arg3 / 2; @Pc(51) int local51 = -local43; @@ -183,27 +183,27 @@ public class GlSprite extends Sprite { @Pc(180) int local180 = (arg5 << 16) + (local54 * local84 - local51 * local78); @Pc(188) float local188 = (float) arg8.width / (float) arg8.powerOfTwoWidth; @Pc(196) float local196 = (float) arg8.height / (float) arg8.powerOfTwoHeight; - local11.glBegin(GL2.GL_TRIANGLE_FAN); - local11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @Pc(211) float local211 = (float) this.powerOfTwoWidth * 65536.0F; @Pc(217) float local217 = (float) (this.powerOfTwoHeight * 65536); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, 0.0F); - local11.glTexCoord2f((float) local120 / local211, (float) local132 / local217); - local11.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, 0.0F); - local11.glTexCoord2f((float) local96 / local211, (float) local108 / local217); - local11.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, local196); - local11.glTexCoord2f((float) local144 / local211, (float) local156 / local217); - local11.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1 - arg3)); - local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, local196); - local11.glTexCoord2f((float) local168 / local211, (float) local180 / local217); - local11.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1 - arg3)); - local11.glEnd(); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); - local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); - local11.glDisable(GL2.GL_TEXTURE_2D); - local11.glActiveTexture(GL2.GL_TEXTURE0); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, 0.0F); + gl.glTexCoord2f((float) local120 / local211, (float) local132 / local217); + gl.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, 0.0F); + gl.glTexCoord2f((float) local96 / local211, (float) local108 / local217); + gl.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, local196); + gl.glTexCoord2f((float) local144 / local211, (float) local156 / local217); + gl.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1 - arg3)); + gl.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, local196); + gl.glTexCoord2f((float) local168 / local211, (float) local180 / local217); + gl.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1 - arg3)); + gl.glEnd(); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); + gl.glDisable(GL2.GL_TEXTURE_2D); + gl.glActiveTexture(GL2.GL_TEXTURE0); } @OriginalMember(owner = "client!cf", name = "d", descriptor = "(II)V") @@ -212,23 +212,23 @@ public class GlSprite extends Sprite { GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); @Pc(35) float local35 = (float) this.width / (float) this.powerOfTwoWidth; @Pc(43) float local43 = (float) this.height / (float) this.powerOfTwoHeight; - local12.glBegin(GL2.GL_TRIANGLE_FAN); - local12.glTexCoord2f(0.0F, 0.0F); - local12.glVertex2f((float) this.width, 0.0F); - local12.glTexCoord2f(local35, 0.0F); - local12.glVertex2f(0.0F, 0.0F); - local12.glTexCoord2f(local35, local43); - local12.glVertex2f(0.0F, (float) -this.height); - local12.glTexCoord2f(0.0F, local43); - local12.glVertex2f((float) this.width, (float) -this.height); - local12.glEnd(); - local12.glLoadIdentity(); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f((float) this.width, 0.0F); + gl.glTexCoord2f(local35, 0.0F); + gl.glVertex2f(0.0F, 0.0F); + gl.glTexCoord2f(local35, local43); + gl.glVertex2f(0.0F, (float) -this.height); + gl.glTexCoord2f(0.0F, local43); + gl.glVertex2f((float) this.width, (float) -this.height); + gl.glEnd(); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "e", descriptor = "(II)V") @@ -237,27 +237,27 @@ public class GlSprite extends Sprite { GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); - local12.glCallList(this.anInt1871); - local12.glLoadIdentity(); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glCallList(this.anInt1871); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "b", descriptor = "(IIIIII)V") public final void method1428(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2) { GlRenderer.method4149(); - @Pc(2) GL2 local2 = GlRenderer.gl; + @Pc(2) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(2); @Pc(15) int local15 = 240 - (this.anInt1863 << 4); @Pc(22) int local22 = 240 - (this.anInt1861 << 4); - local2.glTranslatef((float) arg0 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg1 / 16.0F, 0.0F); - local2.glRotatef((float) -arg2 * 0.005493164F, 0.0F, 0.0F, 1.0F); - local2.glTranslatef((float) -local15 / 16.0F, (float) local22 / 16.0F, 0.0F); - local2.glCallList(this.anInt1871); - local2.glLoadIdentity(); + gl.glTranslatef((float) arg0 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg1 / 16.0F, 0.0F); + gl.glRotatef((float) -arg2 * 0.005493164F, 0.0F, 0.0F, 1.0F); + gl.glTranslatef((float) -local15 / 16.0F, (float) local22 / 16.0F, 0.0F); + gl.glCallList(this.anInt1871); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIII)V") @@ -292,7 +292,7 @@ public class GlSprite extends Sprite { if (local11 < local21) { arg3 = ((local11 << 16) + local33 - local15 - 1) / local33; } - @Pc(123) GL2 local123 = GlRenderer.gl; + @Pc(123) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(2); @Pc(132) float local132 = (float) arg0; @@ -301,16 +301,16 @@ public class GlSprite extends Sprite { @Pc(147) float local147 = local142 - (float) arg3; @Pc(155) float local155 = (float) this.width / (float) this.powerOfTwoWidth; @Pc(163) float local163 = (float) this.height / (float) this.powerOfTwoHeight; - local123.glBegin(GL2.GL_TRIANGLE_FAN); - local123.glTexCoord2f(local155, 0.0F); - local123.glVertex2f(local137, local142); - local123.glTexCoord2f(0.0F, 0.0F); - local123.glVertex2f(local132, local142); - local123.glTexCoord2f(0.0F, local163); - local123.glVertex2f(local132, local147); - local123.glTexCoord2f(local155, local163); - local123.glVertex2f(local137, local147); - local123.glEnd(); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glTexCoord2f(local155, 0.0F); + gl.glVertex2f(local137, local142); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f(local132, local142); + gl.glTexCoord2f(0.0F, local163); + gl.glVertex2f(local132, local147); + gl.glTexCoord2f(local155, local163); + gl.glVertex2f(local137, local147); + gl.glEnd(); } @OriginalMember(owner = "client!cf", name = "c", descriptor = "(II)V") @@ -319,12 +319,12 @@ public class GlSprite extends Sprite { GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); - local12.glCallList(this.anInt1871); - local12.glLoadIdentity(); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glCallList(this.anInt1871); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "finalize", descriptor = "()V") @@ -346,19 +346,19 @@ public class GlSprite extends Sprite { @Override protected final void method1416(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { GlRenderer.method4149(); - @Pc(2) GL2 local2 = GlRenderer.gl; + @Pc(2) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); @Pc(15) int local15 = arg0 - (this.anInt1863 << 4); @Pc(22) int local22 = arg1 - (this.anInt1861 << 4); - local2.glTranslatef((float) arg2 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg3 / 16.0F, 0.0F); - local2.glRotatef((float) arg4 * 0.005493164F, 0.0F, 0.0F, 1.0F); + gl.glTranslatef((float) arg2 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg3 / 16.0F, 0.0F); + gl.glRotatef((float) arg4 * 0.005493164F, 0.0F, 0.0F, 1.0F); if (arg5 != 4096) { - local2.glScalef((float) arg5 / 4096.0F, (float) arg5 / 4096.0F, 0.0F); + gl.glScalef((float) arg5 / 4096.0F, (float) arg5 / 4096.0F, 0.0F); } - local2.glTranslatef((float) -local15 / 16.0F, (float) local22 / 16.0F, 0.0F); - local2.glCallList(this.anInt1871); - local2.glLoadIdentity(); + gl.glTranslatef((float) -local15 / 16.0F, (float) local22 / 16.0F, 0.0F); + gl.glCallList(this.anInt1871); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "b", descriptor = "(IIIII)V") @@ -393,7 +393,7 @@ public class GlSprite extends Sprite { if (local11 < local21) { arg3 = ((local11 << 16) + local33 - local15 - 1) / local33; } - @Pc(123) GL2 local123 = GlRenderer.gl; + @Pc(123) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); @Pc(132) float local132 = (float) arg0; @@ -403,23 +403,23 @@ public class GlSprite extends Sprite { @Pc(155) float local155 = (float) this.width / (float) this.powerOfTwoWidth; @Pc(163) float local163 = (float) this.height / (float) this.powerOfTwoHeight; @Pc(168) float local168 = (float) arg4 / 256.0F; - local123.glBegin(GL2.GL_TRIANGLE_FAN); - local123.glColor4f(1.0F, 1.0F, 1.0F, local168); - local123.glTexCoord2f(local155, 0.0F); - local123.glVertex2f(local137, local142); - local123.glTexCoord2f(0.0F, 0.0F); - local123.glVertex2f(local132, local142); - local123.glTexCoord2f(0.0F, local163); - local123.glVertex2f(local132, local147); - local123.glTexCoord2f(local155, local163); - local123.glVertex2f(local137, local147); - local123.glEnd(); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glColor4f(1.0F, 1.0F, 1.0F, local168); + gl.glTexCoord2f(local155, 0.0F); + gl.glVertex2f(local137, local142); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f(local132, local142); + gl.glTexCoord2f(0.0F, local163); + gl.glVertex2f(local132, local147); + gl.glTexCoord2f(local155, local163); + gl.glVertex2f(local137, local147); + gl.glEnd(); } @OriginalMember(owner = "client!cf", name = "b", descriptor = "(IIII)V") public final void method1429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { GlRenderer.method4149(); - @Pc(2) GL2 local2 = GlRenderer.gl; + @Pc(2) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); @Pc(16) float local16 = (float) this.width / (float) this.powerOfTwoWidth; @@ -430,16 +430,16 @@ public class GlSprite extends Sprite { @Pc(46) int local46 = local39 + this.width * arg2; @Pc(53) int local53 = GlRenderer.canvasHeight - arg1 - this.anInt1861; @Pc(60) int local60 = local53 - this.height * arg3; - local2.glBegin(GL2.GL_TRIANGLE_FAN); - local2.glTexCoord2f(local29, 0.0F); - local2.glVertex2f((float) local46, (float) local53); - local2.glTexCoord2f(0.0F, 0.0F); - local2.glVertex2f((float) local39, (float) local53); - local2.glTexCoord2f(0.0F, local34); - local2.glVertex2f((float) local39, (float) local60); - local2.glTexCoord2f(local29, local34); - local2.glVertex2f((float) local46, (float) local60); - local2.glEnd(); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glTexCoord2f(local29, 0.0F); + gl.glVertex2f((float) local46, (float) local53); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f((float) local39, (float) local53); + gl.glTexCoord2f(0.0F, local34); + gl.glVertex2f((float) local39, (float) local60); + gl.glTexCoord2f(local29, local34); + gl.glVertex2f((float) local46, (float) local60); + gl.glEnd(); } @OriginalMember(owner = "client!cf", name = "a", descriptor = "([I)V") @@ -465,15 +465,15 @@ public class GlSprite extends Sprite { local22 += local32; } @Pc(91) ByteBuffer local91 = ByteBuffer.wrap(local20); - @Pc(93) GL2 local93 = GlRenderer.gl; + @Pc(93) GL2 gl = GlRenderer.gl; if (this.textureId == -1) { @Pc(100) int[] local100 = new int[1]; - local93.glGenTextures(1, local100, 0); + gl.glGenTextures(1, local100, 0); this.textureId = local100[0]; this.anInt1875 = GlCleaner.contextId; } GlRenderer.setTextureId(this.textureId); - local93.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local91); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.powerOfTwoWidth, this.powerOfTwoHeight, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local91); GlCleaner.onCard2d += local91.limit() - this.anInt1869; this.anInt1869 = local91.limit(); } @@ -484,35 +484,35 @@ public class GlSprite extends Sprite { GlRenderer.method4155(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.textureId); this.method1424(1); - local12.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); - local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); - local12.glCallList(this.anInt1871); - local12.glLoadIdentity(); + gl.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); + gl.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); + gl.glCallList(this.anInt1871); + gl.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "a", descriptor = "()V") private void method1431() { @Pc(7) float local7 = (float) this.width / (float) this.powerOfTwoWidth; @Pc(15) float local15 = (float) this.height / (float) this.powerOfTwoHeight; - @Pc(17) GL2 local17 = GlRenderer.gl; + @Pc(17) GL2 gl = GlRenderer.gl; if (this.anInt1871 == -1) { - this.anInt1871 = local17.glGenLists(1); + this.anInt1871 = gl.glGenLists(1); this.anInt1875 = GlCleaner.contextId; } - local17.glNewList(this.anInt1871, GL2.GL_COMPILE); - local17.glBegin(GL2.GL_TRIANGLE_FAN); - local17.glTexCoord2f(local7, 0.0F); - local17.glVertex2f((float) this.width, 0.0F); - local17.glTexCoord2f(0.0F, 0.0F); - local17.glVertex2f(0.0F, 0.0F); - local17.glTexCoord2f(0.0F, local15); - local17.glVertex2f(0.0F, (float) -this.height); - local17.glTexCoord2f(local7, local15); - local17.glVertex2f((float) this.width, (float) -this.height); - local17.glEnd(); - local17.glEndList(); + gl.glNewList(this.anInt1871, GL2.GL_COMPILE); + gl.glBegin(GL2.GL_TRIANGLE_FAN); + gl.glTexCoord2f(local7, 0.0F); + gl.glVertex2f((float) this.width, 0.0F); + gl.glTexCoord2f(0.0F, 0.0F); + gl.glVertex2f(0.0F, 0.0F); + gl.glTexCoord2f(0.0F, local15); + gl.glVertex2f(0.0F, (float) -this.height); + gl.glTexCoord2f(local7, local15); + gl.glVertex2f((float) this.width, (float) -this.height); + gl.glEnd(); + gl.glEndList(); } } diff --git a/client/src/main/java/rt4/GlTexture.java b/client/src/main/java/rt4/GlTexture.java index 1189bce..93c6781 100644 --- a/client/src/main/java/rt4/GlTexture.java +++ b/client/src/main/java/rt4/GlTexture.java @@ -61,14 +61,14 @@ public final class GlTexture extends SecondaryNode { @OriginalMember(owner = "client!uh", name = "", descriptor = "(Lclient!wa;)V") public GlTexture(@OriginalArg(0) Buffer arg0) { this.aClass88_1 = new Texture(arg0); - this.aBoolean286 = arg0.g1() == 1; - this.aBoolean288 = arg0.g1() == 1; - this.aBoolean285 = arg0.g1() == 1; - this.aBoolean284 = arg0.g1() == 1; - @Pc(68) int local68 = arg0.g1() & 0x3; - this.anInt5485 = arg0.g1b(); - this.anInt5497 = arg0.g1b(); - @Pc(82) int local82 = arg0.g1(); + this.aBoolean286 = arg0.g1() == 1; // Unsure + this.aBoolean288 = arg0.g1() == 1; // Wrap Horizontal? + this.aBoolean285 = arg0.g1() == 1; // Wrap Horizontal? + this.aBoolean284 = arg0.g1() == 1; // Wrap Vertical? + @Pc(68) int local68 = arg0.g1() & 0x3; // Material Brightness + this.anInt5485 = arg0.g1b(); // Speed U + this.anInt5497 = arg0.g1b(); // Speed V + @Pc(82) int local82 = arg0.g1(); // Mipmap related? how texture behaves the further out it is from the camera arg0.g1(); if (local68 == 1) { this.anInt5486 = 2; diff --git a/client/src/main/java/rt4/Light_Class45.java b/client/src/main/java/rt4/Light_Class45.java index ab85ca6..9a3fd94 100644 --- a/client/src/main/java/rt4/Light_Class45.java +++ b/client/src/main/java/rt4/Light_Class45.java @@ -184,22 +184,22 @@ public final class Light_Class45 { @OriginalMember(owner = "client!fj", name = "c", descriptor = "()V") public final void method1556() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; if (GlRenderer.arbVboSupported) { this.aClass155_1.bindArray(); - local1.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, 0L); + gl.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, 0L); GlRenderer.normalArrayEnabled = false; this.aClass155_2.bindElementArray(); - local1.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, 0L); + gl.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, 0L); return; } if (GlRenderer.arbVboSupported) { - local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); - local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } - local1.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, this.aByteBuffer1); + gl.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, this.aByteBuffer1); GlRenderer.normalArrayEnabled = false; - local1.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, this.aByteBuffer2); + gl.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, this.aByteBuffer2); } @OriginalMember(owner = "client!fj", name = "a", descriptor = "([I)V") diff --git a/client/src/main/java/rt4/LightingManager.java b/client/src/main/java/rt4/LightingManager.java index 27eb08e..3120545 100644 --- a/client/src/main/java/rt4/LightingManager.java +++ b/client/src/main/java/rt4/LightingManager.java @@ -342,13 +342,13 @@ public class LightingManager { @OriginalMember(owner = "client!jf", name = "e", descriptor = "()V") public static void method2400() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; @Pc(3) int local3; for (local3 = 0; local3 < 4; local3++) { @Pc(10) int local10 = local3 + 16388; - local1.glLightfv(local10, GL2.GL_AMBIENT, new float[]{0.0F, 0.0F, 0.0F, 1.0F}, 0); - local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F); - local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F); + gl.glLightfv(local10, GL2.GL_AMBIENT, new float[]{0.0F, 0.0F, 0.0F, 1.0F}, 0); + gl.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F); + gl.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F); } for (local3 = 0; local3 < 4; local3++) { anIntArray284[local3] = -1; diff --git a/client/src/main/java/rt4/LiquidMaterialRenderer.java b/client/src/main/java/rt4/LiquidMaterialRenderer.java index 9fa38fb..0a6b8df 100644 --- a/client/src/main/java/rt4/LiquidMaterialRenderer.java +++ b/client/src/main/java/rt4/LiquidMaterialRenderer.java @@ -31,8 +31,8 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { public LiquidMaterialRenderer() { if (this.anInt4831 < 0 && (GlRenderer.arbVertexProgramSupported && GlRenderer.maxTextureUnits >= 2)) { @Pc(19) int[] local19 = new int[1]; - @Pc(21) GL2 local21 = GlRenderer.gl; - local21.glGenProgramsARB(1, local19, 0); + @Pc(21) GL2 gl = GlRenderer.gl; + gl.glGenProgramsARB(1, local19, 0); this.anInt4830 = local19[0]; @Pc(42) int[][] local42 = method874(0.4F); @Pc(53) int[][] local53 = method874(0.4F); @@ -84,8 +84,8 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { @Override public final void unbind() { if (this.anInt4831 >= 0) { - @Pc(5) GL2 local5 = GlRenderer.gl; - local5.glCallList(this.anInt4831 + 1); + @Pc(5) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt4831 + 1); } } @@ -101,66 +101,66 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(5) GL2 local5 = GlRenderer.gl; - local5.glCallList(this.anInt4831); - local5.glActiveTexture(GL2.GL_TEXTURE1); - local5.glMatrixMode(GL2.GL_TEXTURE); - local5.glTranslatef((float) MaterialManager.anInt406, (float) MaterialManager.anInt4675, (float) MaterialManager.anInt5158); - local5.glRotatef(-((float) MaterialManager.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); - local5.glRotatef(-((float) MaterialManager.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); - local5.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); - local5.glMatrixMode(GL2.GL_MODELVIEW); + @Pc(5) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt4831); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glMatrixMode(GL2.GL_TEXTURE); + gl.glTranslatef((float) MaterialManager.anInt406, (float) MaterialManager.anInt4675, (float) MaterialManager.anInt5158); + gl.glRotatef(-((float) MaterialManager.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); + gl.glRotatef(-((float) MaterialManager.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); + gl.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); + gl.glMatrixMode(GL2.GL_MODELVIEW); if (!MaterialManager.allows3DTextureMapping) { - local5.glBindTexture(GL2.GL_TEXTURE_2D, MaterialManager.anIntArray341[(int) ((float) (GlRenderer.anInt5323 * 64) * 0.005F) % 64]); + gl.glBindTexture(GL2.GL_TEXTURE_2D, MaterialManager.anIntArray341[(int) ((float) (GlRenderer.anInt5323 * 64) * 0.005F) % 64]); } - local5.glActiveTexture(GL2.GL_TEXTURE0); + gl.glActiveTexture(GL2.GL_TEXTURE0); if (this.anInt4829 == GlRenderer.anInt5323) { return; } @Pc(85) int local85 = (GlRenderer.anInt5323 & 0xFF) * 256; for (@Pc(87) int local87 = 0; local87 < 64; local87++) { this.aFloatBuffer1.position(local85); - local5.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, local87, this.aFloatBuffer1); + gl.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, local87, this.aFloatBuffer1); local85 += 4; } if (MaterialManager.allows3DTextureMapping) { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, (float) GlRenderer.anInt5323 * 0.005F, 0.0F, 0.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, (float) GlRenderer.anInt5323 * 0.005F, 0.0F, 0.0F, 1.0F); } else { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, 0.0F, 0.0F, 0.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, 0.0F, 0.0F, 0.0F, 1.0F); } this.anInt4829 = GlRenderer.anInt5323; } @OriginalMember(owner = "client!rd", name = "e", descriptor = "()V") private void method3719() { - @Pc(1) GL2 local1 = GlRenderer.gl; - this.anInt4831 = local1.glGenLists(2); - local1.glNewList(this.anInt4831, GL2.GL_COMPILE); - local1.glActiveTexture(GL2.GL_TEXTURE1); + @Pc(1) GL2 gl = GlRenderer.gl; + this.anInt4831 = gl.glGenLists(2); + gl.glNewList(this.anInt4831, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); if (MaterialManager.allows3DTextureMapping) { - local1.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); + gl.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); } - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_ADD); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); - local1.glActiveTexture(GL2.GL_TEXTURE0); - local1.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, this.anInt4830); - local1.glEnable(GL2.GL_VERTEX_PROGRAM_ARB); - local1.glEndList(); - local1.glNewList(this.anInt4831 + 1, GL2.GL_COMPILE); - local1.glActiveTexture(GL2.GL_TEXTURE1); - local1.glMatrixMode(GL2.GL_TEXTURE); - local1.glLoadIdentity(); - local1.glMatrixMode(GL2.GL_MODELVIEW); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); - 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.glDisable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); - local1.glActiveTexture(GL2.GL_TEXTURE0); - local1.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, 0); - local1.glDisable(GL2.GL_VERTEX_PROGRAM_ARB); - local1.glDisable(GL2.GL_FRAGMENT_PROGRAM_ARB); - local1.glEndList(); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_ADD); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, this.anInt4830); + gl.glEnable(GL2.GL_VERTEX_PROGRAM_ARB); + gl.glEndList(); + gl.glNewList(this.anInt4831 + 1, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glMatrixMode(GL2.GL_TEXTURE); + gl.glLoadIdentity(); + gl.glMatrixMode(GL2.GL_MODELVIEW); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); + gl.glDisable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, 0); + gl.glDisable(GL2.GL_VERTEX_PROGRAM_ARB); + gl.glDisable(GL2.GL_FRAGMENT_PROGRAM_ARB); + gl.glEndList(); } @OriginalMember(owner = "client!rd", name = "f", descriptor = "()V") @@ -168,11 +168,11 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(4) GL2 local4 = GlRenderer.gl; + @Pc(4) GL2 gl = GlRenderer.gl; @Pc(7) int[] local7 = new int[1]; - local4.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, this.anInt4830); - local4.glProgramStringARB(GL2.GL_VERTEX_PROGRAM_ARB, GL2.GL_PROGRAM_FORMAT_ASCII_ARB, "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND".length(), "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND"); - local4.glGetIntegerv(GL2.GL_PROGRAM_ERROR_POSITION_ARB, local7, 0); + gl.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, this.anInt4830); + gl.glProgramStringARB(GL2.GL_VERTEX_PROGRAM_ARB, GL2.GL_PROGRAM_FORMAT_ASCII_ARB, "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND".length(), "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND"); + gl.glGetIntegerv(GL2.GL_PROGRAM_ERROR_POSITION_ARB, local7, 0); if (local7[0] != -1) { return; } @@ -184,27 +184,27 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(5) GL2 local5 = GlRenderer.gl; - local5.glActiveTexture(GL2.GL_TEXTURE1); + @Pc(5) GL2 gl = GlRenderer.gl; + gl.glActiveTexture(GL2.GL_TEXTURE1); if ((arg0 & 0x80) == 0) { - local5.glEnable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); + gl.glEnable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); } else { - local5.glDisable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); + gl.glDisable(MaterialManager.allows3DTextureMapping ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); } - local5.glActiveTexture(GL2.GL_TEXTURE0); + gl.glActiveTexture(GL2.GL_TEXTURE0); if ((arg0 & 0x40) == 0) { - local5.glGetFloatv(GL2.GL_LIGHT_MODEL_AMBIENT, aFloatArray24, 0); - local5.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, aFloatArray24, 0); + gl.glGetFloatv(GL2.GL_LIGHT_MODEL_AMBIENT, aFloatArray24, 0); + gl.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, aFloatArray24, 0); } else { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, 1.0F, 1.0F, 1.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 66, 1.0F, 1.0F, 1.0F, 1.0F); } @Pc(58) int local58 = arg0 & 0x3; if (local58 == 2) { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.05F, 1.0F, 1.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.05F, 1.0F, 1.0F, 1.0F); } else if (local58 == 3) { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.1F, 1.0F, 1.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.1F, 1.0F, 1.0F, 1.0F); } else { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.025F, 1.0F, 1.0F, 1.0F); + gl.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 64, 0.025F, 1.0F, 1.0F, 1.0F); } } } diff --git a/client/src/main/java/rt4/MaterialManager.java b/client/src/main/java/rt4/MaterialManager.java index d3d9d5b..877cba3 100644 --- a/client/src/main/java/rt4/MaterialManager.java +++ b/client/src/main/java/rt4/MaterialManager.java @@ -132,31 +132,31 @@ public class MaterialManager { @OriginalMember(owner = "client!lm", name = "b", descriptor = "()V") public static void method2808() { - @Pc(4) GL2 local4; + @Pc(4) GL2 gl; @Pc(11) int[] local11; if (texture3D != -1) { - local4 = GlRenderer.gl; + gl = GlRenderer.gl; local11 = new int[]{texture3D}; - local4.glDeleteTextures(1, local11, 0); + gl.glDeleteTextures(1, local11, 0); texture3D = -1; GlCleaner.onCardTexture -= textureBuffer.limit() * 2; } if (anIntArray341 != null) { - local4 = GlRenderer.gl; - local4.glDeleteTextures(64, anIntArray341, 0); + gl = GlRenderer.gl; + gl.glDeleteTextures(64, anIntArray341, 0); anIntArray341 = null; GlCleaner.onCardTexture -= textureBuffer.limit() * 2; } if (waterfallTextureId != -1) { - local4 = GlRenderer.gl; + gl = GlRenderer.gl; local11 = new int[]{waterfallTextureId}; - local4.glDeleteTextures(1, local11, 0); + gl.glDeleteTextures(1, local11, 0); waterfallTextureId = -1; GlCleaner.onCardTexture -= aByteBuffer6.limit() * 2; } if (waterfallTextures != null) { - local4 = GlRenderer.gl; - local4.glDeleteTextures(64, waterfallTextures, 0); + gl = GlRenderer.gl; + gl.glDeleteTextures(64, waterfallTextures, 0); waterfallTextures = null; GlCleaner.onCardTexture -= aByteBuffer6.limit() * 2; } @@ -172,26 +172,26 @@ public class MaterialManager { @OriginalMember(owner = "client!lm", name = "e", descriptor = "()V") private static void method2811() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; if (allows3DTextureMapping) { @Pc(6) int[] local6 = new int[1]; - local1.glGenTextures(1, local6, 0); - local1.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]); + gl.glGenTextures(1, local6, 0); + gl.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]); textureBuffer.position(0); - local1.glTexImage3D(GL2.GL_TEXTURE_3D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, textureBuffer); - 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); + gl.glTexImage3D(GL2.GL_TEXTURE_3D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, textureBuffer); + gl.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); texture3D = local6[0]; GlCleaner.onCardTexture += textureBuffer.limit() * 2; } else { anIntArray341 = new int[64]; - local1.glGenTextures(64, anIntArray341, 0); + gl.glGenTextures(64, anIntArray341, 0); for (@Pc(65) int local65 = 0; local65 < 64; local65++) { GlRenderer.setTextureId(anIntArray341[local65]); textureBuffer.position(local65 * 64 * 64 * 2); - local1.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, textureBuffer); - 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); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, textureBuffer); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); } GlCleaner.onCardTexture += textureBuffer.limit() * 2; } @@ -199,27 +199,27 @@ public class MaterialManager { @OriginalMember(owner = "client!lm", name = "f", descriptor = "()V") private static void method2812() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; if (allows3DTextureMapping) { @Pc(6) int[] local6 = new int[1]; - local1.glGenTextures(1, local6, 0); - local1.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]); + gl.glGenTextures(1, local6, 0); + gl.glBindTexture(GL2.GL_TEXTURE_3D, local6[0]); aByteBuffer6.position(0); - 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); + gl.glTexImage3D(GL2.GL_TEXTURE_3D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer6); + gl.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_3D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); waterfallTextureId = local6[0]; GlCleaner.onCardTexture += aByteBuffer6.limit() * 2; return; } waterfallTextures = new int[64]; - local1.glGenTextures(64, waterfallTextures, 0); + gl.glGenTextures(64, waterfallTextures, 0); for (@Pc(65) int local65 = 0; local65 < 64; local65++) { GlRenderer.setTextureId(waterfallTextures[local65]); aByteBuffer6.position(local65 * 64 * 64 * 2); - 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); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer6); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); } GlCleaner.onCardTexture += aByteBuffer6.limit() * 2; } diff --git a/client/src/main/java/rt4/Shadow.java b/client/src/main/java/rt4/Shadow.java index b2dad71..f492ae3 100644 --- a/client/src/main/java/rt4/Shadow.java +++ b/client/src/main/java/rt4/Shadow.java @@ -37,16 +37,16 @@ public final class Shadow { @OriginalMember(owner = "client!wm", name = "", descriptor = "()V") public Shadow() { - @Pc(9) GL2 local9 = GlRenderer.gl; + @Pc(9) GL2 gl = GlRenderer.gl; @Pc(12) int[] local12 = new int[1]; - local9.glGenTextures(1, local12, 0); + gl.glGenTextures(1, local12, 0); this.anInt5901 = local12[0]; GlCleaner.onCardTexture += 16384; GlRenderer.setTextureId(this.anInt5901); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); - local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP_TO_EDGE); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); + gl.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP_TO_EDGE); } @OriginalMember(owner = "client!wm", name = "a", descriptor = "([[III)V") @@ -157,37 +157,37 @@ public final class Shadow { } local19 += local5 - 128; } - @Pc(145) GL2 local145 = GlRenderer.gl; + @Pc(145) GL2 gl = GlRenderer.gl; @Pc(148) ByteBuffer local148 = ByteBuffer.wrap(pixels); local148.limit(16384); GlRenderer.setTextureId(this.anInt5901); - local145.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_ALPHA, 128, 128, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, local148); + gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_ALPHA, 128, 128, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, local148); return true; } @OriginalMember(owner = "client!wm", name = "b", descriptor = "()V") public final void method4679() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; GlRenderer.setTextureId(this.anInt5901); if (this.aClass155_7 == null) { if (GlRenderer.arbVboSupported) { - local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } - local1.glInterleavedArrays(GL2.GL_T2F_V3F, 20, this.aByteBuffer12); + gl.glInterleavedArrays(GL2.GL_T2F_V3F, 20, this.aByteBuffer12); GlRenderer.normalArrayEnabled = false; } else { this.aClass155_7.bindArray(); - local1.glInterleavedArrays(GL2.GL_T2F_V3F, 20, 0L); + gl.glInterleavedArrays(GL2.GL_T2F_V3F, 20, 0L); GlRenderer.normalArrayEnabled = false; } if (this.aClass155_6 == null) { if (GlRenderer.arbVboSupported) { - local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); + gl.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } - local1.glDrawElements(GL2.GL_TRIANGLES, 384, GL2.GL_UNSIGNED_INT, this.aByteBuffer11); + gl.glDrawElements(GL2.GL_TRIANGLES, 384, GL2.GL_UNSIGNED_INT, this.aByteBuffer11); } else { this.aClass155_6.bindElementArray(); - local1.glDrawElements(GL2.GL_TRIANGLES, 384, GL2.GL_UNSIGNED_INT, 0L); + gl.glDrawElements(GL2.GL_TRIANGLES, 384, GL2.GL_UNSIGNED_INT, 0L); } } } diff --git a/client/src/main/java/rt4/ShadowManager.java b/client/src/main/java/rt4/ShadowManager.java index 6bb8862..141bdaf 100644 --- a/client/src/main/java/rt4/ShadowManager.java +++ b/client/src/main/java/rt4/ShadowManager.java @@ -120,13 +120,13 @@ public final class ShadowManager { @OriginalMember(owner = "client!tj", name = "a", descriptor = "(IIII[[Z[[I)V") public static void method4198(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean[][] arg4, @OriginalArg(5) int[][] arg5) { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; GlRenderer.setTextureCombineRgbMode(1); GlRenderer.setTextureCombineAlphaMode(1); GlRenderer.resetTextureMatrix(); GlRenderer.setLightingEnabled(false); MaterialManager.setMaterial(0, 0); - local1.glDepthMask(false); + gl.glDepthMask(false); for (@Pc(17) int local17 = 0; local17 < anInt5346; local17++) { label52: for (@Pc(22) int local22 = 0; local22 < anInt5345; local22++) { @@ -139,10 +139,10 @@ public final class ShadowManager { local89.method4677(shadowMapImage, local17, local22); local89.outputToSprite = false; } - local1.glPushMatrix(); - local1.glTranslatef((float) (local17 * 1024), 0.0F, (float) (local22 * 1024)); + gl.glPushMatrix(); + gl.glTranslatef((float) (local17 * 1024), 0.0F, (float) (local22 * 1024)); local89.method4679(); - local1.glPopMatrix(); + gl.glPopMatrix(); continue label52; } } @@ -150,8 +150,8 @@ public final class ShadowManager { } } } - local1.glEnableClientState(GL2.GL_COLOR_ARRAY); - local1.glDepthMask(true); + gl.glEnableClientState(GL2.GL_COLOR_ARRAY); + gl.glDepthMask(true); GlRenderer.restoreLighting(); } diff --git a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java index 1373e6c..40a24f8 100644 --- a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java @@ -33,13 +33,13 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { while (local22 < 8) { local20[local22++] = (byte) (local22 * 159 / 8 + 96); } - @Pc(40) GL2 local40 = GlRenderer.gl; - local40.glGenTextures(1, local17, 0); - local40.glBindTexture(GL2.GL_TEXTURE_1D, local17[0]); - local40.glTexImage1D(GL2.GL_TEXTURE_1D, 0, GL2.GL_ALPHA, 8, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local20)); - local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); - local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); - local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); + @Pc(40) GL2 gl = GlRenderer.gl; + gl.glGenTextures(1, local17, 0); + gl.glBindTexture(GL2.GL_TEXTURE_1D, local17[0]); + gl.glTexImage1D(GL2.GL_TEXTURE_1D, 0, GL2.GL_ALPHA, 8, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local20)); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); this.anInt5805 = local17[0]; aBoolean308 = GlRenderer.maxTextureUnits > 2 && GlRenderer.extTexture3dSupported; this.method4606(); @@ -53,18 +53,18 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "f", descriptor = "()V") public static void method4608() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glClientActiveTexture(method4607()); - local1.glDisableClientState(GL2.GL_TEXTURE_COORD_ARRAY); - local1.glClientActiveTexture(GL2.GL_TEXTURE0); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glClientActiveTexture(method4607()); + gl.glDisableClientState(GL2.GL_TEXTURE_COORD_ARRAY); + gl.glClientActiveTexture(GL2.GL_TEXTURE0); } @OriginalMember(owner = "client!wg", name = "g", descriptor = "()V") public static void method4609() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glClientActiveTexture(method4607()); - local1.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); - local1.glClientActiveTexture(GL2.GL_TEXTURE0); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glClientActiveTexture(method4607()); + gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); + gl.glClientActiveTexture(GL2.GL_TEXTURE0); } @OriginalMember(owner = "client!mf", name = "a", descriptor = "()V") @@ -96,72 +96,72 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "d", descriptor = "()V") private void method4606() { - @Pc(1) GL2 local1 = GlRenderer.gl; - this.anInt5806 = local1.glGenLists(2); - local1.glNewList(this.anInt5806, GL2.GL_COMPILE); - local1.glActiveTexture(GL2.GL_TEXTURE1); + @Pc(1) GL2 gl = GlRenderer.gl; + this.anInt5806 = gl.glGenLists(2); + gl.glNewList(this.anInt5806, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); if (aBoolean308) { - local1.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_ADD); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); - local1.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); - local1.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); - local1.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_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_S); - local1.glEnable(GL2.GL_TEXTURE_GEN_T); - local1.glEnable(GL2.GL_TEXTURE_GEN_R); - local1.glEnable(GL2.GL_TEXTURE_GEN_Q); - local1.glEnable(GL2.GL_TEXTURE_3D); - local1.glActiveTexture(GL2.GL_TEXTURE2); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_COMBINE); + gl.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_ADD); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); + gl.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glTexGeni(GL2.GL_Q, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glTexGenfv(GL2.GL_Q, GL2.GL_OBJECT_PLANE, new float[]{0.0F, 0.0F, 0.0F, 1.0F}, 0); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glEnable(GL2.GL_TEXTURE_GEN_T); + gl.glEnable(GL2.GL_TEXTURE_GEN_R); + gl.glEnable(GL2.GL_TEXTURE_GEN_Q); + gl.glEnable(GL2.GL_TEXTURE_3D); + gl.glActiveTexture(GL2.GL_TEXTURE2); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_COMBINE); } - local1.glBindTexture(GL2.GL_TEXTURE_1D, this.anInt5805); - 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_REPLACE); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); - local1.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); - local1.glEnable(GL2.GL_TEXTURE_1D); - local1.glEnable(GL2.GL_TEXTURE_GEN_S); - local1.glActiveTexture(GL2.GL_TEXTURE0); - local1.glEndList(); - local1.glNewList(this.anInt5806 + 1, GL2.GL_COMPILE); - local1.glActiveTexture(GL2.GL_TEXTURE1); + gl.glBindTexture(GL2.GL_TEXTURE_1D, this.anInt5805); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_INTERPOLATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_TEXTURE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PREVIOUS); + gl.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glEnable(GL2.GL_TEXTURE_1D); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glEndList(); + gl.glNewList(this.anInt5806 + 1, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); if (aBoolean308) { - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); - 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.glDisable(GL2.GL_TEXTURE_GEN_S); - local1.glDisable(GL2.GL_TEXTURE_GEN_T); - local1.glDisable(GL2.GL_TEXTURE_GEN_R); - local1.glDisable(GL2.GL_TEXTURE_GEN_Q); - local1.glDisable(GL2.GL_TEXTURE_3D); - local1.glActiveTexture(GL2.GL_TEXTURE2); - local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glDisable(GL2.GL_TEXTURE_GEN_T); + gl.glDisable(GL2.GL_TEXTURE_GEN_R); + gl.glDisable(GL2.GL_TEXTURE_GEN_Q); + gl.glDisable(GL2.GL_TEXTURE_3D); + gl.glActiveTexture(GL2.GL_TEXTURE2); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_MODULATE); } - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[]{0.0F, 1.0F, 0.0F, 1.0F}, 0); - 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.glDisable(GL2.GL_TEXTURE_1D); - local1.glDisable(GL2.GL_TEXTURE_GEN_S); - local1.glActiveTexture(GL2.GL_TEXTURE0); - local1.glEndList(); + gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[]{0.0F, 1.0F, 0.0F, 1.0F}, 0); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_CONSTANT); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); + gl.glDisable(GL2.GL_TEXTURE_1D); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glEndList(); } @OriginalMember(owner = "client!wg", name = "b", descriptor = "()V") @Override public final void bind() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glCallList(this.anInt5806); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt5806); } @OriginalMember(owner = "client!wg", name = "c", descriptor = "()I") @@ -173,55 +173,55 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "a", descriptor = "()V") @Override public final void unbind() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glCallList(this.anInt5806 + 1); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt5806 + 1); } @OriginalMember(owner = "client!wg", name = "a", descriptor = "(I)V") @Override public final void setArgument(@OriginalArg(0) int arg0) { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glActiveTexture(GL2.GL_TEXTURE1); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glActiveTexture(GL2.GL_TEXTURE1); if (aBoolean308 || arg0 >= 0) { - local1.glPushMatrix(); - local1.glLoadIdentity(); - local1.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local1.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); + gl.glPushMatrix(); + gl.glLoadIdentity(); + gl.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + gl.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + gl.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + gl.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); if (aBoolean308) { this.aFloatArray29[0] = 0.001F; this.aFloatArray29[1] = 9.0E-4F; this.aFloatArray29[2] = 0.0F; this.aFloatArray29[3] = 0.0F; - local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); + gl.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); this.aFloatArray29[0] = 0.0F; this.aFloatArray29[1] = 9.0E-4F; this.aFloatArray29[2] = 0.001F; this.aFloatArray29[3] = 0.0F; - local1.glTexGenfv(GL2.GL_T, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); + gl.glTexGenfv(GL2.GL_T, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); this.aFloatArray29[0] = 0.0F; this.aFloatArray29[1] = 0.0F; this.aFloatArray29[2] = 0.0F; this.aFloatArray29[3] = (float) GlRenderer.anInt5323 * 0.005F; - local1.glTexGenfv(GL2.GL_R, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); - local1.glActiveTexture(GL2.GL_TEXTURE2); + gl.glTexGenfv(GL2.GL_R, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); + gl.glActiveTexture(GL2.GL_TEXTURE2); } - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, WaterMaterialRenderer.method2422(), 0); + gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, WaterMaterialRenderer.method2422(), 0); if (arg0 >= 0) { this.aFloatArray29[0] = 0.0F; this.aFloatArray29[1] = 1.0F / (float) anInt3241; this.aFloatArray29[2] = 0.0F; this.aFloatArray29[3] = (float) arg0 * 1.0F / (float) anInt3241; - local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); - local1.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); } else { - local1.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); } - local1.glPopMatrix(); + gl.glPopMatrix(); } else { - local1.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); } - local1.glActiveTexture(GL2.GL_TEXTURE0); + gl.glActiveTexture(GL2.GL_TEXTURE0); } } diff --git a/client/src/main/java/rt4/WaterMaterialRenderer.java b/client/src/main/java/rt4/WaterMaterialRenderer.java index 6082fd6..b0cc2ae 100644 --- a/client/src/main/java/rt4/WaterMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterMaterialRenderer.java @@ -61,78 +61,78 @@ 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) GL2 local12 = GlRenderer.gl; + @Pc(12) GL2 gl = GlRenderer.gl; @Pc(15) int[] local15 = new int[1]; - local12.glGenTextures(1, local15, 0); - 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); + gl.glGenTextures(1, local15, 0); + gl.glBindTexture(GL2.GL_TEXTURE_1D, local15[0]); + gl.glTexImage1D(GL2.GL_TEXTURE_1D, 0, GL2.GL_ALPHA, 2, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local2)); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); + gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); + gl.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) GL2 local1 = GlRenderer.gl; - this.anInt4440 = local1.glGenLists(2); - 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); + @Pc(1) GL2 gl = GlRenderer.gl; + this.anInt4440 = gl.glGenLists(2); + gl.glNewList(this.anInt4440, GL2.GL_COMPILE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC1_RGB, GL2.GL_CONSTANT); + gl.glTexEnvf(GL2.GL_TEXTURE_ENV, GL2.GL_RGB_SCALE, 2.0F); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2GL3.GL_SRC1_ALPHA, GL2.GL_CONSTANT); + gl.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glTexGenfv(GL2.GL_S, GL2.GL_OBJECT_PLANE, new float[]{9.765625E-4F, 0.0F, 0.0F, 0.0F}, 0); + gl.glTexGenfv(GL2.GL_T, GL2.GL_OBJECT_PLANE, new float[]{0.0F, 0.0F, 9.765625E-4F, 0.0F}, 0); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glEnable(GL2.GL_TEXTURE_GEN_T); if (MaterialManager.allows3DTextureMapping) { - local1.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); - 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); + gl.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.texture3D); + gl.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glTexGeni(GL2.GL_Q, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glTexGenfv(GL2.GL_Q, GL2.GL_OBJECT_PLANE, new float[]{0.0F, 0.0F, 0.0F, 1.0F}, 0); + gl.glEnable(GL2.GL_TEXTURE_GEN_R); + gl.glEnable(GL2.GL_TEXTURE_GEN_Q); + gl.glEnable(GL2.GL_TEXTURE_3D); } - 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, 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); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glEnable(GL2.GL_TEXTURE_1D); + gl.glBindTexture(GL2.GL_TEXTURE_1D, this.anInt4441); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_INTERPOLATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_TEXTURE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_INTERPOLATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_CONSTANT); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_ALPHA, GL2.GL_TEXTURE); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glPushMatrix(); + gl.glLoadIdentity(); + gl.glEndList(); + gl.glNewList(this.anInt4440 + 1, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glDisable(GL2.GL_TEXTURE_1D); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_RGB, GL2.GL_CONSTANT); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC2_ALPHA, GL2.GL_CONSTANT); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC1_RGB, GL2.GL_PREVIOUS); + gl.glTexEnvf(GL2.GL_TEXTURE_ENV, GL2.GL_RGB_SCALE, 1.0F); + gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2GL3.GL_SRC1_ALPHA, GL2.GL_PREVIOUS); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glDisable(GL2.GL_TEXTURE_GEN_T); if (MaterialManager.allows3DTextureMapping) { - local1.glDisable(GL2.GL_TEXTURE_GEN_R); - local1.glDisable(GL2.GL_TEXTURE_GEN_Q); - local1.glDisable(GL2.GL_TEXTURE_3D); + gl.glDisable(GL2.GL_TEXTURE_GEN_R); + gl.glDisable(GL2.GL_TEXTURE_GEN_Q); + gl.glDisable(GL2.GL_TEXTURE_3D); } - local1.glEndList(); + gl.glEndList(); } @OriginalMember(owner = "client!pd", name = "a", descriptor = "()V") @@ -144,10 +144,10 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!pd", name = "a", descriptor = "(I)V") @Override public final void setArgument(@OriginalArg(0) int arg0) { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glActiveTexture(GL2.GL_TEXTURE1); - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray2, 0); - local1.glActiveTexture(GL2.GL_TEXTURE0); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray2, 0); + gl.glActiveTexture(GL2.GL_TEXTURE0); if ((arg0 & 0x1) == 1) { if (!MaterialManager.allows3DTextureMapping) { GlRenderer.setTextureId(MaterialManager.anIntArray341[GlRenderer.anInt5323 * 64 / 100 % 64]); @@ -156,7 +156,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { this.aFloatArray23[1] = 0.0F; this.aFloatArray23[2] = 0.0F; this.aFloatArray23[3] = (float) GlRenderer.anInt5323 * 0.005F; - local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); + gl.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); this.anInt4442 = GlRenderer.anInt5323; } } else if (MaterialManager.allows3DTextureMapping) { @@ -164,7 +164,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { this.aFloatArray23[1] = 0.0F; this.aFloatArray23[2] = 0.0F; this.aFloatArray23[3] = 0.0F; - local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); + gl.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); } else { GlRenderer.setTextureId(MaterialManager.anIntArray341[0]); } @@ -173,11 +173,11 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!pd", name = "b", descriptor = "()V") @Override public final void bind() { - @Pc(1) GL2 local1 = GlRenderer.gl; + @Pc(1) GL2 gl = GlRenderer.gl; GlRenderer.setTextureCombineRgbMode(2); GlRenderer.setTextureCombineAlphaMode(2); GlRenderer.resetTextureMatrix(); - local1.glCallList(this.anInt4440); + gl.glCallList(this.anInt4440); @Pc(12) float local12 = 2662.4001F; local12 += (float) (MaterialManager.anInt5559 - 128) * 0.5F; float max = (float) GlobalConfig.VIEW_DISTANCE - GlobalConfig.VIEW_FADE_DISTANCE; @@ -188,10 +188,10 @@ public final class WaterMaterialRenderer implements MaterialRenderer { this.aFloatArray23[1] = 0.0F; this.aFloatArray23[2] = 1.0F / (local12 - max); this.aFloatArray23[3] = local12 / (local12 - max); - local1.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray23, 0); - local1.glPopMatrix(); - local1.glActiveTexture(GL2.GL_TEXTURE0); - local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray22, 0); + gl.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray23, 0); + gl.glPopMatrix(); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, aFloatArray22, 0); } @OriginalMember(owner = "client!pd", name = "c", descriptor = "()I") diff --git a/client/src/main/java/rt4/WaterfallMaterialRenderer.java b/client/src/main/java/rt4/WaterfallMaterialRenderer.java index d72000a..215450b 100644 --- a/client/src/main/java/rt4/WaterfallMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterfallMaterialRenderer.java @@ -29,7 +29,7 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ob", name = "a", descriptor = "(I)V") @Override public final void setArgument(@OriginalArg(0) int arg0) { - @Pc(7) GL2 local7 = GlRenderer.gl; + @Pc(7) GL2 gl = GlRenderer.gl; @Pc(18) float local18 = (float) ((arg0 >> 3 & 0x3) + 1) * 0.01F; @Pc(27) float local27 = -0.01F * (float) ((arg0 & 0x3) + 1); @Pc(36) float local36 = (arg0 & 0x40) == 0 ? 4.8828125E-4F : 9.765625E-4F; @@ -45,79 +45,79 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { this.aFloatArray21[3] = 0.0F; this.aFloatArray21[0] = 0.0F; } - local7.glActiveTexture(GL2.GL_TEXTURE1); - local7.glMatrixMode(GL2.GL_MODELVIEW); - local7.glPushMatrix(); - local7.glLoadIdentity(); - local7.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local7.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); - local7.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); + gl.glActiveTexture(GL2.GL_TEXTURE1); + gl.glMatrixMode(GL2.GL_MODELVIEW); + gl.glPushMatrix(); + gl.glLoadIdentity(); + gl.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + gl.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + gl.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + gl.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); + gl.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); this.aFloatArray21[3] = local27 * (float) GlRenderer.anInt5323; this.aFloatArray21[0] = 0.0F; this.aFloatArray21[2] = 0.0F; this.aFloatArray21[1] = local36; - local7.glTexGenfv(GL2.GL_T, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); - local7.glPopMatrix(); + gl.glTexGenfv(GL2.GL_T, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); + gl.glPopMatrix(); if (MaterialManager.allows3DTextureMapping) { this.aFloatArray21[3] = (float) GlRenderer.anInt5323 * local18; this.aFloatArray21[1] = 0.0F; this.aFloatArray21[0] = 0.0F; this.aFloatArray21[2] = 0.0F; - local7.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray21, 0); + gl.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray21, 0); } else { @Pc(189) int local189 = (int) ((float) GlRenderer.anInt5323 * local18 * 64.0F); - local7.glBindTexture(GL2.GL_TEXTURE_2D, MaterialManager.waterfallTextures[local189 % 64]); + gl.glBindTexture(GL2.GL_TEXTURE_2D, MaterialManager.waterfallTextures[local189 % 64]); } - local7.glActiveTexture(GL2.GL_TEXTURE0); + gl.glActiveTexture(GL2.GL_TEXTURE0); } @OriginalMember(owner = "client!ob", name = "a", descriptor = "()V") @Override public final void unbind() { - @Pc(1) GL2 local1 = GlRenderer.gl; - local1.glCallList(this.anInt4236 + 1); + @Pc(1) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt4236 + 1); } @OriginalMember(owner = "client!ob", name = "b", descriptor = "()V") @Override public final void bind() { - @Pc(5) GL2 local5 = GlRenderer.gl; - local5.glCallList(this.anInt4236); + @Pc(5) GL2 gl = GlRenderer.gl; + gl.glCallList(this.anInt4236); } @OriginalMember(owner = "client!ob", name = "b", descriptor = "(I)V") private void method3307() { - @Pc(3) GL2 local3 = GlRenderer.gl; - this.anInt4236 = local3.glGenLists(2); - local3.glNewList(this.anInt4236, GL2.GL_COMPILE); - local3.glActiveTexture(GL2.GL_TEXTURE1); + @Pc(3) GL2 gl = GlRenderer.gl; + this.anInt4236 = gl.glGenLists(2); + gl.glNewList(this.anInt4236, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); if (MaterialManager.allows3DTextureMapping) { - local3.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.waterfallTextureId); - local3.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); - local3.glEnable(GL2.GL_TEXTURE_GEN_R); - local3.glEnable(GL2.GL_TEXTURE_3D); + gl.glBindTexture(GL2.GL_TEXTURE_3D, MaterialManager.waterfallTextureId); + gl.glTexGeni(GL2.GL_R, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_OBJECT_LINEAR); + gl.glEnable(GL2.GL_TEXTURE_GEN_R); + gl.glEnable(GL2.GL_TEXTURE_3D); } else { - local3.glEnable(GL2.GL_TEXTURE_2D); + gl.glEnable(GL2.GL_TEXTURE_2D); } - local3.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); - local3.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); - local3.glEnable(GL2.GL_TEXTURE_GEN_S); - local3.glEnable(GL2.GL_TEXTURE_GEN_T); - local3.glActiveTexture(GL2.GL_TEXTURE0); - local3.glEndList(); - local3.glNewList(this.anInt4236 + 1, GL2.GL_COMPILE); - local3.glActiveTexture(GL2.GL_TEXTURE1); + gl.glTexGeni(GL2.GL_S, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glTexGeni(GL2.GL_T, GL2.GL_TEXTURE_GEN_MODE, GL2.GL_EYE_LINEAR); + gl.glEnable(GL2.GL_TEXTURE_GEN_S); + gl.glEnable(GL2.GL_TEXTURE_GEN_T); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glEndList(); + gl.glNewList(this.anInt4236 + 1, GL2.GL_COMPILE); + gl.glActiveTexture(GL2.GL_TEXTURE1); if (MaterialManager.allows3DTextureMapping) { - local3.glDisable(GL2.GL_TEXTURE_3D); - local3.glDisable(GL2.GL_TEXTURE_GEN_R); + gl.glDisable(GL2.GL_TEXTURE_3D); + gl.glDisable(GL2.GL_TEXTURE_GEN_R); } else { - local3.glDisable(GL2.GL_TEXTURE_2D); + gl.glDisable(GL2.GL_TEXTURE_2D); } - local3.glDisable(GL2.GL_TEXTURE_GEN_S); - local3.glDisable(GL2.GL_TEXTURE_GEN_T); - local3.glActiveTexture(GL2.GL_TEXTURE0); - local3.glEndList(); + gl.glDisable(GL2.GL_TEXTURE_GEN_S); + gl.glDisable(GL2.GL_TEXTURE_GEN_T); + gl.glActiveTexture(GL2.GL_TEXTURE0); + gl.glEndList(); } }