From 0eb2fe50a614b8f835f09c6256a723384d0e025f Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 14 Nov 2025 11:06:39 +0000 Subject: [PATCH] Don't draw shadowed walls --- src/Dodge/Render.hs | 4 ---- src/Dodge/Render/Walls.hs | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index 96d4e39d7..b2acca88c 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -330,10 +330,6 @@ doDrawing' win pdata u = do -- bind base buffer for drawing clouds and bloom glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboBase . _1 . unFBO) - -- --draw shadowed clouds onto base buffer - -- glBindTextureUnit 0 (pdata ^. fboCloud . _2 . _1 . unTO) - -- drawShader (_fullscreenShader pdata) 4 - glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -- --draw windows onto base buffer glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA diff --git a/src/Dodge/Render/Walls.hs b/src/Dodge/Render/Walls.hs index 0d42c3ee4..634bbec0a 100644 --- a/src/Dodge/Render/Walls.hs +++ b/src/Dodge/Render/Walls.hs @@ -45,10 +45,12 @@ wallsToDraw w = -- g (V2 i j) = w ^? wlZoning . znObjects . ix i . ix j wlOpaqueDraw :: Wall -> Bool -wlOpaqueDraw wl = wlIsOpaque wl && _wlHeight wl == 100 +wlOpaqueDraw wl = wlIsOpaque wl && _wlHeight wl == 100 && _wlUnshadowed wl wlSeeThroughDraw :: Wall -> Bool -wlSeeThroughDraw wl = wlIsSeeThrough wl && _wlHeight wl == 100 +wlSeeThroughDraw wl = wlIsSeeThrough wl + && _wlHeight wl == 100 + && _wlUnshadowed wl getWallSPic :: Wall -> SPic getWallSPic wl = case wl ^? wlOpacity . opDraw of