Replace PutShape with PutForeground

src/Dodge/Placement/Instance/LightSource.hs

@@ -55,7 +55,7 @@ mntLSOn
     -> Maybe Color  -- ^ describing a possible color override for the shape
     -> LightSource -> Point2 -> Point3 -> (Placement -> Maybe Placement) -> Placement
 mntLSOn shapeF mcol ls wallp lsp@(V3 lx ly _)
-    = ps0jPushPS (PutShape . setCol $ shapeF wallp lsp)
+    = ps0jPushPS (putShape . setCol $ shapeF wallp lsp)
     . pt0 (PutLS $ ls & lsParam . lsPos .~ lsp')
   where
     lsp' = lsp -.-.- V3 x y 1
@@ -144,26 +144,26 @@ mntLightLnkCond ps = RandomPlacement $ do
 
 spanLSLightI :: LightSource -> Float -> Point2 -> Point2 -> Placement
 spanLSLightI ls h a b = ps0j (PutLS $ ls & lsParam . lsPos .~ V3 x y h)
-    $ sps0 $ PutShape $ thinHighBar h a b
+    $ sps0 $ putShape $ thinHighBar h a b
   where
     V2 x y = 0.5 *.* (a +.+ b)
 
 spanLS :: LightSource -> Point2 -> Point2 -> Placement
 spanLS ls a b = Placement 10 (PS (V2 x y) 0) (PutLS ls) Nothing
-    $ const $ const $ Just $ sps0 $ PutShape $ thinHighBar h a b
+    $ const $ const $ Just $ sps0 $ putShape $ thinHighBar h a b
   where
     V3 _ _ h = _lsPos (_lsParam ls) + 5
     V2 x y = 0.5 *.* (a +.+ b)
 
 spanColLightI :: Point3 -> Float -> Point2 -> Point2 -> Placement
 spanColLightI col h a b = ps0j (PutLS $ lsColPos col (V3 x y (h-5)))
-    $ sps0 $ PutShape $ thinHighBar h a b
+    $ sps0 $ putShape $ thinHighBar h a b
   where
     V2 x y = 0.5 *.* (a +.+ b)
 
 spanColLightBlackI :: Point3 -> Float -> Point2 -> Point2 -> Placement
 spanColLightBlackI col h a b = ps0j (PutLS $ lsColPos col (V3 x y (h-5)))
-    $ sps0 $ PutShape $ colorSH black $ thinHighBar h a b
+    $ sps0 $ putShape $ colorSH black $ thinHighBar h a b
   where
     V2 x y = 0.5 *.* (a +.+ b)
 

src/Dodge/Placement/Instance/Wall.hs

@@ -6,9 +6,7 @@ import Dodge.Default.Block
 --import Dodge.Block.Debris
 import Dodge.LevelGen.Data
 import Dodge.Default.Wall
---import Dodge.Wall.DamageEffect
 import Geometry
-import Shape
 import Color
 
 import Data.List
@@ -26,16 +24,7 @@ invisibleWall ps = sps0 $ PutWall ps $ defaultWall
     }
 
 midWall :: [Point2] -> Placement
-midWall ps = ps0j (PutShape . colorSH col $ upperPrismPoly 50 ps)
-    $ sps0 $ PutWall ps theWall
-  where
-    col = _wlColor defaultWall
-    theWall = defaultWall
-        { _wlOpacity = SeeAbove
-        , _wlDraw = False
-        , _wlHeight = 50
-        }
-
+midWall = heightWallPS (PS 0 0) 50
 
 singleBlock :: Point2 -> [Placement]
 singleBlock a =