Merge pull request #147 from Lyzev/146-bug-drop-shadow-alpha

fixed bug

src/main/kotlin/dev/lyzev/api/imgui/render/ImGuiRenderer.kt

@@ -49,8 +49,8 @@ object ImGuiRenderer : EventListener {
     /**
      * The framebuffer used for rendering the blur.
      */
-    private val fbo = WrappedFramebuffer()
-    private val bloom = WrappedFramebuffer()
+    private val fbo = WrappedFramebuffer("ImGuiRendererFBO")
+    private val mask = WrappedFramebuffer("ImGuiRendererMask")
 
     /**
      * Renders ImGui.
@@ -86,7 +86,21 @@ object ImGuiRenderer : EventListener {
         if (ModuleToggleableBlur.isEnabled) {
             fbo.endWrite()
 
-            BlurHelper.draw(fbo, false, true)
+            RenderSystem.disableCull()
+            RenderSystem.defaultBlendFunc()
+            RenderSystem.enableBlend()
+            mask.clear()
+            mask.beginWrite(false)
+            ShaderPassThrough.bind()
+            RenderSystem.activeTexture(GL13.GL_TEXTURE0)
+            fbo.beginRead()
+            ShaderPassThrough["Tex0"] = 0
+            ShaderPassThrough["Scale"] = 1f
+            ShaderPassThrough["Alpha"] = false
+            Shader.drawFullScreen()
+            ShaderPassThrough.unbind()
+
+            BlurHelper.draw(mask, useDefaultFbo = true)
 
             RenderSystem.disableCull()
             RenderSystem.defaultBlendFunc()
@@ -99,6 +113,7 @@ object ImGuiRenderer : EventListener {
             fbo.beginRead()
             ShaderPassThrough["Tex0"] = 0
             ShaderPassThrough["Scale"] = 1f
+            ShaderPassThrough["Alpha"] = true
             Shader.drawFullScreen()
             ShaderPassThrough.unbind()
 

src/main/kotlin/dev/lyzev/api/opengl/shader/Shader.kt

@@ -303,6 +303,7 @@ abstract class ShaderCompute(
         RenderSystem.bindTexture(texture)
         ShaderPassThrough["Tex0"] = 0
         ShaderPassThrough["Scale"] = 1f
+        ShaderPassThrough["Alpha"] = true
         drawFullScreen()
         ShaderPassThrough.unbind()
     }

src/main/kotlin/dev/lyzev/api/opengl/shader/Shaders.kt

@@ -95,7 +95,6 @@ object ShaderLinearizeDepth : ShaderVertexFragment("LinearizeDepth")
 
 object ShaderThreshold : ShaderVertexFragment("Threshold")
 object ShaderBlend : ShaderVertexFragment("Blend")
-object ShaderFlip : ShaderVertexFragment("Flip")
 
 object ShaderReflection : ShaderVertexFragment("Reflection")
 
@@ -268,6 +267,7 @@ object ShaderGameOfLife : ShaderCompute("GameOfLife", 32, 1, 1) {
             after.beginRead()
             ShaderPassThrough["Tex0"] = 0
             ShaderPassThrough["Scale"] = 1f
+            ShaderPassThrough["Alpha"] = true
             drawFullScreen()
             ShaderPassThrough.unbind()
         }
@@ -307,8 +307,8 @@ object ShaderGameOfLife : ShaderCompute("GameOfLife", 32, 1, 1) {
 
     override fun init() {
         super.init()
-        before = WrappedFramebuffer(size, linear = false)
-        after = WrappedFramebuffer(size, linear = false)
+        before = WrappedFramebuffer("GameOfLife+Before", size, linear = false)
+        after = WrappedFramebuffer("GameOfLife+After", size, linear = false)
         queueGenPixels = true
     }
 

src/main/kotlin/dev/lyzev/schizoid/feature/features/module/modules/render/ModuleToggleableMediaPlayer.kt

@@ -268,6 +268,7 @@ object ModuleToggleableMediaPlayer : ModuleToggleableRenderImGuiContent(
                     BlurHelper.mode.blur.output.beginRead()
                     ShaderPassThrough["Tex0"] = 0
                     ShaderPassThrough["Scale"] = 1f
+                    ShaderPassThrough["Alpha"] = true
                     Shader.drawFullScreen()
                     ShaderPassThrough.unbind()
                     mc.framebuffer.beginWrite(true)

src/main/kotlin/dev/lyzev/schizoid/feature/features/module/modules/render/ModuleToggleableRearView.kt

@@ -5,11 +5,8 @@
 
 package dev.lyzev.schizoid.feature.features.module.modules.render
 
-import com.mojang.blaze3d.systems.RenderSystem
 import dev.lyzev.api.opengl.WrappedFramebuffer
 import dev.lyzev.api.opengl.clear
-import dev.lyzev.api.opengl.shader.Shader
-import dev.lyzev.api.opengl.shader.ShaderFlip
 import dev.lyzev.api.setting.settings.slider
 import dev.lyzev.schizoid.Schizoid
 import dev.lyzev.schizoid.feature.IFeature
@@ -18,7 +15,6 @@ import imgui.ImGui.*
 import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.client.MinecraftClient
 import net.minecraft.util.Util
-import org.lwjgl.opengl.GL13
 import kotlin.math.ceil
 
 object ModuleToggleableRearView :
@@ -31,7 +27,6 @@ object ModuleToggleableRearView :
     val size by slider("Size", "The size of the rear view.", 15, 5, 100, "%%")
 
     private val rearView = WrappedFramebuffer(useDepth = true)
-    private val flippedRearView = WrappedFramebuffer()
 
     // net/minecraft/client/MinecraftClient takePanorama (Ljava/io/File;II)Lnet/minecraft/text/Text;
     private fun renderRearView(width: Int, height: Int) {
@@ -57,30 +52,13 @@ object ModuleToggleableRearView :
 
             if (rearView.viewportWidth != width || rearView.viewportHeight != height)
                 rearView.resize(width, height, MinecraftClient.IS_SYSTEM_MAC)
-            if (flippedRearView.viewportWidth != width || flippedRearView.viewportHeight != height)
-                flippedRearView.resize(width, height, MinecraftClient.IS_SYSTEM_MAC)
 
             rearView.clear()
             rearView.beginWrite(true)
             mc.gameRenderer.renderWorld(
                 if (mc.paused) mc.pausedTickDelta else mc.renderTickCounter.tickDelta,
                 Util.getMeasuringTimeNano()
             )
-
-            RenderSystem.disableCull()
-            RenderSystem.defaultBlendFunc()
-            RenderSystem.enableBlend()
-
-            flippedRearView.clear()
-            flippedRearView.beginWrite(true)
-            ShaderFlip.bind()
-            RenderSystem.activeTexture(GL13.GL_TEXTURE0)
-            rearView.beginRead()
-            ShaderFlip["Tex0"] = 0
-            Shader.drawFullScreen()
-            ShaderFlip.unbind()
-
-            RenderSystem.enableCull()
         } catch (e: Exception) {
             Schizoid.logger.error(e)
         } finally {
@@ -103,7 +81,7 @@ object ModuleToggleableRearView :
         renderRearView(width.toInt(), height.toInt())
         val cursorPos = getCursorScreenPos()
         dummy(width, height)
-        getWindowDrawList().addImageRounded(flippedRearView.colorAttachment, cursorPos.x, cursorPos.y, cursorPos.x + width, cursorPos.y + height, 0f, 0f, 1f, 1f, -1, 5f)
+        getWindowDrawList().addImageRounded(rearView.colorAttachment, cursorPos.x, cursorPos.y, cursorPos.x + width, cursorPos.y + height, 0f, 1f, 1f, 0f, -1, 5f)
     }
 
     override val shouldHandleEvents: Boolean

src/main/resources/assets/schizoid/shaders/core/Add/Add_FP.glsl

@@ -14,10 +14,10 @@ uniform bool Alpha;
 
 void main() {
     color = texture(Tex1, uv);
-    if (color.a == 0) {
+    if (color.a == 0.0) {
         color = texture(Tex0, uv);
     }
-    if (!Alpha && color.a > 0) {
-        color.a = 1;
+    if (!Alpha && color.a > 0.0) {
+        color.a = 1.0;
     }
 }

src/main/resources/assets/schizoid/shaders/core/PassThrough/PassThrough_FP.glsl

@@ -9,7 +9,11 @@ in vec2 uv;
 out vec4 color;
 
 uniform sampler2D Tex0;
+uniform bool Alpha;
 
 void main() {
     color = texture(Tex0, uv);
+    if (!Alpha && color.a > 0.0) {
+        color.a = 1.0;
+    }
 }