Fix boxes showing through solid blocks

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / renderers / AbstractRenderer.java

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java
index d51f623a42667dc05c278d52c735c8a2f63f5d42..e6594eb41b36215a525ead922e9c1dffd3da9c88 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java
@@ -1,14 +1,15 @@
 package com.irtimaled.bbor.client.renderers;
 
 import com.irtimaled.bbor.client.config.ConfigManager;
+import com.irtimaled.bbor.client.models.Point;
 import com.irtimaled.bbor.common.models.AbstractBoundingBox;
-import com.irtimaled.bbor.common.models.Point;
 import com.mojang.blaze3d.platform.GLX;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
+import java.util.function.Supplier;
 
 public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
     private static final double TAU = 6.283185307179586D;
@@ -18,18 +19,18 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
 
     void renderCuboid(OffsetBox bb, Color color) {
         OffsetBox nudge = bb.nudge();
-        if (ConfigManager.fill.get()) {
-            renderFilledFaces(nudge.getMin(), nudge.getMax(), color, 30);
-        }
         renderOutlinedCuboid(nudge, color);
+        renderFilledFaces(nudge.getMin(), nudge.getMax(), color, 30);
     }
 
     void renderOutlinedCuboid(OffsetBox bb, Color color) {
         GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
-        renderFaces(bb.getMin(), bb.getMax(), color, 255);
+        OffsetPoint min = bb.getMin();
+        OffsetPoint max = bb.getMax();
+        renderFaces(min, max, color, 255, min.getY() == max.getY() ? Renderer::startLineLoop : Renderer::startLines);
     }
 
-    private void renderFaces(OffsetPoint min, OffsetPoint max, Color color, int alpha) {
+    private void renderFaces(OffsetPoint min, OffsetPoint max, Color color, int alpha, Supplier<Renderer> rendererSupplier) {
         double minX = min.getX();
         double minY = min.getY();
         double minZ = min.getZ();
@@ -38,16 +39,16 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
         double maxY = max.getY();
         double maxZ = max.getZ();
 
-        if(ConfigManager.invertBoxColorPlayerInside.get() &&
+        if (ConfigManager.invertBoxColorPlayerInside.get() &&
                 playerInsideBoundingBox(minX, minY, minZ, maxX, maxY, maxZ)) {
             color = new Color(255 - color.getRed(), 255 - color.getGreen(), 255 - color.getBlue());
         }
 
-        Renderer renderer = Renderer.startQuads()
+        Renderer renderer = rendererSupplier.get()
                 .setColor(color)
                 .setAlpha(alpha);
 
-        if(minX != maxX && minZ != maxZ) {
+        if (minX != maxX && minZ != maxZ) {
             renderer.addPoint(minX, minY, minZ)
                     .addPoint(maxX, minY, minZ)
                     .addPoint(maxX, minY, maxZ)
@@ -61,26 +62,26 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
             }
         }
 
-        if(minX != maxX && minY != maxY) {
+        if (minX != maxX && minY != maxY) {
             renderer.addPoint(minX, minY, maxZ)
                     .addPoint(minX, maxY, maxZ)
                     .addPoint(maxX, maxY, maxZ)
                     .addPoint(maxX, minY, maxZ);
 
-            if(minZ != maxZ) {
+            if (minZ != maxZ) {
                 renderer.addPoint(minX, minY, minZ)
                         .addPoint(minX, maxY, minZ)
                         .addPoint(maxX, maxY, minZ)
                         .addPoint(maxX, minY, minZ);
             }
         }
-        if(minY != maxY && minZ != maxZ) {
+        if (minY != maxY && minZ != maxZ) {
             renderer.addPoint(minX, minY, minZ)
                     .addPoint(minX, minY, maxZ)
                     .addPoint(minX, maxY, maxZ)
                     .addPoint(minX, maxY, minZ);
 
-            if(minX != maxX) {
+            if (minX != maxX) {
                 renderer.addPoint(maxX, minY, minZ)
                         .addPoint(maxX, minY, maxZ)
                         .addPoint(maxX, maxY, maxZ)
@@ -104,9 +105,11 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
     }
 
     void renderFilledFaces(OffsetPoint min, OffsetPoint max, Color color, int alpha) {
+        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);
+        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);
@@ -115,6 +118,7 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
     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());
@@ -123,12 +127,9 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
         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.glDisable(GL11.GL_DEPTH_TEST);
-        GL11.glEnable(GL11.GL_DEPTH_TEST);
         GL11.glDepthMask(true);
         float top = -(fontRenderer.FONT_HEIGHT * texts.length) / 2f;
         for (String text : texts) {
@@ -139,6 +140,7 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_BLEND);
         GL11.glPopMatrix();
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
     }
 
     void renderSphere(Point center, double radius, Color color, int density, int dotSize) {
@@ -162,7 +164,7 @@ public abstract class AbstractRenderer<T extends AbstractBoundingBox> {
     }
 
     private void renderCircle(Point center, double radius, Color color, int segments, double dy) {
-        Renderer renderer = Renderer.startCircle()
+        Renderer renderer = Renderer.startLineLoop()
                 .setColor(color);
 
         for (int a = 0; a < 360; a += 360 / segments) {