From a7299eb99dc71b101ea31e19bde05f39391a97f8 Mon Sep 17 00:00:00 2001 From: Irtimaled Date: Tue, 9 Jun 2020 12:51:32 -0700 Subject: [PATCH] Switch to using Blaze managed GL --- .../irtimaled/bbor/client/ClientRenderer.java | 16 +- .../bbor/client/gui/AbstractSlider.java | 2 - .../bbor/client/gui/ControlList.java | 28 ++-- .../client/gui/SelectableControlList.java | 7 +- .../bbor/client/gui/WorldSaveRow.java | 6 +- .../client/renderers/AbstractRenderer.java | 66 +++------ .../client/renderers/BiomeBorderRenderer.java | 2 +- .../client/renderers/ConduitRenderer.java | 2 +- .../bbor/client/renderers/LineRenderer.java | 13 +- .../bbor/client/renderers/RenderHelper.java | 139 ++++++++++++++++++ .../bbor/client/renderers/Renderer.java | 13 +- .../renderers/SpawningSphereRenderer.java | 5 +- .../bbor/client/renderers/SphereRenderer.java | 2 +- 13 files changed, 202 insertions(+), 99 deletions(-) create mode 100644 src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java diff --git a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java index e8f2b15..49a6afa 100644 --- a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java @@ -1,6 +1,5 @@ package com.irtimaled.bbor.client; -import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.client.models.*; import com.irtimaled.bbor.client.providers.*; @@ -9,7 +8,6 @@ import com.irtimaled.bbor.common.MathHelper; import com.irtimaled.bbor.common.models.AbstractBoundingBox; import com.irtimaled.bbor.common.models.BoundingBoxCuboid; import com.irtimaled.bbor.common.models.DimensionId; -import org.lwjgl.opengl.GL11; import java.util.*; import java.util.stream.Stream; @@ -84,24 +82,14 @@ public class ClientRenderer { public static void render(DimensionId dimensionId) { if (!active) return; - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glLineWidth(2.0f); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_DEPTH_TEST); - - if (ConfigManager.alwaysVisible.get()) { - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - } + RenderHelper.beforeRender(); getBoundingBoxes(dimensionId).forEach(key -> { AbstractRenderer renderer = boundingBoxRendererMap.get(key.getClass()); if (renderer != null) renderer.render(key); }); - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_TEXTURE_2D); + RenderHelper.afterRender(); } public static Stream getBoundingBoxes(DimensionId dimensionId) { diff --git a/src/main/java/com/irtimaled/bbor/client/gui/AbstractSlider.java b/src/main/java/com/irtimaled/bbor/client/gui/AbstractSlider.java index eaa5f60..0585fba 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/AbstractSlider.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/AbstractSlider.java @@ -3,7 +3,6 @@ package com.irtimaled.bbor.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SoundHandler; import net.minecraft.util.math.MathHelper; -import org.lwjgl.opengl.GL11; abstract class AbstractSlider extends AbstractControl { private final int optionCount; @@ -19,7 +18,6 @@ abstract class AbstractSlider extends AbstractControl { @Override protected void renderBackground(int mouseX, int mouseY) { this.minecraft.getTextureManager().bindTexture(WIDGETS_LOCATION); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int hoverState = super.getYImage(this.isHovered()); this.blit(this.x + (int) getProgressPercentage(), this.y, 0, 46 + hoverState * 20, 4, this.height); this.blit(this.x + (int) getProgressPercentage() + 4, this.y, 196, 46 + hoverState * 20, 4, 20); diff --git a/src/main/java/com/irtimaled/bbor/client/gui/ControlList.java b/src/main/java/com/irtimaled/bbor/client/gui/ControlList.java index d15d971..1284ef5 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/ControlList.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/ControlList.java @@ -1,11 +1,10 @@ package com.irtimaled.bbor.client.gui; +import com.irtimaled.bbor.client.renderers.RenderHelper; import com.irtimaled.bbor.client.renderers.Renderer; -import com.mojang.blaze3d.platform.GLX; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.util.math.MathHelper; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.List; @@ -156,22 +155,22 @@ public class ControlList extends AbstractGui implements IControlSet { public void render(int mouseX, int mouseY) { this.amountScrolled = MathHelper.clamp(this.amountScrolled, 0.0D, this.getMaxScroll()); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_FOG); + RenderHelper.disableLighting(); + RenderHelper.disableFog(); if (!transparentBackground) drawListBackground(); int listTop = this.top + PADDING - (int) this.amountScrolled; drawEntries(mouseX, mouseY, listTop); - GL11.glDisable(GL11.GL_DEPTH_TEST); + RenderHelper.disableDepthTest(); this.overlayBackground(0, this.top); this.overlayBackground(this.bottom, this.height); - GL11.glEnable(GL11.GL_BLEND); - GLX.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ZERO, GL11.GL_ONE); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glDisable(GL11.GL_TEXTURE_2D); + RenderHelper.enableBlend(); + RenderHelper.blendFuncGui(); + RenderHelper.disableAlphaTest(); + RenderHelper.shadeModelSmooth(); + RenderHelper.disableTexture(); drawOverlayShadows(); int maxScroll = this.getMaxScroll(); @@ -179,10 +178,10 @@ public class ControlList extends AbstractGui implements IControlSet { drawScrollBar(maxScroll); } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); + RenderHelper.enableTexture(); + RenderHelper.shadeModelFlat(); + RenderHelper.enableAlphaTest(); + RenderHelper.disableBlend(); } private void drawListBackground() { @@ -216,7 +215,6 @@ public class ControlList extends AbstractGui implements IControlSet { private void overlayBackground(int top, int bottom) { this.minecraft.getTextureManager().bindTexture(AbstractGui.BACKGROUND_LOCATION); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Renderer.startTextured() .setColor(64, 64, 64) .setAlpha(255) diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java b/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java index 0584a23..c202c91 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/SelectableControlList.java @@ -1,7 +1,7 @@ package com.irtimaled.bbor.client.gui; +import com.irtimaled.bbor.client.renderers.RenderHelper; import com.irtimaled.bbor.client.renderers.Renderer; -import org.lwjgl.opengl.GL11; public class SelectableControlList extends ControlList { private final int listRight; @@ -81,8 +81,7 @@ public class SelectableControlList extends ControlList { @Override protected void drawEntry(int mouseX, int mouseY, int top, ControlListEntry entry, int height) { if (this.selectedElement == entry.index) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_TEXTURE_2D); + RenderHelper.disableTexture(); int color = this.isFocused ? 255 : 128; Renderer.startTextured() .setAlpha(255) @@ -97,7 +96,7 @@ public class SelectableControlList extends ControlList { .addPoint(this.listRight + 1, top - 1, 0.0D, 1.0D, 0.0D) .addPoint(this.listLeft - 1, top - 1, 0.0D, 0.0D, 0.0D) .render(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + RenderHelper.enableTexture(); } super.drawEntry(mouseX, mouseY, top, entry, height); } diff --git a/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java b/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java index f0268e4..037dc5f 100644 --- a/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java +++ b/src/main/java/com/irtimaled/bbor/client/gui/WorldSaveRow.java @@ -2,6 +2,7 @@ package com.irtimaled.bbor.client.gui; import com.google.common.hash.Hashing; import com.irtimaled.bbor.client.interop.ClientInterop; +import com.irtimaled.bbor.client.renderers.RenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -13,7 +14,6 @@ import net.minecraft.world.storage.WorldInfo; import net.minecraft.world.storage.WorldSummary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.lwjgl.opengl.GL11; import java.io.File; import java.io.FileInputStream; @@ -108,9 +108,9 @@ public class WorldSaveRow extends ControlListEntry implements Comparable { void renderCuboid(OffsetBox bb, Color color) { OffsetBox nudge = bb.nudge(); renderOutlinedCuboid(nudge, color); - renderFilledFaces(nudge.getMin(), nudge.getMax(), color, 30); + renderFilledFaces(nudge.getMin(), nudge.getMax(), color); } void renderOutlinedCuboid(OffsetBox bb, Color color) { - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); + RenderHelper.polygonModeLine(); OffsetPoint min = bb.getMin(); OffsetPoint max = bb.getMax(); renderFaces(min, max, color, 255, min.getY() == max.getY() ? Renderer::startLineLoop : Renderer::startLines); @@ -96,7 +94,7 @@ public abstract class AbstractRenderer { } void renderLine(OffsetPoint startPoint, OffsetPoint endPoint, Color color) { - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); + RenderHelper.polygonModeLine(); Renderer.startLines() .setColor(color) .addPoint(startPoint) @@ -104,70 +102,54 @@ public abstract class AbstractRenderer { .render(); } - void renderFilledFaces(OffsetPoint min, OffsetPoint max, Color color, int alpha) { + void renderFilledFaces(OffsetPoint min, OffsetPoint max, Color color) { if (!ConfigManager.fill.get()) return; - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); - GL11.glEnable(GL11.GL_BLEND); - renderFaces(min, max, color, alpha, Renderer::startQuads); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_POLYGON_OFFSET_LINE); - GL11.glPolygonOffset(-1.f, -1.f); + RenderHelper.polygonModeFill(); + RenderHelper.enableBlend(); + renderFaces(min, max, color, 30, Renderer::startQuads); + RenderHelper.disableBlend(); + RenderHelper.enablePolygonOffsetLine(); + RenderHelper.polygonOffsetMinusOne(); } void renderText(OffsetPoint offsetPoint, String... texts) { FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glPushMatrix(); - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); - GL11.glTranslated(offsetPoint.getX(), offsetPoint.getY() + 0.002D, offsetPoint.getZ()); - GL11.glNormal3f(0.0F, 1.0F, 0.0F); - GL11.glRotatef(0.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(-0.0175F, -0.0175F, 0.0175F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GLX.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); - - GL11.glDepthMask(true); + RenderHelper.beforeRenderFont(offsetPoint); float top = -(fontRenderer.FONT_HEIGHT * texts.length) / 2f; for (String text : texts) { float left = fontRenderer.getStringWidth(text) / 2f; fontRenderer.drawString(text, -left, top, -1); top += fontRenderer.FONT_HEIGHT; } - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_DEPTH_TEST); + RenderHelper.afterRenderFont(); } - void renderSphere(Point center, double radius, Color color, int density, int dotSize) { + void renderSphere(Point center, double radius, Color color) { if (ConfigManager.renderSphereAsDots.get()) { - renderDotSphere(center, radius, color, density, dotSize); + renderDotSphere(center, radius, color); } else { - renderLineSphere(center, radius, color, density); + renderLineSphere(center, radius, color); } } - private void renderLineSphere(Point center, double radius, Color color, int density) { - GL11.glLineWidth(2f); - int segments = 24 + (density * 8); + private void renderLineSphere(Point center, double radius, Color color) { + RenderHelper.lineWidth2(); double offset = ((radius - (int) radius) == 0) ? center.getY() - (int) center.getY() : 0; for (double dy = offset - radius; dy <= radius + 1; dy++) { double circleRadius = Math.sqrt((radius * radius) - (dy * dy)); if (circleRadius == 0) circleRadius = Math.sqrt(2) / 2; - renderCircle(center, circleRadius, color, segments, dy + 0.001F); + renderCircle(center, circleRadius, color, dy + 0.001F); } } - private void renderCircle(Point center, double radius, Color color, int segments, double dy) { + private void renderCircle(Point center, double radius, Color color, double dy) { Renderer renderer = Renderer.startLineLoop() .setColor(color); - for (int a = 0; a < 360; a += 360 / segments) { + for (int a = 0; a < 360; a += 5) { double heading = a * PI / 180; renderer.addPoint(new OffsetPoint(center.offset(Math.cos(heading) * radius, dy, Math.sin(heading) * radius))); } @@ -175,13 +157,13 @@ public abstract class AbstractRenderer { renderer.render(); } - private void renderDotSphere(Point center, double radius, Color color, int density, int dotSize) { - GL11.glEnable(GL11.GL_POINT_SMOOTH); - GL11.glPointSize(dotSize); + private void renderDotSphere(Point center, double radius, Color color) { + RenderHelper.enablePointSmooth(); + RenderHelper.pointSize5(); Renderer renderer = Renderer.startPoints() .setColor(color); - int segments = 24 + (density * 8); + int segments = 64; double thetaSegment = PI / (double) segments; double phiSegment = TAU / (double) segments; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java index 93a894c..444edbc 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java @@ -47,7 +47,7 @@ public class BiomeBorderRenderer extends AbstractRenderer { Color color = BoundingBoxTypeHelper.getColor(boundingBox.getType()); if (level != 0) { - renderSphere(point, boundingBox.getRadius() + 0.5, color, 5, 5); + renderSphere(point, boundingBox.getRadius() + 0.5, color); } OffsetPoint center = new OffsetPoint(point); diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java index d152c87..66f26cc 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java @@ -3,7 +3,6 @@ package com.irtimaled.bbor.client.renderers; import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper; import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.models.BoundingBoxLine; -import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.Arrays; @@ -24,7 +23,7 @@ public class LineRenderer extends AbstractRenderer { map(point -> new OffsetPoint(point).offset(0, 0.001f, 0)). toArray(OffsetPoint[]::new); - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); + RenderHelper.polygonModeLine(); Renderer.startQuads() .setColor(color) .addPoints(cornerPoints) @@ -32,15 +31,15 @@ public class LineRenderer extends AbstractRenderer { if (!ConfigManager.fill.get()) return; - GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); - GL11.glEnable(GL11.GL_BLEND); + RenderHelper.polygonModeFill(); + RenderHelper.enableBlend(); Renderer.startQuads() .setColor(color) .setAlpha(30) .addPoints(cornerPoints) .render(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_POLYGON_OFFSET_LINE); - GL11.glPolygonOffset(-1.f, -1.f); + RenderHelper.disableBlend(); + RenderHelper.enablePolygonOffsetLine(); + RenderHelper.polygonOffsetMinusOne(); } } diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java b/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java new file mode 100644 index 0000000..54c648a --- /dev/null +++ b/src/main/java/com/irtimaled/bbor/client/renderers/RenderHelper.java @@ -0,0 +1,139 @@ +package com.irtimaled.bbor.client.renderers; + +import com.irtimaled.bbor.client.config.ConfigManager; +import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.Minecraft; +import org.lwjgl.opengl.GL11; + +public class RenderHelper { + public static final int QUADS = GL11.GL_QUADS; + public static final int LINES = GL11.GL_LINES; + public static final int LINE_LOOP = GL11.GL_LINE_LOOP; + public static final int POINTS = GL11.GL_POINTS; + + public static void beforeRender() { + enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + lineWidth2(); + disableTexture(); + GlStateManager.disableCull(); + enableDepthTest(); + + if (ConfigManager.alwaysVisible.get()) { + GlStateManager.clear(GL11.GL_DEPTH_BUFFER_BIT, Minecraft.IS_RUNNING_ON_MAC); + } + } + + public static void afterRender() { + polygonModeFill(); + GlStateManager.enableCull(); + enableTexture(); + } + + public static void beforeRenderFont(OffsetPoint offsetPoint) { + disableDepthTest(); + GlStateManager.pushMatrix(); + polygonModeFill(); + GlStateManager.translated(offsetPoint.getX(), offsetPoint.getY() + 0.002D, offsetPoint.getZ()); + GlStateManager.normal3f(0.0F, 1.0F, 0.0F); + GlStateManager.rotatef(0.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotatef(90.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.scalef(-0.0175F, -0.0175F, 0.0175F); + enableTexture(); + enableBlend(); + GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + + depthMaskTrue(); + } + + public static void afterRenderFont() { + disableTexture(); + disableBlend(); + GlStateManager.popMatrix(); + enableDepthTest(); + } + + public static void disableLighting() { + GlStateManager.disableLighting(); + } + + public static void disableDepthTest() { + GlStateManager.disableDepthTest(); + } + + public static void enableDepthTest() { + GlStateManager.enableDepthTest(); + } + + public static void disableFog() { + GlStateManager.disableFog(); + } + + public static void disableBlend() { + GlStateManager.disableBlend(); + } + + public static void enableBlend() { + GlStateManager.enableBlend(); + } + + public static void disableAlphaTest() { + GlStateManager.disableAlphaTest(); + } + + public static void enableAlphaTest() { + GlStateManager.enableAlphaTest(); + } + + public static void disableTexture() { + GlStateManager.disableTexture(); + } + + public static void enableTexture() { + GlStateManager.enableTexture(); + } + + public static void shadeModelSmooth() { + GlStateManager.shadeModel(GL11.GL_SMOOTH); + } + + public static void shadeModelFlat() { + GlStateManager.shadeModel(GL11.GL_FLAT); + } + + public static void enablePointSmooth() { + GL11.glEnable(GL11.GL_POINT_SMOOTH); + } + + public static void lineWidth2() { + GlStateManager.lineWidth(2f); + } + + public static void polygonModeLine() { + GlStateManager.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); + } + + public static void polygonModeFill() { + GlStateManager.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); + } + + public static void polygonOffsetMinusOne() { + GlStateManager.polygonOffset(-1.f, -1.f); + } + + public static void enablePolygonOffsetLine() { + GlStateManager.enableLineOffset(); + } + + public static void depthMaskTrue() { + GlStateManager.depthMask(true); + } + + public static void pointSize5() { + GL11.glPointSize(5); + } + + public static void blendFuncGui() { + GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ZERO, GL11.GL_ONE); + } +} diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java index 981b6ab..eb470b6 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import org.lwjgl.opengl.GL11; import java.awt.*; @@ -13,23 +12,23 @@ public class Renderer { private final int glMode; static Renderer startLines() { - return new Renderer(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR); + return new Renderer(RenderHelper.LINES, DefaultVertexFormats.POSITION_COLOR); } static Renderer startLineLoop() { - return new Renderer(GL11.GL_LINE_LOOP, DefaultVertexFormats.POSITION_COLOR); + return new Renderer(RenderHelper.LINE_LOOP, DefaultVertexFormats.POSITION_COLOR); } static Renderer startQuads() { - return new Renderer(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); + return new Renderer(RenderHelper.QUADS, DefaultVertexFormats.POSITION_COLOR); } static Renderer startPoints() { - return new Renderer(GL11.GL_POINTS, DefaultVertexFormats.POSITION_COLOR); + return new Renderer(RenderHelper.POINTS, DefaultVertexFormats.POSITION_COLOR); } public static Renderer startTextured() { - return new Renderer(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + return new Renderer(RenderHelper.QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); } private static final Tessellator tessellator = new Tessellator(2097152); @@ -90,7 +89,7 @@ public class Renderer { } public void render() { - if (glMode == GL11.GL_QUADS) { + if (glMode == RenderHelper.QUADS) { bufferBuilder.sortVertexData((float) Camera.getX(), (float) Camera.getY(), (float) Camera.getZ()); } tessellator.draw(); diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java index 519e59a..1b9e555 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java @@ -18,7 +18,7 @@ public class SpawningSphereRenderer extends AbstractRenderer { public void render(BoundingBoxSphere boundingBox) { Point point = boundingBox.getPoint(); double radius = boundingBox.getRadius(); - renderSphere(point, radius, BoundingBoxTypeHelper.getColor(boundingBox.getType()), 5, 5); + renderSphere(point, radius, BoundingBoxTypeHelper.getColor(boundingBox.getType())); } } -- 2.44.0