From db62de75d8012b8bb46c38e31f7f671be63ea130 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 14 Nov 2025 10:53:53 +0000 Subject: [PATCH] Tweak --- shader/pull/window.frag | 1 + src/Dodge/Creature/Picture.hs | 3 ++- src/Dodge/Render.hs | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/shader/pull/window.frag b/shader/pull/window.frag index 58d9a9ede..83cb12cf2 100644 --- a/shader/pull/window.frag +++ b/shader/pull/window.frag @@ -1,6 +1,7 @@ #version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; +layout(binding = 3) uniform sampler2D cloudpos; in vec4 vCol; in vec4 vPos; void main() diff --git a/src/Dodge/Creature/Picture.hs b/src/Dodge/Creature/Picture.hs index ec2a3fa55..9829564b5 100644 --- a/src/Dodge/Creature/Picture.hs +++ b/src/Dodge/Creature/Picture.hs @@ -97,7 +97,8 @@ scalp cr = overPosSH (translateToES cr OnHead) fhead -- | oneH cr = rotateSH 0.5 $ translateSHxy 2.5 0 fhead -- | otherwise = translateSHxy 2.5 0 fhead where - fhead = colorSH (greyN 0.9) . upperPrismPolyHalfST 5 $ polyCirc 3 5 + fhead = (colorSH (greyN 0.9) . upperPrismPolyHalfST 5 $ polyCirc 3 5) + & each . sfShadowImportance .~ Unimportant torso :: Creature -> Shape {-# INLINE torso #-} diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index 9c5ef4d67..96d4e39d7 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -295,6 +295,7 @@ doDrawing' win pdata u = do pdata --draw windows onto window buffer glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboWindow . _1 . unFBO) + glBindTextureUnit 3 (pdata ^. fboPos . _2 . unTO) withArray [GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1] $ glNamedFramebufferDrawBuffers (pdata ^. fboWindow . _1 . unFBO) 2 withArray [0, 0, 0, 0] $ @@ -304,9 +305,9 @@ doDrawing' win pdata u = do glEnable GL_CULL_FACE glEnable GL_DEPTH_CLAMP glDepthFunc GL_LEQUAL - glDisable GL_BLEND - -- glDepthFunc GL_ALWAYS - -- glDisable GL_CULL_FACE + glDepthMask GL_FALSE + glEnable GL_BLEND + glBlendFunc GL_SRC_ALPHA GL_ONE glUseProgram $ pdata ^. windowPullShader glBindVertexArray $ pdata ^. dummyVAO . vaoName glDrawArrays GL_TRIANGLES 0 (fromIntegral nWins * 6)