Various improvements, metal debris

src/Dodge/Placement/PlaceSpot.hs

@@ -23,6 +23,7 @@ import Shape
 import qualified IntMapHelp as IM
 import Color
 
+import Data.Foldable
 import Data.Maybe
 import System.Random
 import Control.Monad.State
@@ -101,8 +102,8 @@ placeSpotID ps pt w = case pt of
     RandPS      rgn         -> evaluateRandPS rgn ps w
     PutDoor     col f   pss -> plDoor col f (map (bimap doShift doShift) pss) w
     PutCoord    cp          -> plNewID   coordinates (doShift cp) w
-    PutSlideDr  pth col dr off  a   b 
-                            -> plSlideDoor pth col dr off (doShift a) (doShift b) w
+    PutSlideDr  wl dr off  a   b 
+                            -> plSlideDoor wl dr off (doShift a) (doShift b) w
     PutBlock    bl wl  ps'  -> placeBlock (map doShift ps') (bl & blPos %~ doShift & blDir .~ rot)
                                     wl w
     PutLineBlock wl wdth dpth a b -> placeLineBlock wl wdth dpth (doShift a) (doShift b) w
@@ -129,18 +130,18 @@ evaluateRandPS rgen ps w = placeSpotID ps evaluatedType (set randGen g w)
     (evaluatedType, g) = runState rgen (_randGen w)
 
 placeWallPoly :: [Point2] -> Wall -> World -> World
-placeWallPoly ps wl = rmCrossPaths . over walls (addWalls ps wl)
+placeWallPoly ps wl = rmCrossPaths . over walls (placeWalls ps wl)
   where
     rmCrossPaths w = foldr (uncurry removePathsCrossing) w $ loopPairs ps
 
-addWalls :: [Point2] -> Wall -> IM.IntMap Wall -> IM.IntMap Wall
-addWalls qs wl wls = foldr (addPane wl) wls pairs
+placeWalls :: [Point2] -> Wall -> IM.IntMap Wall -> IM.IntMap Wall
+placeWalls qs wl wls = foldl' (addPane wl) wls pairs
   where 
     (p:ps) = orderPolygon qs
     pairs = zip (ps ++ [p]) (p:ps)
 
-addPane :: Wall -> (Point2,Point2) -> IM.IntMap Wall -> IM.IntMap Wall
-addPane wl l wls = IM.insert wlid (wl { _wlLine = l, _wlID = wlid }) wls
+addPane :: Wall -> IM.IntMap Wall -> (Point2,Point2) -> IM.IntMap Wall
+addPane wl wls l = IM.insert wlid (wl { _wlLine = l, _wlID = wlid }) wls
   where
     wlid = IM.newKey wls