Improve normal maps on ground and walls

src/Dodge/Render/Walls.hs

@@ -13,19 +13,17 @@ import Dodge.Wall.Draw
 import Geometry
 import ShapePicture
 
-wallsToDraw :: World -> ([((Point2, Point2), Point4)], [((Point2, Point2), Point4)], SPic)
-wallsToDraw w =
-    (wls, wins, spic)
-  where
-    f wl = (_wlLine wl, _wlColor wl)
-    (wls, wins, spic) =
-        L.fold
-            ( (,,)
+wallsToDraw :: World -> ([((Point2, Point2), Point4)], [((Point2, Point2), Point4)], SPic, [Wall])
+wallsToDraw w = L.fold
+            ( (,,,)
                 <$> L.prefilter wlOpaqueDraw (L.premap f L.list)
                 <*> L.prefilter wlSeeThroughDraw (L.premap f L.list)
                 <*> L.premap getWallSPic L.mconcat
+                <*> L.prefilter wlOpaqueDraw L.list
             )
             (w ^. cWorld . lWorld . walls)
+  where
+    f wl = (_wlLine wl, _wlColor wl)
 --            (wlsFromIXs w $ zonesExtract (w ^. wlZoning) $ zoneOfSight wlZoneSize cam)
 --    cam = w ^. cWorld . camPos