Tweak rendering

src/Dodge/Render.hs

@@ -57,7 +57,7 @@ doDrawing pdata w = do
         wallPoints = map fst wallPointsCol
     -- set the coordinate uniform ready for drawing elements using world coordinates
     bufferUBO $ perspectiveMatrixb rot camzoom trans wins viewFroms
-    bindFramebuffer Framebuffer $= (fst $ head $ fst $ _fbos pdata)
+    bindFramebuffer Framebuffer $= (fst $ _fboBase pdata)
     clearColor $= Color4 0 0 0 0
     clear [ColorBuffer,DepthBuffer]
     depthFunc $= Just Less
@@ -69,7 +69,7 @@ doDrawing pdata w = do
     _ <- renderFoldable pdata $ picToLTree (Just 0) pic
     _ <- renderShader (_textureArrayShader pdata) (_floorTiles w)
 
-    bindFramebuffer Framebuffer $= (fst $ (fst $ _fbos pdata) !! 1)
+    bindFramebuffer Framebuffer $= (fst $ _fboBloom pdata)
     clear [ColorBuffer]
     blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
     _ <- renderFoldable pdata $ picToLTree (Just 1) pic
@@ -80,43 +80,43 @@ doDrawing pdata w = do
 
     depthMask $= Enabled
 
-    bindFramebuffer Framebuffer $= (fst $ (fst $ _fbos pdata) !! 2)
+    bindFramebuffer Framebuffer $= (fst $ _fboLighting pdata)
     let scPol = screenPolygon w
     createLightMap pdata (w ^. config . shadow_resolution) wallPoints lightPoints
         (foregroundPics w) scPol
     colorMask $= Color4 Enabled Enabled Enabled Enabled
-    depthMask $= Enabled
     clearColor $= Color4 0 0 0 0
 
     bindShaderBuffers [_fullscreenShader pdata] [4]
 
     --bindFramebuffer Framebuffer $= defaultFramebufferObject
     blend $= Disabled
+    depthMask $= Disabled
     depthFunc $= Just Always
     --textureBinding Texture2D $= Just (snd $ head $ fst $ _fbos pdata)
     --drawShader (_fullscreenShader pdata) 4
 
-    bindFramebuffer Framebuffer $= (fst $ head $ fst $ _fbos pdata)
+    bindFramebuffer Framebuffer $= (fst $ _fboBase pdata)
     --drawShader (_fullscreenShader pdata) 4
     --textureBinding Texture2D $= Just (snd3 $ _fbo2 pdata)
-    textureBinding Texture2D $= Just (snd $ (fst $ _fbos pdata) !! 2)
+    textureBinding Texture2D $= Just (snd $ _fboLighting pdata)
     textureFilter Texture2D $= ((Linear',Just Linear') , Linear')
     generateMipmap' Texture2D
     blend $= Enabled
     blendFunc $= (Zero, OneMinusSrcAlpha)
     drawShader (_fullscreenShader pdata) 4
     blendFunc $= (SrcAlpha, OneMinusSrcAlpha)
-    textureBinding Texture2D $= Just (snd $ (fst $ _fbos pdata) !! 1)
+    textureBinding Texture2D $= Just (snd $ _fboBloom pdata)
     drawShader (_fullscreenShader pdata) 4
 
-    depthFunc $= Just Less
-    --_ <- renderFoldable pdata $ picToLTree (Just 2) pic
+    depthFunc $= Just Lequal
+    _ <- renderFoldable pdata $ picToLTree (Just 2) pic
     renderBlankWalls pdata windowPoints
 
     depthFunc $= Just Always
     bindFramebuffer Framebuffer $= defaultFramebufferObject
     clear [ColorBuffer]
-    textureBinding Texture2D $= Just (snd $ head $ fst $ _fbos pdata)
+    textureBinding Texture2D $= Just (snd $ _fboBase pdata)
     drawShader (_fullscreenShader pdata) 4
 
     -- draw overlay