Continue to refactor zoning to be more stream-based

src/Dodge/Room/Corridor.hs

@@ -20,7 +20,7 @@ corridor :: Room
 corridor = defaultRoom
     { _rmPolys = [poly]
     , _rmLinks = lnks'
-    , _rmPath  = concatMap (doublePair . (,) (V2 20 60) . fst) lnks
+    , _rmPath  = foldMap (doublePairSet . (,) (V2 20 60) . fst) lnks
     , _rmPmnts = [ spanLightI (V2 0 39.5) (V2 40 39.5) ]
     , _rmBound = [ rectNSWE 50 30 (-5) 45 ]
     , _rmFloor = Tiled [makeTileFromPoly poly 2]  
@@ -43,7 +43,7 @@ corridor = defaultRoom
         ]
 keyholeCorridor :: Room
 keyholeCorridor = corridor
-    { _rmPath  = []
+    { _rmPath  = mempty
     , _rmPmnts = 
         [ midWall $ rectNSWE top bot 15 0 
         , midWall $ rectNSWE top bot 40 25]
@@ -65,7 +65,7 @@ corridorN = defaultRoom
     where lnks = [uncurry outLink (V2 20 70  ,0)
                  ,uncurry inLink (V2 20 10  ,pi)
                  ]
-          pth = doublePair (V2 20 70,V2 20 10)
+          pth = doublePairSet (V2 20 70,V2 20 10)
 corridorWallN :: Room
 corridorWallN = defaultRoom
     { _rmPolys = [rectNSWE 70 0 0 40
@@ -79,15 +79,16 @@ corridorWallN = defaultRoom
     lnks = [uncurry outLink(V2 20 70  ,0)
                  ,uncurry inLink(V2 20 10  ,pi)
                  ]
-    pth = doublePair (V2 20 70,V2 20 10)
+    pth = doublePairSet (V2 20 70,V2 20 10)
 
+-- this should be combined with tWest
 tEast :: Room
 tEast = defaultRoom
     { _rmPolys = [rectNSWE 80 0  (-20) 20
                  ,rectNSWE 80 40 (-40) 40
                  ]
     , _rmLinks = lnks'
-    , _rmPath  = concatMap (doublePair . (,) (V2 0 60) . fst) lnks
+    , _rmPath  = foldMap (doublePairSet . (,) (V2 0 60) . fst) lnks
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 70 10 0 40 ]
     , _rmName = "tEast"
@@ -109,7 +110,7 @@ tWest = defaultRoom
                  ,rectNSWE 80 40 (-40) 40
                  ]
     , _rmLinks = lnks
-    , _rmPath  = concatMap (doublePair . (V2 0 60 ,) . _rlPos) lnks
+    , _rmPath  = foldMap (doublePairSet . (V2 0 60 ,) . _rlPos) lnks
     , _rmPmnts    = []
     , _rmBound = [ rectNSWE 70 10 0 40 ]
     , _rmName = "tWest"