From fe57a2909ade516fb604d8a9d450f4420e2bc54c Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 19 Mar 2025 23:49:49 +0100 Subject: [PATCH] more OpenGL constants --- java/src/game/gui/Gui.java | 8 ++-- java/src/game/gui/element/GuiList.java | 16 +++---- java/src/game/renderer/BlockRenderer.java | 2 +- java/src/game/renderer/Drawing.java | 14 +++---- java/src/game/renderer/EntityRenderer.java | 6 +-- java/src/game/renderer/ItemRenderer.java | 6 +-- java/src/game/renderer/RenderGlobal.java | 42 +++++++++---------- java/src/game/renderer/VertexBuffer.java | 6 +-- .../game/renderer/VertexFormatElement.java | 20 +++++---- java/src/game/renderer/chunk/RenderChunk.java | 2 +- java/src/game/renderer/entity/Render.java | 8 ++-- .../src/game/renderer/entity/RenderArrow.java | 6 +-- .../game/renderer/entity/RenderBullet.java | 6 +-- .../renderer/entity/RenderFallingBlock.java | 2 +- .../game/renderer/entity/RenderFireball.java | 2 +- java/src/game/renderer/entity/RenderFish.java | 4 +- java/src/game/renderer/entity/RenderItem.java | 2 +- .../game/renderer/entity/RenderLightning.java | 2 +- .../game/renderer/entity/RenderLiving.java | 5 ++- .../game/renderer/entity/RenderManager.java | 3 +- .../src/game/renderer/entity/RenderXpOrb.java | 2 +- .../renderer/entity/RendererLivingEntity.java | 2 +- .../renderer/layers/LayerEntityBreak.java | 2 +- .../src/game/renderer/model/TexturedQuad.java | 4 +- .../renderer/particle/EffectRenderer.java | 2 +- .../renderer/particle/EntityFootStepFX.java | 2 +- .../particle/EntityLargeExplodeFX.java | 6 ++- .../tileentity/TileEntityPistonRenderer.java | 2 +- 28 files changed, 96 insertions(+), 88 deletions(-) diff --git a/java/src/game/gui/Gui.java b/java/src/game/gui/Gui.java index a57231a..c3b612f 100644 --- a/java/src/game/gui/Gui.java +++ b/java/src/game/gui/Gui.java @@ -244,7 +244,7 @@ public abstract class Gui { // GlState.disableTexture2D(); // GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); // GlState.color(f, f1, f2, f3); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); // worldrenderer.pos((double)left, (double)bottom, 0.0D).endVertex(); // worldrenderer.pos((double)right, (double)bottom, 0.0D).endVertex(); // worldrenderer.pos((double)right, (double)top, 0.0D).endVertex(); @@ -259,7 +259,7 @@ public abstract class Gui { // float f = 0.00390625F; // float f1 = 0.00390625F; // RenderBuffer worldrenderer = Tessellator.getBuffer(); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // worldrenderer.pos((double)(x + 0), (double)(y + height), 0.0D).tex((double)((float)(textureX + 0) * f), (double)((float)(textureY + height) * f1)).endVertex(); // worldrenderer.pos((double)(x + width), (double)(y + height), 0.0D).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + height) * f1)).endVertex(); // worldrenderer.pos((double)(x + width), (double)(y + 0), 0.0D).tex((double)((float)(textureX + width) * f), (double)((float)(textureY + 0) * f1)).endVertex(); @@ -272,7 +272,7 @@ public abstract class Gui { // float f = 1.0F / tileWidth; // float f1 = 1.0F / tileHeight; // RenderBuffer worldrenderer = Tessellator.getBuffer(); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // worldrenderer.pos((double)x, (double)(y + height), 0.0D).tex((double)(u * f), (double)((v + (float)vHeight) * f1)).endVertex(); // worldrenderer.pos((double)(x + width), (double)(y + height), 0.0D).tex((double)((u + (float)uWidth) * f), (double)((v + (float)vHeight) * f1)).endVertex(); // worldrenderer.pos((double)(x + width), (double)y, 0.0D).tex((double)((u + (float)uWidth) * f), (double)(v * f1)).endVertex(); @@ -296,7 +296,7 @@ public abstract class Gui { // GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); // GlState.shadeModel(GL11.GL_SMOOTH); // RenderBuffer worldrenderer = Tessellator.getBuffer(); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); // worldrenderer.pos((double)right, (double)top, 0.0).color(f1, f2, f3, f).endVertex(); // worldrenderer.pos((double)left, (double)top, 0.0).color(f1, f2, f3, f).endVertex(); // worldrenderer.pos((double)left, (double)bottom, 0.0).color(f5, f6, f7, f4).endVertex(); diff --git a/java/src/game/gui/element/GuiList.java b/java/src/game/gui/element/GuiList.java index a120299..cd1ff3d 100755 --- a/java/src/game/gui/element/GuiList.java +++ b/java/src/game/gui/element/GuiList.java @@ -168,7 +168,7 @@ public abstract class GuiList extends Gui GlState.color(1.0F, 1.0F, 1.0F, 1.0F); float f = 32.0F; - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)this.left, (double)this.bottom, 0.0D).tex((double)((float)this.left / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex(); worldrenderer.pos((double)this.right, (double)this.bottom, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.bottom + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex(); worldrenderer.pos((double)this.right, (double)this.top, 0.0D).tex((double)((float)this.right / f), (double)((float)(this.top + (int)this.amountScrolled) / f)).color(32, 32, 32, 255).endVertex(); @@ -191,13 +191,13 @@ public abstract class GuiList extends Gui GlState.disableTexture2D(); int i1 = 4; - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)this.left, (double)(this.top + i1), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 0).endVertex(); worldrenderer.pos((double)this.right, (double)(this.top + i1), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 0).endVertex(); worldrenderer.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex(); Tessellator.draw(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)this.right, (double)(this.bottom - i1), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 0).endVertex(); @@ -217,19 +217,19 @@ public abstract class GuiList extends Gui l1 = this.top; } - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)i, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)j, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)j, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex(); worldrenderer.pos((double)i, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex(); Tessellator.draw(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)i, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex(); worldrenderer.pos((double)j, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex(); worldrenderer.pos((double)j, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex(); worldrenderer.pos((double)i, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex(); Tessellator.draw(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos((double)i, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex(); worldrenderer.pos((double)(j - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex(); worldrenderer.pos((double)(j - 1), (double)l1, 0.0D).tex(1.0D, 0.0D).color(192, 192, 192, 255).endVertex(); @@ -335,7 +335,7 @@ public abstract class GuiList extends Gui int x2 = this.left + this.width / 2 + this.getListWidth() / 2; GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableTexture2D(); - rb.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); rb.pos((double)x1, (double)(y1 + h + 2), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex(); rb.pos((double)x2, (double)(y1 + h + 2), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex(); rb.pos((double)x2, (double)(y1 - 2), 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex(); @@ -361,7 +361,7 @@ public abstract class GuiList extends Gui this.gm.getTextureManager().bindTexture(Gui.DIRT_BACKGROUND); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); float f = 32.0F; - rb.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); rb.pos((double)this.left, (double)endY, 0.0D).tex(0.0D, (double)((float)endY / 32.0F)).color(64, 64, 64, endAlpha).endVertex(); rb.pos((double)(this.left + this.width), (double)endY, 0.0D).tex((double)((float)this.width / 32.0F), (double)((float)endY / 32.0F)).color(64, 64, 64, endAlpha).endVertex(); rb.pos((double)(this.left + this.width), (double)startY, 0.0D).tex((double)((float)this.width / 32.0F), (double)((float)startY / 32.0F)).color(64, 64, 64, startAlpha).endVertex(); diff --git a/java/src/game/renderer/BlockRenderer.java b/java/src/game/renderer/BlockRenderer.java index 1cfb044..c5fd639 100755 --- a/java/src/game/renderer/BlockRenderer.java +++ b/java/src/game/renderer/BlockRenderer.java @@ -386,7 +386,7 @@ public class BlockRenderer for (BakedQuad bakedquad : listQuads) { - worldrenderer.begin(7, DefaultVertexFormats.ITEM); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); worldrenderer.addVertexData(bakedquad.getVertexData()); if (bakedquad.hasTintIndex()) diff --git a/java/src/game/renderer/Drawing.java b/java/src/game/renderer/Drawing.java index 83c1cef..f5ed13b 100644 --- a/java/src/game/renderer/Drawing.java +++ b/java/src/game/renderer/Drawing.java @@ -34,7 +34,7 @@ public abstract class Drawing { // float xs = 1.0f / (float)tw; // 0.00390625F; // float ys = 1.0f / (float)th; // 0.00390625F; // RenderBuffer rb = Tessellator.getBuffer(); -// rb.begin(7, DefaultVertexFormats.POSITION_TEX); +// rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // rb.pos((double)(x + 0), (double)(y + height), 0.0).tex((double)((float)(textureX + 0) * xs), (double)((float)(textureY + height) * ys)).endVertex(); // rb.pos((double)(x + width), (double)(y + height), 0.0).tex((double)((float)(textureX + width) * xs), (double)((float)(textureY + height) * ys)).endVertex(); // rb.pos((double)(x + width), (double)(y + 0), 0.0).tex((double)((float)(textureX + width) * xs), (double)((float)(textureY + 0) * ys)).endVertex(); @@ -51,7 +51,7 @@ public abstract class Drawing { GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); RenderBuffer rb = Tessellator.getBuffer(); - rb.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); int h = Font.YGLYPH; int tx, ty, u, v; FontChar glyph; @@ -310,7 +310,7 @@ public abstract class Drawing { GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); RenderBuffer rb = Tessellator.getBuffer(); - rb.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); int ox = x; int ncolor = color; FontChar glyph; @@ -419,7 +419,7 @@ public abstract class Drawing { GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); RenderBuffer buf = Tessellator.getBuffer(); - buf.begin(7, DefaultVertexFormats.POSITION_COLOR); + buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); buf.pos((double)(x + w), (double)y, 0.0).color(ctop).endVertex(); buf.pos((double)x, (double)y, 0.0).color(ctop).endVertex(); buf.pos((double)x, (double)(y + h), 0.0).color(cbottom).endVertex(); @@ -439,7 +439,7 @@ public abstract class Drawing { GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); RenderBuffer buf = Tessellator.getBuffer(); - buf.begin(7, DefaultVertexFormats.POSITION_COLOR); + buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); buf.pos((double)(x + w), (double)y, 0.0).color(topright).endVertex(); buf.pos((double)x, (double)y, 0.0).color(lopleft).endVertex(); buf.pos((double)x, (double)(y + h), 0.0).color(btmleft).endVertex(); @@ -460,7 +460,7 @@ public abstract class Drawing { GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); GlState.color(color); - rb.begin(7, DefaultVertexFormats.POSITION); + rb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); rb.pos((double)x, (double)(y + h), 0.0D).endVertex(); rb.pos((double)(x + w), (double)(y + h), 0.0D).endVertex(); rb.pos((double)(x + w), (double)y, 0.0D).endVertex(); @@ -554,7 +554,7 @@ public abstract class Drawing { gm.getTextureManager().bindTexture(texture); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); double scale = 32.0; - buf.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); buf.pos(x, y + height, 0.0D).tex(0.0D, height / scale) .color(64, 64, 64, 255).endVertex(); buf.pos(x + width, y + height, 0.0D) diff --git a/java/src/game/renderer/EntityRenderer.java b/java/src/game/renderer/EntityRenderer.java index 8005657..0ce00c2 100755 --- a/java/src/game/renderer/EntityRenderer.java +++ b/java/src/game/renderer/EntityRenderer.java @@ -1295,7 +1295,7 @@ public class EntityRenderer { mode = 2; this.gm.getTextureManager().bindTexture(locationMoltenPng); - worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); } double d5 = ((double)(this.rendererUpdateCount + l1 * l1 * 3121 + l1 * 45238971 + k1 * k1 * 418711 + k1 * 13761 & 63) + (double)partialTicks) / 64.0D * (3.0D + this.random.doublev()); @@ -1323,7 +1323,7 @@ public class EntityRenderer { mode = 0; this.gm.getTextureManager().bindTexture(f2 <= 5.0f ? locationHailPng : locationRainPng); - worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); } double d5 = ((double)(this.rendererUpdateCount + l1 * l1 * 3121 + l1 * 45238971 + k1 * k1 * 418711 + k1 * 13761 & 31) + (double)partialTicks) / 32.0D * (3.0D + this.random.doublev()); @@ -1351,7 +1351,7 @@ public class EntityRenderer { mode = 1; this.gm.getTextureManager().bindTexture(locationSnowPng); - worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); } double d8 = (double)(((float)(this.rendererUpdateCount & 511) + partialTicks) / 512.0F); diff --git a/java/src/game/renderer/ItemRenderer.java b/java/src/game/renderer/ItemRenderer.java index b3c22e9..6fdbf98 100755 --- a/java/src/game/renderer/ItemRenderer.java +++ b/java/src/game/renderer/ItemRenderer.java @@ -257,7 +257,7 @@ public class ItemRenderer //// Tessellator tessellator = Tessellator.getInstance(); // RenderBuffer worldrenderer = Tessellator.getBuffer(); // SKC.glNormal3f(0.0F, 0.0F, -1.0F); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // worldrenderer.pos(-7.0D, 135.0D, 0.0D).tex(0.0D, 1.0D).endVertex(); // worldrenderer.pos(135.0D, 135.0D, 0.0D).tex(1.0D, 1.0D).endVertex(); // worldrenderer.pos(135.0D, -7.0D, 0.0D).tex(1.0D, 0.0D).endVertex(); @@ -528,7 +528,7 @@ public class ItemRenderer float f7 = atlas.getMaxU(); float f8 = atlas.getMinV(); float f9 = atlas.getMaxV(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-1.0D, -1.0D, -0.5D).tex((double)f7, (double)f9).endVertex(); worldrenderer.pos(1.0D, -1.0D, -0.5D).tex((double)f6, (double)f9).endVertex(); worldrenderer.pos(1.0D, 1.0D, -0.5D).tex((double)f6, (double)f8).endVertex(); @@ -570,7 +570,7 @@ public class ItemRenderer float f9 = -0.5F; GL11.glTranslatef((float)(-(i * 2 - 1)) * 0.24F, -0.3F, 0.0F); GL11.glRotatef((float)(i * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)f5, (double)f7, (double)f9).tex((double)f2, (double)f4).endVertex(); worldrenderer.pos((double)f6, (double)f7, (double)f9).tex((double)f1, (double)f4).endVertex(); worldrenderer.pos((double)f6, (double)f8, (double)f9).tex((double)f1, (double)f3).endVertex(); diff --git a/java/src/game/renderer/RenderGlobal.java b/java/src/game/renderer/RenderGlobal.java index b90852e..0bb0aef 100755 --- a/java/src/game/renderer/RenderGlobal.java +++ b/java/src/game/renderer/RenderGlobal.java @@ -259,7 +259,7 @@ public class RenderGlobal { int i = 64; int j = 6; - worldRendererIn.begin(7, DefaultVertexFormats.POSITION); + worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); for (int k = -384; k <= 384; k += 64) { @@ -358,7 +358,7 @@ public class RenderGlobal { max -= min; Random rand = new Random(seed); - rend.begin(7, DefaultVertexFormats.POSITION); + rend.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); for (int n = 0; n < nstars; ++n) { @@ -1108,7 +1108,7 @@ public class RenderGlobal GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); } - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos(-100.0D, -100.0D, -100.0D).tex(0.0D, 0.0D).color(40, 40, 40, 255).endVertex(); worldrenderer.pos(-100.0D, -100.0D, 100.0D).tex(0.0D, 16.0D).color(40, 40, 40, 255).endVertex(); worldrenderer.pos(100.0D, -100.0D, 100.0D).tex(16.0D, 16.0D).color(40, 40, 40, 255).endVertex(); @@ -1159,7 +1159,7 @@ public class RenderGlobal this.skyVBO.bindBuffer(); GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); GL11.nglVertexPointer(3, GL11.GL_FLOAT, 12, 0L); - this.skyVBO.drawArrays(7); + this.skyVBO.drawArrays(GL11.GL_QUADS); this.skyVBO.unbindBuffer(); GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY); // } @@ -1198,7 +1198,7 @@ public class RenderGlobal // f8 = f11; // } - worldrenderer.begin(6, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3]).endVertex(); int j = 16; @@ -1225,7 +1225,7 @@ public class RenderGlobal if(this.gm.theWorld.dimension.getType().sun) { float size = 30.0F; this.renderEngine.bindTexture(SUN_TEX); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)(-size), 100.0D, (double)(-size)).tex(0.0D, 0.0D).endVertex(); worldrenderer.pos((double)size, 100.0D, (double)(-size)).tex(1.0D, 0.0D).endVertex(); worldrenderer.pos((double)size, 100.0D, (double)size).tex(1.0D, 1.0D).endVertex(); @@ -1242,7 +1242,7 @@ public class RenderGlobal float f23 = (float)(i1 + 0) / 2.0F; float f24 = (float)(k + 1) / 4.0F; float f14 = (float)(i1 + 1) / 2.0F; - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)(-size), -100.0D, (double)size).tex((double)f24, (double)f14).endVertex(); worldrenderer.pos((double)size, -100.0D, (double)size).tex((double)f22, (double)f14).endVertex(); worldrenderer.pos((double)size, -100.0D, (double)(-size)).tex((double)f22, (double)f23).endVertex(); @@ -1268,7 +1268,7 @@ public class RenderGlobal this.starVBO.bindBuffer(); GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); GL11.nglVertexPointer(3, GL11.GL_FLOAT, 12, 0L); - this.starVBO.drawArrays(7); + this.starVBO.drawArrays(GL11.GL_QUADS); this.starVBO.unbindBuffer(); GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY); // } @@ -1295,7 +1295,7 @@ public class RenderGlobal this.dstarVBO.bindBuffer(); GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); GL11.nglVertexPointer(3, GL11.GL_FLOAT, 12, 0L); - this.dstarVBO.drawArrays(7); + this.dstarVBO.drawArrays(GL11.GL_QUADS); this.dstarVBO.unbindBuffer(); GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY); // } @@ -1395,7 +1395,7 @@ public class RenderGlobal { for (int k1 = -3; k1 <= 4; ++k1) { - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); float f22 = (float)(j1 * 8); float f23 = (float)(k1 * 8); float f24 = f22 - f19; @@ -1532,7 +1532,7 @@ public class RenderGlobal { this.renderEngine.bindTexture(TextureMap.locationBlocksTexture); this.preRenderDamagedBlocks(); - worldRendererIn.begin(7, DefaultVertexFormats.BLOCK); + worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); worldRendererIn.setTranslation(-d0, -d1, -d2); worldRendererIn.noColor(); Iterator iterator = this.damagedBlocks.values().iterator(); @@ -1611,21 +1611,21 @@ public class RenderGlobal { // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(3, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); Tessellator.draw(); - worldrenderer.begin(3, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); Tessellator.draw(); - worldrenderer.begin(1, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).endVertex(); @@ -1641,21 +1641,21 @@ public class RenderGlobal { // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(3, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); Tessellator.draw(); - worldrenderer.begin(3, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); Tessellator.draw(); - worldrenderer.begin(1, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); @@ -1742,7 +1742,7 @@ public class RenderGlobal renderchunk.multModelviewMatrix(); vertexbuffer.bindBuffer(); this.setupArrayPointers(); - vertexbuffer.drawArrays(7); + vertexbuffer.drawArrays(GL11.GL_QUADS); GL11.glPopMatrix(); } @@ -1792,7 +1792,7 @@ public class RenderGlobal // this.skyVBO.bindBuffer(); // WCF.glEnableClientState(WCF.GL_VERTEX_ARRAY); // WCF.glVertexPointer(3, WCF.GL_FLOAT, 12, 0L); - // this.skyVBO.drawArrays(7); + // this.skyVBO.drawArrays(GL11.GL_QUADS); // this.skyVBO.unbindBuffer(); // WCF.glDisableClientState(WCF.GL_VERTEX_ARRAY); GlState.disableAlpha(); @@ -1803,13 +1803,13 @@ public class RenderGlobal this.starVBO.bindBuffer(); GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); GL11.nglVertexPointer(3, GL11.GL_FLOAT, 12, 0L); - this.starVBO.drawArrays(7); + this.starVBO.drawArrays(GL11.GL_QUADS); this.starVBO.unbindBuffer(); GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY); this.dstarVBO.bindBuffer(); GL11.glEnableClientState(GL11.GL_VERTEX_ARRAY); GL11.nglVertexPointer(3, GL11.GL_FLOAT, 12, 0L); - this.dstarVBO.drawArrays(7); + this.dstarVBO.drawArrays(GL11.GL_QUADS); this.dstarVBO.unbindBuffer(); GL11.glDisableClientState(GL11.GL_VERTEX_ARRAY); GlState.enableTexture2D(); diff --git a/java/src/game/renderer/VertexBuffer.java b/java/src/game/renderer/VertexBuffer.java index cdd32e8..ab21f17 100755 --- a/java/src/game/renderer/VertexBuffer.java +++ b/java/src/game/renderer/VertexBuffer.java @@ -22,12 +22,12 @@ public class VertexBuffer GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, this.glBufferId); } - public void bufferData(ByteBuffer p_181722_1_) + public void bufferData(ByteBuffer buffer) { this.bindBuffer(); - GL15.glBufferData(GL15.GL_ARRAY_BUFFER, p_181722_1_, GL15.GL_STATIC_DRAW); + GL15.glBufferData(GL15.GL_ARRAY_BUFFER, buffer, GL15.GL_STATIC_DRAW); this.unbindBuffer(); - this.count = p_181722_1_.limit() / this.vertexFormat.getNextOffset(); + this.count = buffer.limit() / this.vertexFormat.getNextOffset(); } public void drawArrays(int mode) diff --git a/java/src/game/renderer/VertexFormatElement.java b/java/src/game/renderer/VertexFormatElement.java index 051f0c2..e0f7181 100755 --- a/java/src/game/renderer/VertexFormatElement.java +++ b/java/src/game/renderer/VertexFormatElement.java @@ -1,5 +1,7 @@ package game.renderer; +import org.lwjgl.opengl.GL11; + import game.log.Log; public class VertexFormatElement @@ -94,13 +96,13 @@ public class VertexFormatElement public static enum EnumType { - FLOAT(4, "Float", 5126), - UBYTE(1, "Unsigned Byte", 5121), - BYTE(1, "Byte", 5120), - USHORT(2, "Unsigned Short", 5123), - SHORT(2, "Short", 5122), - UINT(4, "Unsigned Int", 5125), - INT(4, "Int", 5124); + FLOAT(4, "Float", GL11.GL_FLOAT), + UBYTE(1, "Unsigned Byte", GL11.GL_UNSIGNED_BYTE), + BYTE(1, "Byte", GL11.GL_BYTE), + USHORT(2, "Unsigned Short", GL11.GL_UNSIGNED_SHORT), + SHORT(2, "Short", GL11.GL_SHORT), + UINT(4, "Unsigned Int", GL11.GL_UNSIGNED_INT), + INT(4, "Int", GL11.GL_INT); private final int size; private final String displayName; @@ -135,8 +137,8 @@ public class VertexFormatElement NORMAL("Normal"), COLOR("Vertex Color"), UV("UV"), - MATRIX("Bone Matrix"), - BLEND_WEIGHT("Blend Weight"), +// MATRIX("Bone Matrix"), +// BLEND_WEIGHT("Blend Weight"), PADDING("Padding"); private final String displayName; diff --git a/java/src/game/renderer/chunk/RenderChunk.java b/java/src/game/renderer/chunk/RenderChunk.java index 83de7b9..c33a878 100755 --- a/java/src/game/renderer/chunk/RenderChunk.java +++ b/java/src/game/renderer/chunk/RenderChunk.java @@ -295,7 +295,7 @@ public class RenderChunk private void preRenderBlocks(RenderBuffer worldRendererIn, BlockPos pos) { - worldRendererIn.begin(7, DefaultVertexFormats.BLOCK); + worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); worldRendererIn.setTranslation((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ())); } diff --git a/java/src/game/renderer/entity/Render.java b/java/src/game/renderer/entity/Render.java index c213fb3..026b50d 100755 --- a/java/src/game/renderer/entity/Render.java +++ b/java/src/game/renderer/entity/Render.java @@ -116,7 +116,7 @@ public abstract class Render GlState.color(1.0F, 1.0F, 1.0F, 1.0F); float f5 = 0.0F; int i = 0; - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); while (f3 > 0.0F) { @@ -188,7 +188,7 @@ public abstract class Render // double d4 = z - d1; //// Tessellator tessellator = Tessellator.getInstance(); // RenderBuffer worldrenderer = Tessellator.getBuffer(); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); // // for (BlockPos blockpos : BlockPos.getAllInBoxMutable(new BlockPos(i, k, i1), new BlockPos(j, l, j1))) // { @@ -256,7 +256,7 @@ public abstract class Render RenderBuffer worldrenderer = Tessellator.getBuffer(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); worldrenderer.setTranslation(x, y, z); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_NORMAL); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_NORMAL); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); @@ -349,7 +349,7 @@ public abstract class Render // Vec2i size = Drawing.txt_size(0, 0, 0, 0, 65536, 65536, str); // int j = size.xpos / 2; // GlState.disableTexture2D(); -// worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); +// worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); // worldrenderer.pos((double)(-j - 1), (double)(-1 + i), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); // worldrenderer.pos((double)(-j - 1), (double)(8 + i), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); // worldrenderer.pos((double)(j + 1), (double)(8 + i), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); diff --git a/java/src/game/renderer/entity/RenderArrow.java b/java/src/game/renderer/entity/RenderArrow.java index 579d4ba..4b6ad8b 100755 --- a/java/src/game/renderer/entity/RenderArrow.java +++ b/java/src/game/renderer/entity/RenderArrow.java @@ -55,14 +55,14 @@ public class RenderArrow extends Render GL11.glScalef(f8, f8, f8); GL11.glTranslatef(-4.0F, 0.0F, 0.0F); GL11.glNormal3f(f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f7).endVertex(); Tessellator.draw(); GL11.glNormal3f(-f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); @@ -73,7 +73,7 @@ public class RenderArrow extends Render { GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); GL11.glNormal3f(0.0F, 0.0F, f8); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)f, (double)f2).endVertex(); worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)f1, (double)f2).endVertex(); worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)f1, (double)f3).endVertex(); diff --git a/java/src/game/renderer/entity/RenderBullet.java b/java/src/game/renderer/entity/RenderBullet.java index d8499fd..c94042a 100755 --- a/java/src/game/renderer/entity/RenderBullet.java +++ b/java/src/game/renderer/entity/RenderBullet.java @@ -42,14 +42,14 @@ public class RenderBullet extends Render GL11.glScalef(f8, f8, f8); GL11.glTranslatef(-4.0F, 0.0F, 0.0F); GL11.glNormal3f(f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f7).endVertex(); Tessellator.draw(); GL11.glNormal3f(-f8, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); @@ -60,7 +60,7 @@ public class RenderBullet extends Render { GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); GL11.glNormal3f(0.0F, 0.0F, f8); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)f, (double)f2).endVertex(); worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)f1, (double)f2).endVertex(); worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)f1, (double)f3).endVertex(); diff --git a/java/src/game/renderer/entity/RenderFallingBlock.java b/java/src/game/renderer/entity/RenderFallingBlock.java index 0b6506f..25a240f 100755 --- a/java/src/game/renderer/entity/RenderFallingBlock.java +++ b/java/src/game/renderer/entity/RenderFallingBlock.java @@ -46,7 +46,7 @@ public class RenderFallingBlock extends Render GlState.disableLighting(); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(7, DefaultVertexFormats.BLOCK); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); int i = blockpos.getX(); int j = blockpos.getY(); int k = blockpos.getZ(); diff --git a/java/src/game/renderer/entity/RenderFireball.java b/java/src/game/renderer/entity/RenderFireball.java index 552c914..d4f8768 100755 --- a/java/src/game/renderer/entity/RenderFireball.java +++ b/java/src/game/renderer/entity/RenderFireball.java @@ -45,7 +45,7 @@ public class RenderFireball extends Render float f6 = 0.25F; GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_NORMAL); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); worldrenderer.pos(-0.5D, -0.25D, 0.0D).tex((double)f, (double)f3).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, -0.25D, 0.0D).tex((double)f1, (double)f3).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, 0.75D, 0.0D).tex((double)f1, (double)f2).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/java/src/game/renderer/entity/RenderFish.java b/java/src/game/renderer/entity/RenderFish.java index 48520e7..f5ce13a 100755 --- a/java/src/game/renderer/entity/RenderFish.java +++ b/java/src/game/renderer/entity/RenderFish.java @@ -42,7 +42,7 @@ public class RenderFish extends Render float f6 = 0.5F; GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_NORMAL); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); worldrenderer.pos(-0.5D, -0.5D, 0.0D).tex(0.0625D, 0.1875D).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, -0.5D, 0.0D).tex(0.125D, 0.1875D).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, 0.5D, 0.0D).tex(0.125D, 0.125D).normal(0.0F, 1.0F, 0.0F).endVertex(); @@ -86,7 +86,7 @@ public class RenderFish extends Render double d12 = (double)((float)(d2 - d7)); GlState.disableTexture2D(); GlState.disableLighting(); - worldrenderer.begin(3, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); int k = 16; for (int l = 0; l <= 16; ++l) diff --git a/java/src/game/renderer/entity/RenderItem.java b/java/src/game/renderer/entity/RenderItem.java index 6aa1251..418e2f8 100755 --- a/java/src/game/renderer/entity/RenderItem.java +++ b/java/src/game/renderer/entity/RenderItem.java @@ -73,7 +73,7 @@ public class RenderItem { // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(7, DefaultVertexFormats.ITEM); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); for (Facing enumfacing : Facing.values()) { diff --git a/java/src/game/renderer/entity/RenderLightning.java b/java/src/game/renderer/entity/RenderLightning.java index 0939427..d520f5a 100755 --- a/java/src/game/renderer/entity/RenderLightning.java +++ b/java/src/game/renderer/entity/RenderLightning.java @@ -83,7 +83,7 @@ public class RenderLightning extends Render d3 += (double)(random1.zrange(31) - 15); } - worldrenderer.begin(5, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); float f = 0.5F; float f1 = 0.45F; float f2 = 0.45F; diff --git a/java/src/game/renderer/entity/RenderLiving.java b/java/src/game/renderer/entity/RenderLiving.java index 1bc3b7d..afb8281 100755 --- a/java/src/game/renderer/entity/RenderLiving.java +++ b/java/src/game/renderer/entity/RenderLiving.java @@ -1,5 +1,6 @@ package game.renderer.entity; +import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import game.entity.Entity; @@ -95,7 +96,7 @@ public abstract class RenderLiving extends RendererLivin GlState.disableTexture2D(); GlState.disableLighting(); GlState.disableCull(); - renderer.begin(5, DefaultVertexFormats.POSITION_COLOR); + renderer.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); for(int n = 0; n <= 24; ++n) { float cr = r; float cg = g; @@ -118,7 +119,7 @@ public abstract class RenderLiving extends RendererLivin ).color(cr, cg, cb, 1.0F).endVertex(); } Tessellator.draw(); - renderer.begin(5, DefaultVertexFormats.POSITION_COLOR); + renderer.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); for(int n = 0; n <= 24; ++n) { float cr = r; float cg = g; diff --git a/java/src/game/renderer/entity/RenderManager.java b/java/src/game/renderer/entity/RenderManager.java index 460758e..f0b17ef 100755 --- a/java/src/game/renderer/entity/RenderManager.java +++ b/java/src/game/renderer/entity/RenderManager.java @@ -2,6 +2,7 @@ package game.renderer.entity; import java.util.Map; +import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import com.google.common.collect.Maps; @@ -309,7 +310,7 @@ public class RenderManager // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); Vec3 vec3 = entityIn.getLook(partialTicks); - worldrenderer.begin(3, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(x, y + (double)entityIn.getEyeHeight(), z).color(0, 0, 255, 255).endVertex(); worldrenderer.pos(x + vec3.xCoord * 2.0D, y + (double)entityIn.getEyeHeight() + vec3.yCoord * 2.0D, z + vec3.zCoord * 2.0D).color(0, 0, 255, 255).endVertex(); Tessellator.draw(); diff --git a/java/src/game/renderer/entity/RenderXpOrb.java b/java/src/game/renderer/entity/RenderXpOrb.java index 9f305ff..43252b2 100755 --- a/java/src/game/renderer/entity/RenderXpOrb.java +++ b/java/src/game/renderer/entity/RenderXpOrb.java @@ -54,7 +54,7 @@ public class RenderXpOrb extends Render GL11.glScalef(0.3F, 0.3F, 0.3F); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); worldrenderer.pos((double)(0.0F - f5), (double)(0.0F - f6), 0.0D).tex((double)f, (double)f3).color(l, 255, j1, 128).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos((double)(f4 - f5), (double)(0.0F - f6), 0.0D).tex((double)f1, (double)f3).color(l, 255, j1, 128).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos((double)(f4 - f5), (double)(1.0F - f6), 0.0D).tex((double)f1, (double)f2).color(l, 255, j1, 128).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/java/src/game/renderer/entity/RendererLivingEntity.java b/java/src/game/renderer/entity/RendererLivingEntity.java index 99befb3..482be20 100755 --- a/java/src/game/renderer/entity/RendererLivingEntity.java +++ b/java/src/game/renderer/entity/RendererLivingEntity.java @@ -540,7 +540,7 @@ public abstract class RendererLivingEntity extends Rende GlState.shadeModel(GL11.GL_SMOOTH); float f7 = 0.0F - ((float)entity.ticksExisted + p_180574_8_) * 0.01F; float f8 = ExtMath.sqrtf(f2 * f2 + f3 * f3 + f4 * f4) / 32.0F - ((float)entity.ticksExisted + p_180574_8_) * 0.01F; - worldrenderer.begin(5, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX_COLOR); int i = 8; for (int j = 0; j <= 8; ++j) diff --git a/java/src/game/renderer/layers/LayerEntityBreak.java b/java/src/game/renderer/layers/LayerEntityBreak.java index a38eb77..03aa1e1 100755 --- a/java/src/game/renderer/layers/LayerEntityBreak.java +++ b/java/src/game/renderer/layers/LayerEntityBreak.java @@ -48,7 +48,7 @@ public class LayerEntityBreak implements LayerRenderer GL11.glRotatef(random.floatv() * 360.0F + f * 90.0F, 0.0F, 0.0F, 1.0F); float f2 = random.floatv() * 20.0F + 5.0F + f1 * 10.0F; float f3 = random.floatv() * 2.0F + 1.0F + f1 * 2.0F; - worldrenderer.begin(6, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(0.0D, 0.0D, 0.0D).color(255, 255, 255, (int)(255.0F * (1.0F - f1))).endVertex(); worldrenderer.pos(-0.866D * (double)f3, (double)f2, (double)(-0.5F * f3)).color(255, 0, 255, 0).endVertex(); worldrenderer.pos(0.866D * (double)f3, (double)f2, (double)(-0.5F * f3)).color(255, 0, 255, 0).endVertex(); diff --git a/java/src/game/renderer/model/TexturedQuad.java b/java/src/game/renderer/model/TexturedQuad.java index 4a8d1fd..d72d146 100755 --- a/java/src/game/renderer/model/TexturedQuad.java +++ b/java/src/game/renderer/model/TexturedQuad.java @@ -1,5 +1,7 @@ package game.renderer.model; +import org.lwjgl.opengl.GL11; + import game.renderer.DefaultVertexFormats; import game.renderer.RenderBuffer; import game.renderer.Tessellator; @@ -57,7 +59,7 @@ public class TexturedQuad // ny = -ny; // nz = -nz; // } - renderer.begin(7, DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL); + renderer.begin(GL11.GL_QUADS, DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL); for (int i = 0; i < 4; ++i) { PositionTextureVertex vertex = this.vertices[i]; diff --git a/java/src/game/renderer/particle/EffectRenderer.java b/java/src/game/renderer/particle/EffectRenderer.java index 7e639bd..3a9e107 100755 --- a/java/src/game/renderer/particle/EffectRenderer.java +++ b/java/src/game/renderer/particle/EffectRenderer.java @@ -256,7 +256,7 @@ public class EffectRenderer GlState.color(1.0F, 1.0F, 1.0F, 1.0F); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(7, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); for (int k = 0; k < this.fxLayers[i][j].size(); ++k) { diff --git a/java/src/game/renderer/particle/EntityFootStepFX.java b/java/src/game/renderer/particle/EntityFootStepFX.java index 4d7b828..887fdf7 100755 --- a/java/src/game/renderer/particle/EntityFootStepFX.java +++ b/java/src/game/renderer/particle/EntityFootStepFX.java @@ -55,7 +55,7 @@ public class EntityFootStepFX extends EntityFX this.currentFootSteps.bindTexture(EffectRenderer.particleTextures); GlState.enableBlend(); GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - worldRendererIn.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldRendererIn.pos((double)(f3 - 0.125F), (double)f4, (double)(f5 + 0.125F)).tex(u1, u3).color(f6, f6, f6, f1).endVertex(); worldRendererIn.pos((double)(f3 + 0.125F), (double)f4, (double)(f5 + 0.125F)).tex(u1, u2).color(f6, f6, f6, f1).endVertex(); worldRendererIn.pos((double)(f3 + 0.125F), (double)f4, (double)(f5 - 0.125F)).tex(u, u2).color(f6, f6, f6, f1).endVertex(); diff --git a/java/src/game/renderer/particle/EntityLargeExplodeFX.java b/java/src/game/renderer/particle/EntityLargeExplodeFX.java index 6f9bbcd..21020a8 100755 --- a/java/src/game/renderer/particle/EntityLargeExplodeFX.java +++ b/java/src/game/renderer/particle/EntityLargeExplodeFX.java @@ -1,5 +1,7 @@ package game.renderer.particle; +import org.lwjgl.opengl.GL11; + import game.Game; import game.entity.Entity; import game.renderer.DefaultVertexFormats; @@ -14,7 +16,7 @@ import game.world.World; public class EntityLargeExplodeFX extends EntityFX { private static final String EXPLOSION_TEXTURE = "textures/entity/explosion.png"; - private static final VertexFormat field_181549_az = (new VertexFormat()).addElement(DefaultVertexFormats.POSITION_3F).addElement(DefaultVertexFormats.TEX_2F).addElement(DefaultVertexFormats.COLOR_4UB).addElement(DefaultVertexFormats.TEX_2S).addElement(DefaultVertexFormats.NORMAL_3B).addElement(DefaultVertexFormats.PADDING_1B); + private static final VertexFormat VERTEX_FORMAT = (new VertexFormat()).addElement(DefaultVertexFormats.POSITION_3F).addElement(DefaultVertexFormats.TEX_2F).addElement(DefaultVertexFormats.COLOR_4UB).addElement(DefaultVertexFormats.TEX_2S).addElement(DefaultVertexFormats.NORMAL_3B).addElement(DefaultVertexFormats.PADDING_1B); private int field_70581_a; private int field_70584_aq; @@ -52,7 +54,7 @@ public class EntityLargeExplodeFX extends EntityFX GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableLighting(); ItemRenderer.disableStandardItemLighting(); - worldRendererIn.begin(7, field_181549_az); + worldRendererIn.begin(GL11.GL_QUADS, VERTEX_FORMAT); worldRendererIn.pos((double)(f5 - rotationX * f4 - rotationXY * f4), (double)(f6 - rotationZ * f4), (double)(f7 - rotationYZ * f4 - rotationXZ * f4)).tex((double)f1, (double)f3).color(this.particleRed, this.particleGreen, this.particleBlue, 1.0F).lightmap(0, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); worldRendererIn.pos((double)(f5 - rotationX * f4 + rotationXY * f4), (double)(f6 + rotationZ * f4), (double)(f7 - rotationYZ * f4 + rotationXZ * f4)).tex((double)f1, (double)f2).color(this.particleRed, this.particleGreen, this.particleBlue, 1.0F).lightmap(0, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); worldRendererIn.pos((double)(f5 + rotationX * f4 + rotationXY * f4), (double)(f6 + rotationZ * f4), (double)(f7 + rotationYZ * f4 + rotationXZ * f4)).tex((double)f, (double)f2).color(this.particleRed, this.particleGreen, this.particleBlue, 1.0F).lightmap(0, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java b/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java index d0655b8..201fbad 100755 --- a/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java @@ -49,7 +49,7 @@ public class TileEntityPistonRenderer extends TileEntitySpecialRenderer