Move zoning up world spheres

src/Dodge/Layout.hs

@@ -4,7 +4,6 @@ module Dodge.Layout (
 ) where
 
 import qualified Control.Foldl as L
-import Dodge.Item.Location.Initialize
 import Control.Lens
 import Data.Foldable
 import Data.Function
@@ -16,6 +15,7 @@ import Data.Traversable
 import Dodge.Data.GenWorld
 import Dodge.Default.Wall
 import Dodge.GameRoom
+import Dodge.Item.Location.Initialize
 import Dodge.LevelGen.LevelStructure
 import Dodge.LevelGen.StaticWalls
 import Dodge.Path
@@ -45,8 +45,8 @@ generateLevelFromRoomList gr' w =
         $ w & cWorld . lWorld . walls .~ wallsFromRooms rs
             & cWorld . cwGen . cwgGameRooms .~ gameRoomsFromRooms (IM.elems rs')
             & cWorld . lWorld . pathGraph .~ path
-            & cWorld . lWorld . pnZoning .~ foldl' (flip zonePn) mempty (labNodes path)
-            & cWorld . lWorld . peZoning .~ foldl' (flip zonePe) mempty (map fromEdgeTuple $ labEdges path)
+            & pnZoning .~ foldl' (flip zonePn) mempty (labNodes path)
+            & peZoning .~ foldl' (flip zonePe) mempty (map fromEdgeTuple $ labEdges path)
   where
     (_, path) = pairsToGraph pairPath'
     pairPath = foldMap _rmPath rs
@@ -54,14 +54,14 @@ generateLevelFromRoomList gr' w =
     rs = map doRoomShift $ IM.elems rs'
     rs' = mapM shuffleRoomPos gr' & evalState $ _randGen w
 
-fromEdgeTuple :: (Int,Int,PathEdge) -> PathEdgeNodes
-fromEdgeTuple (a,b,pe) = PathEdgeNodes a b pe
+fromEdgeTuple :: (Int, Int, PathEdge) -> PathEdgeNodes
+fromEdgeTuple (a, b, pe) = PathEdgeNodes a b pe
 
 randomCompass :: World -> World
 randomCompass w = w & cWorld . camPos . camRot .~ (takeOne [0, 0.5 * pi, pi, 1.5 * pi] & evalState $ _randGen w)
 
 putFloorTiles :: GenWorld -> GenWorld
-putFloorTiles gw = gw & gwWorld . cWorld . lWorld . floorTiles .~ floorsFromGenWorld gw
+putFloorTiles gw = gw & gwWorld . cWorld . floorTiles .~ floorsFromGenWorld gw
 
 setFloors :: GenWorld -> GenWorld
 setFloors = putFloorTiles . setTiles
@@ -139,7 +139,7 @@ setupWorldBounds w =
            )
   where
     f = fromMaybe 0
-    ps = IM.map (fst . _wlLine) $ w ^. cWorld . lWorld . walls-- _walls (_cWorld w)
+    ps = IM.map (fst . _wlLine) $ w ^. cWorld . lWorld . walls -- _walls (_cWorld w)
     (minx, maxx, miny, maxy) =
         L.fold
             ( (,,,)
@@ -150,16 +150,6 @@ setupWorldBounds w =
             )
             ps
 
---polyhedrasToEdges :: [Polyhedra] -> [Point3]
---polyhedrasToEdges = concatMap tflat4 . concatMap polyToEdges
-
-initWallZoning :: World -> World
-initWallZoning w = foldl' (flip insertWallInZones) (w & cWorld . lWorld . wlZoning .~ IM.empty) 
-    (w ^. cWorld . lWorld . walls)
-
---makePath :: Tree Room -> [(Point2,Point2)]
---makePath = concatMap _rmPath . flatten
-
 wallsFromRooms :: [Room] -> IM.IntMap Wall
 wallsFromRooms =
     --    divideWalls .