Separate out concrete part of world

src/Dodge/Base/Collide.hs

@@ -161,7 +161,7 @@ allVisibleWalls :: World -> [(Point2,Wall)]
 {-# INLINE allVisibleWalls #-}
 allVisibleWalls w = concatMap (flip (visibleWalls vPos) w . (+.+ vPos)) $ nRays 20
   where
-    vPos = _cameraViewFrom w
+    vPos = _cameraViewFrom $ _cWorld w
 
 --allVisibleWalls :: World -> StreamOf (Point2,Wall)
 --{-# INLINE allVisibleWalls #-}
@@ -242,7 +242,7 @@ circOnAnyCr :: Point2 -> Float -> World -> Bool
 {-# INLINE circOnAnyCr #-}
 circOnAnyCr p r w = IS.foldr f False $ crIXsNearPoint p w
   where
-    f cid bl = maybe False (\cr -> dist p (_crPos cr) < r + _crRad cr) (w ^? creatures . ix cid) || bl
+    f cid bl = maybe False (\cr -> dist p (_crPos cr) < r + _crRad cr) (w ^? cWorld . creatures . ix cid) || bl
 
 {- | More general collision tests follow -}
 
@@ -274,22 +274,22 @@ canSee :: Int -> Int -> World -> Bool
 {-# INLINE canSee #-}
 canSee i j w = hasLOS p1 p2 w
   where 
-    p1 = _crPos (_creatures w IM.! i)
-    p2 = _crPos (_creatures w IM.! j)
+    p1 = _crPos (_creatures (_cWorld w) IM.! i)
+    p2 = _crPos (_creatures (_cWorld w) IM.! j)  -- unsafe
 
 canSeeIndirect :: Int -> Int -> World -> Bool
 {-# INLINE canSeeIndirect #-}
 canSeeIndirect i j w = hasLOSIndirect ipos jpos w
   where 
-    ipos = _crPos (_creatures w IM.! i)
-    jpos = _crPos (_creatures w IM.! j)
+    ipos = _crPos (_creatures (_cWorld w) IM.! i)
+    jpos = _crPos (_creatures (_cWorld w) IM.! j)
 
 anythingHitCirc :: Float -> Point2 -> Point2 -> World -> Bool
 anythingHitCirc rad sp ep w = hitCr || isJust (sequence hitWl)
   where
     hitCr    = IS.foldr f False $ crsNearSeg sp ep w
     f cid bl = maybe False (\cr -> null $ intersectCircSeg (_crPos cr) (rad + _crRad cr) sp ep)
-            (w ^? creatures . ix cid)
+            (w ^? cWorld . creatures . ix cid)
         || bl
 
     hitWl    = collideCircWalls sp ep rad $ wlsNearPoint ep w