From da1b7dac623539896c0c764d46d287921349f7ea Mon Sep 17 00:00:00 2001 From: PeytonPlayz595 <106421860+PeytonPlayz595@users.noreply.github.com> Date: Wed, 12 Jul 2023 07:59:43 -0400 Subject: [PATCH] Replace ShapeRenderer with old one --- .../minecraft/render/ShapeRenderer.java | 326 +++++++++--------- 1 file changed, 169 insertions(+), 157 deletions(-) diff --git a/src/teavm/java/com/mojang/minecraft/render/ShapeRenderer.java b/src/teavm/java/com/mojang/minecraft/render/ShapeRenderer.java index 1a484dc..dc94fe9 100644 --- a/src/teavm/java/com/mojang/minecraft/render/ShapeRenderer.java +++ b/src/teavm/java/com/mojang/minecraft/render/ShapeRenderer.java @@ -1,157 +1,169 @@ -package com.mojang.minecraft.render; - -import java.nio.FloatBuffer; -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; - -public final class ShapeRenderer { - - private FloatBuffer buffer = BufferUtils.createFloatBuffer(524288); - private float[] data = new float[524288]; - private int vertices = 0; - private float u; - private float v; - private float r; - private float g; - private float b; - private boolean color = false; - private boolean texture = false; - private int vertexLength = 3; - private int length = 0; - private boolean noColor = false; - public static ShapeRenderer instance = new ShapeRenderer(); - - - public final void end() { - if(this.vertices > 0) { - this.buffer.clear(); - this.buffer.put(this.data, 0, this.length); - this.buffer.flip(); - if(this.texture && this.color) { - GL11.glInterleavedArrays(10794, 0, this.buffer); - } else if(this.texture) { - GL11.glInterleavedArrays(10791, 0, this.buffer); - } else if(this.color) { - GL11.glInterleavedArrays(10788, 0, this.buffer); - } else { - GL11.glInterleavedArrays(10785, 0, this.buffer); - } - - GL11.glEnableClientState('\u8074'); - if(this.texture) { - GL11.glEnableClientState('\u8078'); - } - - if(this.color) { - GL11.glEnableClientState('\u8076'); - } - - GL11.glDrawArrays(7, 0, this.vertices); - GL11.glDisableClientState('\u8074'); - if(this.texture) { - GL11.glDisableClientState('\u8078'); - } - - if(this.color) { - GL11.glDisableClientState('\u8076'); - } - } - - this.clear(); - } - - private void clear() { - this.vertices = 0; - this.buffer.clear(); - this.length = 0; - } - - public final void begin() { - this.clear(); - this.color = false; - this.texture = false; - this.noColor = false; - } - - public final void color(float var1, float var2, float var3) { - if(!this.noColor) { - if(!this.color) { - this.vertexLength += 3; - } - - this.color = true; - this.r = var1; - this.g = var2; - this.b = var3; - } - } - - public final void vertexUV(float var1, float var2, float var3, float var4, float var5) { - if(!this.texture) { - this.vertexLength += 2; - } - - this.texture = true; - this.u = var4; - this.v = var5; - this.vertex(var1, var2, var3); - } - - public final void vertex(float var1, float var2, float var3) { - if(this.texture) { - this.data[this.length++] = this.u; - this.data[this.length++] = this.v; - } - - if(this.color) { - this.data[this.length++] = this.r; - this.data[this.length++] = this.g; - this.data[this.length++] = this.b; - } - - this.data[this.length++] = var1; - this.data[this.length++] = var2; - this.data[this.length++] = var3; - ++this.vertices; - if(this.vertices % 4 == 0 && this.length >= 524288 - (this.vertexLength << 2)) { - this.end(); - } - - } - - public final void color(int var1) { - int var2 = var1 >> 16 & 255; - int var3 = var1 >> 8 & 255; - var1 &= 255; - int var10001 = var2; - int var10002 = var3; - var3 = var1; - var2 = var10002; - var1 = var10001; - byte var7 = (byte)var1; - byte var4 = (byte)var2; - byte var8 = (byte)var3; - byte var6 = var4; - byte var5 = var7; - if(!this.noColor) { - if(!this.color) { - this.vertexLength += 3; - } - - this.color = true; - this.r = (float)(var5 & 255) / 255.0F; - this.g = (float)(var6 & 255) / 255.0F; - this.b = (float)(var8 & 255) / 255.0F; - } - - } - - public final void noColor() { - this.noColor = true; - } - - public final void normal(float var1, float var2, float var3) { - GL11.glNormal3f(var1, var2, var3); - } - -} +package com.mojang.minecraft.render; + +import java.nio.FloatBuffer; +import org.lwjgl.opengl.GL11; + +import net.lax1dude.eaglercraft.GLAllocation; + +public final class ShapeRenderer { + + private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(524288); + private float[] data = new float[524288]; + private int vertices = 0; + private float u; + private float v; + private float r; + private float g; + private float b; + private boolean color = false; + private boolean texture = false; + private boolean normals = false; + private int normal; + private int vertexLength = 3; + private int length = 0; + private boolean noColor = false; + public static ShapeRenderer instance = new ShapeRenderer(); + + + public final void end() { + if(this.vertices > 0) { + this.buffer.clear(); + this.buffer.put(this.data, 0, this.length); + this.buffer.flip(); + + if (this.texture) { + GL11.glEnableVertexAttrib(GL11.GL_TEXTURE_COORD_ARRAY); + } + + if (this.color) { + GL11.glEnableVertexAttrib(GL11.GL_COLOR_ARRAY); + } + + if (this.normals) { + GL11.glEnableVertexAttrib(GL11.GL_NORMAL_ARRAY); + } + + GL11._wglDrawArrays(7, 0, this.vertices); + + if (this.texture) { + GL11.glDisableVertexAttrib(GL11.GL_TEXTURE_COORD_ARRAY); + } + + if (this.color) { + GL11.glDisableVertexAttrib(GL11.GL_COLOR_ARRAY); + } + + if (this.normals) { + GL11.glDisableVertexAttrib(GL11.GL_NORMAL_ARRAY); + } + } + + this.clear(); + } + + private void clear() { + this.vertices = 0; + this.buffer.clear(); + this.length = 0; + } + + public final void begin() { + this.clear(); + this.normals = false; + this.color = false; + this.texture = false; + this.noColor = false; + } + + public final void color(float var1, float var2, float var3) { + if(!this.noColor) { + if(!this.color) { + this.vertexLength += 3; + } + + this.color = true; + this.r = var1; + this.g = var2; + this.b = var3; + } + } + + public final void vertexUV(float var1, float var2, float var3, float var4, float var5) { + if(!this.texture) { + this.vertexLength += 2; + } + + this.texture = true; + this.u = var4; + this.v = var5; + this.vertex(var1, var2, var3); + } + + public final void vertex(float var1, float var2, float var3) { + if(this.texture) { + this.data[this.length++] = this.u; + this.data[this.length++] = this.v; + } + + if(this.color) { + this.data[this.length++] = this.r; + this.data[this.length++] = this.g; + this.data[this.length++] = this.b; + } + + if(this.normals) { + this.data[this.length++] = this.normal; + } + + this.data[this.length++] = var1; + this.data[this.length++] = var2; + this.data[this.length++] = var3; + ++this.vertices; + if(this.vertices % 4 == 0 && this.length >= 524288 - (this.vertexLength << 2)) { + this.end(); + } + + } + + public final void color(int var1) { + int var2 = var1 >> 16 & 255; + int var3 = var1 >> 8 & 255; + var1 &= 255; + int var10001 = var2; + int var10002 = var3; + var3 = var1; + var2 = var10002; + var1 = var10001; + byte var7 = (byte)var1; + byte var4 = (byte)var2; + byte var8 = (byte)var3; + byte var6 = var4; + byte var5 = var7; + if(!this.noColor) { + if(!this.color) { + this.vertexLength += 3; + } + + this.color = true; + this.r = (float)(var5 & 255) / 255.0F; + this.g = (float)(var6 & 255) / 255.0F; + this.b = (float)(var8 & 255) / 255.0F; + } + + } + + public final void noColor() { + this.noColor = true; + } + + public final void normal(float var1, float var2, float var3) { + this.normals = true; + float len = (float) Math.sqrt(var1 * var1 + var2 * var2 + var3 * var3); + int var4 = (int) ((var1 / len) * 127.0F) + 127; + int var5 = (int) ((var2 / len) * 127.0F) + 127; + int var6 = (int) ((var3 / len) * 127.0F) + 127; + this.normal = var4 & 255 | (var5 & 255) << 8 | (var6 & 255) << 16; + GL11.glNormal3f(var1, var2, var3); + } + +} \ No newline at end of file