Add GL state changes, might fix rendering conflicts

Harry282 · Aug 13, 2024 · 6c3559b · 6c3559b
1 parent 44a1958
commit 6c3559b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/kotlin/funnymap/features/dungeon/MapRenderList.kt b/src/main/kotlin/funnymap/features/dungeon/MapRenderList.kt
@@ -10,6 +10,7 @@ import funnymap.utils.MapUtils
 import funnymap.utils.MapUtils.connectorSize
 import funnymap.utils.MapUtils.halfRoomSize
 import funnymap.utils.MapUtils.roomSize
+import funnymap.utils.RenderUtils
 import funnymap.utils.RenderUtils.darken
 import funnymap.utils.RenderUtils.grayScale
 import funnymap.utils.RenderUtilsGL
@@ -61,6 +62,10 @@ object MapRenderList {
             updateRenderMap()
         }
 
+        GlStateManager.pushMatrix()
+        RenderUtils.preDraw()
+        RenderUtilsGL.preDraw()
+
         mc.mcProfiler.startSection("border")
 
         if (borderGlList != -1) GL11.glCallList(borderGlList)
@@ -81,6 +86,9 @@ object MapRenderList {
         if (roomGlList != -1) GL11.glCallList(roomGlList)
 
         RenderUtilsGL.unbindTexture()
+        RenderUtils.postDraw()
+        RenderUtilsGL.postDraw()
+        GlStateManager.popMatrix()
 
         if (!inBoss) {
             mc.mcProfiler.endStartSection("heads")

diff --git a/src/main/kotlin/funnymap/utils/RenderUtils.kt b/src/main/kotlin/funnymap/utils/RenderUtils.kt
@@ -32,7 +32,7 @@ object RenderUtils {
     val legacyCheckmarks = CheckmarkSet(8, "legacy")
     private val mapIcons = ResourceLocation("funnymap", "marker.png")
 
-    private fun preDraw() {
+    fun preDraw() {
         GlStateManager.enableAlpha()
         GlStateManager.enableBlend()
         GlStateManager.disableDepth()
@@ -41,7 +41,7 @@ object RenderUtils {
         GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0)
     }
 
-    private fun postDraw() {
+    fun postDraw() {
         GlStateManager.disableBlend()
         GlStateManager.enableDepth()
         GlStateManager.enableTexture2D()