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

src/Dodge/Base/Coordinate.hs

@@ -7,31 +7,31 @@ import Geometry
 worldPosToScreenNorm :: Configuration -> World -> Point2 -> Point2
 worldPosToScreenNorm cfig w = doWindowScale cfig . doRotate . doZoom . doTranslate
   where
-    doTranslate p = p -.- _cameraCenter w
-    doZoom p      = _cameraZoom w *.* p
-    doRotate p    = rotateV (negate $ _cameraRot w) p
+    doTranslate p = p -.- _cameraCenter (_cWorld w)
+    doZoom p      = _cameraZoom (_cWorld w) *.* p
+    doRotate p    = rotateV (negate $ _cameraRot (_cWorld w)) p
 {- | Transform world coordinates to scaled screen coordinates. 
  - These have to be scaled according to the size of the window to get actual screen positions.
  - This allows for line thicknesses etc to correspond to pixel sizes.-}
 worldPosToScreen :: World -> Point2 -> Point2
 worldPosToScreen w 
-    = rotateV (negate $ _cameraRot w) 
-    . (_cameraZoom w *.*)
-    . (-.- _cameraCenter w)
+    = rotateV (negate $ _cameraRot (_cWorld w)) 
+    . (_cameraZoom (_cWorld w) *.*)
+    . (-.- _cameraCenter (_cWorld w))
 {- | Transform coordinates from the map position to screen
 coordinates.  -}
 cartePosToScreen :: Configuration -> World -> Point2 -> Point2
 cartePosToScreen cfig w = doWindowScale cfig . doRotate . doZoom . doTranslate
   where
-    doTranslate p       = p -.- _carteCenter (_hud w)
-    doZoom p            = _carteZoom (_hud w) *.* p
-    doRotate p          = rotateV (negate $ _carteRot (_hud w)) p
+    doTranslate p       = p -.- _carteCenter (_hud (_cWorld w))
+    doZoom p            = _carteZoom (_hud (_cWorld w)) *.* p
+    doRotate p          = rotateV (negate $ _carteRot (_hud (_cWorld w))) p
 crToMousePosOffset :: Creature -> World -> (Point2,Float)
 crToMousePosOffset cr w = (mouseWorldPos w -.- _crPos cr,0)
 {- | The mouse position in world coordinates.  -}
 mouseWorldPos :: World -> Point2
-mouseWorldPos w = _cameraCenter w +.+ (1/_cameraZoom w) *.* rotateV (_cameraRot w) (_mousePos w)
+mouseWorldPos w = _cameraCenter (_cWorld w) +.+ (1/_cameraZoom (_cWorld w)) *.* rotateV (_cameraRot (_cWorld w)) (_mousePos (_cWorld w))
 {- | The mouse position in map coordinates -}
 mouseCartePos :: World -> Point2
-mouseCartePos w = _carteCenter (_hud w) +.+ (1/_carteZoom (_hud w)) 
-    *.* rotateV (_carteRot (_hud w)) (_mousePos w)
+mouseCartePos w = _carteCenter (_hud (_cWorld w)) +.+ (1/_carteZoom (_hud (_cWorld w))) 
+    *.* rotateV (_carteRot (_hud (_cWorld w))) (_mousePos (_cWorld w))

src/Dodge/Base/Window.hs

@@ -15,10 +15,10 @@ screenPolygon :: Configuration -> World -> [Point2]
 screenPolygon cfig w = map (scTran . scRot . scZoom) $ screenBox cfig
 --    [tr,tl,bl,br]
   where 
-    scRot  = rotateV (_cameraRot w)
-    scZoom p | _cameraZoom w /= 0 = (1/_cameraZoom w) *.* p
+    scRot  = rotateV (_cameraRot (_cWorld w))
+    scZoom p | _cameraZoom (_cWorld w) /= 0 = (1/_cameraZoom (_cWorld w)) *.* p
              | otherwise = p
-    scTran p = p +.+ _cameraCenter w
+    scTran p = p +.+ _cameraCenter (_cWorld w)
 --    tr = scTran $ scRot $ scZoom (V2 ( halfWidth w) ( halfHeight w)) 
 --    tl = scTran $ scRot $ scZoom (V2 (-halfWidth w) ( halfHeight w)) 
 --    br = scTran $ scRot $ scZoom (V2 ( halfWidth w) (-halfHeight w))
@@ -35,9 +35,9 @@ screenPolygonBord xbord ybord cfig w = [tr,tl,bl,br]
   where 
     hw = halfWidth  cfig - xbord
     hh = halfHeight cfig - ybord
-    scZoom p | _cameraZoom w /= 0   = (1/_cameraZoom w) *.* p
+    scZoom p | _cameraZoom (_cWorld w) /= 0   = (1/_cameraZoom (_cWorld w)) *.* p
              | otherwise            = p
-    theTransform = (+.+ _cameraCenter w) . rotateV (_cameraRot w) . scZoom
+    theTransform = (+.+ _cameraCenter (_cWorld w)) . rotateV (_cameraRot (_cWorld w)) . scZoom
     tr = theTransform (V2   hw    hh ) 
     tl = theTransform (V2 (-hw)   hh ) 
     br = theTransform (V2   hw  (-hh))

src/Dodge/Base/You.hs

@@ -5,7 +5,7 @@ import qualified IntMapHelp as IM
 --import Control.Lens
 
 you :: World -> Creature
-you w = _creatures w IM.! _yourID w
+you w = _creatures (_cWorld w) IM.! _yourID (_cWorld w)
 
 yourItem :: World -> Maybe Item
 yourItem w = _crInv (you w) IM.!? crSel (you w)