Reduce rendertype down to vertex information

src/Dodge/Render.hs

@@ -79,7 +79,7 @@ doDrawing pdata w = do
         else renderBlankWalls pdata nWalls
     --_ <- renderFoldable pdata $ (picToAlt (Just 0) (polysToPic $ foregroundPics w) :: [RenderType])
     --_ <- renderFoldable pdata $ (picToAlt (Just 0) pic :: [RenderType])
-    _ <- renderFoldable pdata $ map snd (polysToPic $ foregroundPics w)
+-- FIXME    _ <- renderFoldable pdata $ map snd (polysToPic $ foregroundPics w)
 
     --_ <- renderFoldable pdata $ map snd $ filter ((==0).fst) pic
     vnums <- pokeBindFoldableLayer pdata $ pic
@@ -175,7 +175,7 @@ doDrawing pdata w = do
     depthMask $= Disabled
     blend $= Enabled
     blendFunc $= (SrcAlpha,OneMinusSrcAlpha)
-    _ <- renderFoldable pdata $ map snd (fixedCoordPictures w)
+-- FIXME    _ <- renderFoldable pdata $ map snd (fixedCoordPictures w)
     depthMask $= Enabled
 
     eTicks <- SDL.ticks

src/Dodge/Render/Picture.hs

@@ -18,20 +18,19 @@ import Polyhedra.Data
 import Control.Lens
 import Data.Maybe
 import Data.List (partition)
-import qualified Data.IntMap.Strict as IM
+import qualified Data.IntMap.Lazy as IM
 
 worldPictures :: World -> Picture
-worldPictures w = pictures $ concat 
-    [ IM.elems $ _decorations w 
-    , map (dbArg _pjDraw)  . IM.elems $ _projectiles w
-    , map drawItem . IM.elems $ _floorItems w
-    , map (crDraw w) . IM.elems $ _creatures w
-    , map clDraw   . reverse $ _clouds w
-    , map ppDraw   . IM.elems $ _pressPlates w
-    , map btDraw (IM.elems (_buttons w))
-    , map (dbArg _ptDraw) $ _particles w
-    , map drawWallFloor (wallFloorsToDraw w)
-    , testPic w
+worldPictures w = 
+    concat (IM.elems $ _decorations w) ++ testPic w ++ concat
+    [ concatMap (dbArg _pjDraw)  . IM.elems $ _projectiles w
+    , concatMap drawItem . IM.elems $ _floorItems w
+    , concatMap (crDraw w) . IM.elems $ _creatures w
+    , concatMap clDraw   . reverse $ _clouds w
+    , concatMap ppDraw   . IM.elems $ _pressPlates w
+    , concatMap btDraw (IM.elems (_buttons w))
+    , concatMap (dbArg _ptDraw) $ _particles w
+    , concatMap drawWallFloor (wallFloorsToDraw w)
     ]
 foregroundPics :: World -> [Polyhedra]
 foregroundPics = _foregroundDecorations
@@ -53,8 +52,8 @@ customMouseCursor w =
     . color white
     $ pictures [ line [(-5,0),(5,0)] , line [(0,-5),(0,5)] ]
 
-testPic :: World -> [Picture]
-testPic _ = [blank]
+testPic :: World -> Picture
+testPic _ = blank
 --    [ setDepth (-1) . translate 0 0.8
 --        . scale 0.001 0.001 . text . show $ _crMvDir $ you w
 --    ]