Move towards serializing saves/loads faster

src/Dodge/Base/Collide.hs

@@ -178,7 +178,7 @@ allVisibleWalls :: World -> [(Point2, Wall)]
 {-# INLINE allVisibleWalls #-}
 allVisibleWalls w = concatMap (flip (visibleWalls vPos) w . (+.+ vPos)) $ nRays 20
   where
-    vPos = _cameraViewFrom $ _cWorld w
+    vPos = w ^. cWorld . cwCam . cwcViewFrom
 
 --allVisibleWalls :: World -> StreamOf (Point2,Wall)
 --{-# INLINE allVisibleWalls #-}

src/Dodge/Base/Coordinate.hs

@@ -3,14 +3,15 @@ module Dodge.Base.Coordinate where
 import Dodge.Base.WinScale
 import Dodge.Data.Universe
 import Geometry
+import Control.Lens
 
 -- | Transform coordinates from world position to screen coordinates.
 worldPosToScreenNorm :: Configuration -> World -> Point2 -> Point2
 worldPosToScreenNorm cfig w = doWindowScale cfig . doRotate . doZoom . doTranslate
   where
-    doTranslate p = p -.- _cameraCenter (_cWorld w)
-    doZoom p = _cameraZoom (_cWorld w) *.* p
-    doRotate p = rotateV (negate $ _cameraRot (_cWorld w)) p
+    doTranslate p = p -.- (w ^. cWorld . cwCam . cwcCenter)
+    doZoom p = (w ^. cWorld . cwCam . cwcZoom) *.* p
+    doRotate p = rotateV (negate (w ^. cWorld . cwCam . cwcRot)) 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.
@@ -18,9 +19,9 @@ worldPosToScreenNorm cfig w = doWindowScale cfig . doRotate . doZoom . doTransla
 -}
 worldPosToScreen :: World -> Point2 -> Point2
 worldPosToScreen w =
-    rotateV (negate $ _cameraRot (_cWorld w))
-        . (_cameraZoom (_cWorld w) *.*)
-        . (-.- _cameraCenter (_cWorld w))
+    rotateV (negate $ w ^. cWorld . cwCam . cwcRot)
+        . ((w ^. cWorld . cwCam . cwcZoom) *.*)
+        . (-.- (w ^. cWorld . cwCam . cwcCenter))
 
 {- | Transform coordinates from the map position to screen
 coordinates.
@@ -38,8 +39,8 @@ crToMousePosOffset cr w = (mouseWorldPos w -.- _crPos cr, 0)
 -- | The mouse position in world coordinates.
 mouseWorldPos :: World -> Point2
 mouseWorldPos w =
-    _cameraCenter (_cWorld w)
-        +.+ (1 / _cameraZoom (_cWorld w)) *.* rotateV (_cameraRot (_cWorld w)) (_mousePos w)
+    (w ^. cWorld . cwCam . cwcCenter)
+        +.+ (1 / (w ^. cWorld . cwCam . cwcZoom)) *.* rotateV (w ^. cWorld . cwCam . cwcRot) (_mousePos w)
 
 -- | The mouse position in map coordinates
 mouseCartePos :: World -> Point2

src/Dodge/Base/Window.hs

@@ -9,18 +9,17 @@ module Dodge.Base.Window (
 
 import Dodge.Data.Universe
 import Geometry
+import Control.Lens
 
 -- | A box covering the screen in world coordinates
 screenPolygon :: Configuration -> World -> [Point2]
 screenPolygon cfig w = map (scTran . scRot . scZoom) $ screenBox cfig
   where
-    --    [tr,tl,bl,br]
-
-    scRot = rotateV (_cameraRot (_cWorld w))
+    scRot = rotateV (w ^. cWorld . cwCam . cwcRot)
     scZoom p
-        | _cameraZoom (_cWorld w) /= 0 = (1 / _cameraZoom (_cWorld w)) *.* p
+        | (w ^. cWorld . cwCam . cwcZoom) /= 0 = (1 / (w ^. cWorld . cwCam . cwcZoom)) *.* p
         | otherwise = p
-    scTran p = p +.+ _cameraCenter (_cWorld w)
+    scTran p = p +.+ (w ^. cWorld . cwCam . cwcCenter)
 
 --    tr = scTran $ scRot $ scZoom (V2 ( halfWidth w) ( halfHeight w))
 --    tl = scTran $ scRot $ scZoom (V2 (-halfWidth w) ( halfHeight w))
@@ -41,9 +40,9 @@ screenPolygonBord xbord ybord cfig w = [tr, tl, bl, br]
     hw = halfWidth cfig - xbord
     hh = halfHeight cfig - ybord
     scZoom p
-        | _cameraZoom (_cWorld w) /= 0 = (1 / _cameraZoom (_cWorld w)) *.* p
+        | (w ^. cWorld . cwCam . cwcZoom) /= 0 = (1 / (w ^. cWorld . cwCam . cwcZoom)) *.* p
         | otherwise = p
-    theTransform = (+.+ _cameraCenter (_cWorld w)) . rotateV (_cameraRot (_cWorld w)) . scZoom
+    theTransform = (+.+ (w ^. cWorld . cwCam . cwcCenter)) . rotateV (w ^. cWorld . cwCam . cwcRot) . scZoom
     tr = theTransform (V2 hw hh)
     tl = theTransform (V2 (- hw) hh)
     br = theTransform (V2 hw (- hh))