diff --git a/src/main/kotlin/dev/exceptionteam/sakura/graphics/RenderSystem.kt b/src/main/kotlin/dev/exceptionteam/sakura/graphics/RenderSystem.kt index 3f7b726..092cb7d 100644 --- a/src/main/kotlin/dev/exceptionteam/sakura/graphics/RenderSystem.kt +++ b/src/main/kotlin/dev/exceptionteam/sakura/graphics/RenderSystem.kt @@ -1,5 +1,6 @@ package dev.exceptionteam.sakura.graphics +import com.mojang.blaze3d.platform.GlStateManager import com.mojang.blaze3d.systems.RenderSystem import com.mojang.math.Axis import dev.exceptionteam.sakura.events.impl.Render2DEvent @@ -105,7 +106,7 @@ object RenderSystem { } private fun postRender() { - GlHelper.blend = false + GlHelper.blend = true GlHelper.depth = true GlHelper.cull = true postFrameBuffer() @@ -141,14 +142,12 @@ object RenderSystem { private var vboLast = -1 private var eboLast = -1 private var lastShader = -1 - private var lastTexture = -1 private fun preAttrib() { vaoLast = glGetInteger(GL_VERTEX_ARRAY_BINDING) vboLast = glGetInteger(GL_ARRAY_BUFFER_BINDING) eboLast = glGetInteger(GL_ELEMENT_ARRAY_BUFFER_BINDING) lastShader = glGetInteger(GL_CURRENT_PROGRAM) - lastTexture = glGetInteger(GL_TEXTURE_BINDING_2D) } private fun postAttrib() { @@ -156,8 +155,11 @@ object RenderSystem { glBindBuffer(GL_ARRAY_BUFFER, vboLast) glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, eboLast) glUseProgram(lastShader) + glActiveTexture(GL_TEXTURE0) - glBindTexture(GL_TEXTURE_2D, lastTexture) + glBindTexture(GL_TEXTURE_2D, GlStateManager.TEXTURES[0].binding) + glActiveTexture(GL_TEXTURE0 + GlStateManager.activeTexture) + glBindTexture(GL_TEXTURE_2D, GlStateManager.TEXTURES[GlStateManager.activeTexture].binding) } } \ No newline at end of file diff --git a/src/main/resources/sakura.accesswidener b/src/main/resources/sakura.accesswidener index d4342d0..8694f9a 100644 --- a/src/main/resources/sakura.accesswidener +++ b/src/main/resources/sakura.accesswidener @@ -1 +1,5 @@ accessWidener v2 named + +accessible field com/mojang/blaze3d/platform/GlStateManager TEXTURES [Lcom/mojang/blaze3d/platform/GlStateManager$TextureState; +accessible field com/mojang/blaze3d/platform/GlStateManager activeTexture I +accessible class com/mojang/blaze3d/platform/GlStateManager$TextureState \ No newline at end of file