Separate out concrete part of world

src/Dodge/Path.hs

@@ -34,13 +34,13 @@ import qualified Streaming.Prelude as S
 --import Data.Graph.Inductive.Graph hiding ((&))
 
 getNodePos :: Int -> World -> Maybe Point2
-getNodePos i w = _pathGraph w `lab` i
+getNodePos i w = _pathGraph (_cWorld w) `lab` i
 
 makePathBetween :: Point2 -> Point2 -> World -> Maybe [Int]
 makePathBetween a b w = do -- join $ sp <$> a' <*> b' <*> return (_pathGraph w)
     na <- walkableNodeNear w a
     nb <- walkableNodeNear w b
-    sp na nb (second _peDist (efilter (not . pathEdgeObstructed . (^. _3)) $ _pathGraph w))
+    sp na nb (second _peDist (efilter (not . pathEdgeObstructed . (^. _3)) $ _pathGraph (_cWorld w)))
 
 pathEdgeObstructed :: PathEdge -> Bool
 pathEdgeObstructed pe = DoorObstacle `Set.member` obs || BlockObstacle `Set.member` obs
@@ -53,15 +53,15 @@ walkableNodeNear :: World -> Point2 -> Maybe Int
 walkableNodeNear w p = fmap fst . find (flip (isWalkable p) w . snd) $ nodesNear
   where
     --nodesNear = runIdentity . S.toList_ $ nearPoint _pnZoning p w
-    nodesNear = zonesExtract (w ^. pnZoning) $ zonesAroundPoint pnZoneSize p
+    nodesNear = zonesExtract (w ^. cWorld . pnZoning) $ zonesAroundPoint pnZoneSize p
 
 makePathBetweenPs :: Point2 -> Point2 -> World -> Maybe [Point2]
-makePathBetweenPs a b w = mapMaybe (lab $ _pathGraph w) <$> makePathBetween a b w
+makePathBetweenPs a b w = mapMaybe (lab $ _pathGraph (_cWorld w)) <$> makePathBetween a b w
 
 bfsNodePoints :: Int -> World -> [Point2]
 bfsNodePoints n w = mapMaybe (lab g) $ bfs n g
   where
-    g = _pathGraph w
+    g = _pathGraph (_cWorld w)
 
 
 pointTowardsImpulse :: Point2 -> Point2 -> World -> Maybe Point2
@@ -137,7 +137,7 @@ addEdges nodemap gr = runIdentity . S.fold_ f (mempty,gr) id
 
 obstructPathsCrossing :: EdgeObstacle -> Point2 -> Point2 -> World -> ( World, [(Int,Int,PathEdge)])
 obstructPathsCrossing obstacletype sp' ep w = 
-    ( w & pathGraph %~ updateedges
+    ( w & cWorld . pathGraph %~ updateedges
     , es
     )
   where