diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 95670c125..fc8d2b48b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -12,6 +12,7 @@ package vazkii.botania.client.core.handler; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; @@ -60,6 +61,10 @@ public final class BlockHighlightRenderHandler { RayTraceResult pos = mc.objectMouseOver; MatrixStack ms = event.getMatrixStack(); IRenderTypeBuffer.Impl buffers = IRenderTypeBuffer.immediate(Tessellator.getInstance().getBuffer()); + /* Needed because RenderState.CullState doesn't actually disable if you pass false, it keeps the current state. + And we go into this method with cull enabled. + */ + RenderSystem.disableCull(); ms.push(); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index fc44ca29a..f564ab41d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -98,11 +98,11 @@ public final class RenderHelper { .writeMaskState(colorMask) .transparency(lightningTransparency) .build(false); - STAR = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState); + STAR = RenderType.of(LibResources.PREFIX_MOD + "star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, false, glState); glState = RenderType.State.builder().transparency(translucentTransparency).cull(disableCull).build(false); RECTANGLE = RenderType.of(LibResources.PREFIX_MOD + "rectangle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState); - CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, false, true, glState); + CIRCLE = RenderType.of(LibResources.PREFIX_MOD + "circle_highlight", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, false, glState); glState = RenderType.State.builder().lineWidth(new RenderState.LineState(OptionalDouble.of(1))).layering(projectionLayering).transparency(translucentTransparency).writeMaskState(colorMask).build(false); LINE_1 = RenderType.of(LibResources.PREFIX_MOD + "line_1", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 128, glState); @@ -224,16 +224,14 @@ public final class RenderHelper { } /** - * With a buffer in GL_QUADS mode, emulates GL_TRIANGLE_FAN on the CPU. + * With a buffer in GL_TRIANGLES mode, emulates GL_TRIANGLE_FAN on the CPU. * This is because batching of GL_TRIANGLE_FAN makes no sense (the vertices would bleed into one massive fan) - * Uses GL_QUADS instead of GL_TRIANGLE and repeats the final vertex because Minecraft BufferBuilders assume quads :( */ public static void triangleFan(Runnable center, List vertices) { for (int i = 0; i < vertices.size() - 1; i++) { center.run(); vertices.get(i).run(); vertices.get(i + 1).run(); - vertices.get(i + 1).run(); } }