Refactor lighting shaders

src/Dodge/Render.hs

@@ -51,7 +51,7 @@ doDrawing pdata w = do
         wins    = (getWindowX w,getWindowY w)
         wallPointsCol   = wallsPointsAndCols w
         windowPoints    = wallsWindows w
-        lightPoints     = lightsForGloom' w
+        lightPoints     = lightsForGloom w
         viewFroms@(viewFromx,viewFromy) = _cameraViewFrom w
         pic = worldPictures w
         wallPoints = map fst wallPointsCol
@@ -63,16 +63,13 @@ doDrawing pdata w = do
     -- draw the lightmap. Probably changes the bound framebufferObject
     createLightMap pdata (w ^. config . shadow_resolution) wallPoints lightPoints viewFroms
         (foregroundPics w)
-
-    -- draw the background. Assumes that depth testing is not enabled or that
-    -- the depth buffer is ready to be drawn on
+    clear [DepthBuffer]
+    depthFunc $= Just Less
+    -- set blending to depend upon the alpha level already present
     blendFuncSeparate    $= ((SrcAlphaSaturate, OneMinusSrcAlpha), (Zero,One))
-    renderBackground pdata rot camzoom trans wins
-
     _ <- renderShader (_textureArrayShader pdata) (_floorTiles w)
 
     -- draw the walls
-    depthFunc $= Just Less
     if w ^. config . wall_textured
         then renderTextureWalls pdata wallPointsCol
         else renderBlankWalls pdata wallPointsCol