Move towards serializing saves/loads faster

src/Dodge/Update/Camera.hs

@@ -45,11 +45,11 @@ updateCamera uv =
 moveZoomCamera :: Universe -> Universe
 moveZoomCamera uv =
     uv
-        & uvWorld . cWorld . cameraCenter .~ newcen
-        & uvWorld . cWorld . cameraViewFrom .~ newvf
-        & uvWorld . cWorld . cameraZoom .~ newzoom
-        & uvWorld . cWorld . defaultZoom .~ newDefaultZoom
-        & uvWorld . cWorld . itemZoom .~ newItemZoom
+        & uvWorld . cWorld . cwCam . cwcCenter .~ newcen
+        & uvWorld . cWorld . cwCam . cwcViewFrom .~ newvf
+        & uvWorld . cWorld . cwCam . cwcZoom .~ newzoom
+        & uvWorld . cWorld . cwCam . cwcDefaultZoom .~ newDefaultZoom
+        & uvWorld . cWorld . cwCam . cwcItemZoom .~ newItemZoom
   where
     cfig = _uvConfig uv
     w = _uvWorld uv
@@ -64,7 +64,7 @@ moveZoomCamera uv =
         guard (SDL.ButtonRight `M.member` _mouseButtons w)
         yourItem w ^? _Just . itScope . scopePos
     newcen = cpos +.+ fromMaybe (V2 0 0) mscopeoffset +.+ offset
-    offset = rotateV (_cameraRot (_cWorld w)) $ ((newzoom - newDefaultZoom) / (newDefaultZoom * newzoom)) *.* _mousePos w
+    offset = rotateV (w ^. cWorld . cwCam . cwcRot) $ ((newzoom - newDefaultZoom) / (newDefaultZoom * newzoom)) *.* _mousePos w
     --newzoom = changeZoom (_cameraZoom w) idealZoom'
     newzoom = case yourItem w ^? _Just . itScope of
         Just zs@ZoomScope{} -> _scopeZoom zs
@@ -72,17 +72,17 @@ moveZoomCamera uv =
     idealDefaultZoom = clipZoom wallZoom
     newDefaultZoom = case yourItem w ^? _Just . itScope of
         Just zs@ZoomScope{} -> _scopeZoom zs
-        _ -> changeZoom (_defaultZoom (_cWorld w)) idealDefaultZoom
+        _ -> changeZoom (w ^. cWorld . cwCam . cwcDefaultZoom) idealDefaultZoom
     idealItemZoom = fromMaybe 1 $ do
         guard $ crIsAiming (you w)
         zoomFromItem' <$> (yourItem w ^? _Just . itUse . heldAim . aimZoom)
-    newItemZoom = changeZoom (_itemZoom (_cWorld w)) idealItemZoom
+    newItemZoom = changeZoom (w ^. cWorld . cwCam . cwcItemZoom) idealItemZoom
     changeZoom curZoom idealZoom
         | curZoom > idealZoom + 0.01 = ((zoomOutSpeed -1) * curZoom + idealZoom) / zoomOutSpeed
         | curZoom < idealZoom - 0.01 = ((zoomInSpeed -1) * curZoom + idealZoom) / zoomInSpeed
         | otherwise = idealZoom
     --wallZoom = farWallDist newvf cfig w
-    wallZoom = min4 (_boundDist (_cWorld w))
+    wallZoom = min4 (w ^. cWorld . cwCam . cwcBoundDist)
     min4 (a, b, c, d) = minimum [hh / maxd a, hh / maxd (- b), hw / maxd c, hw / maxd (- d)]
     maxd = max distFromEqmnt
     distFromEqmnt = foldr max 1 $ IM.mapMaybe (_eeViewDist . _equipEffect . _itUse) $ getCrEquipment $ you w
@@ -135,7 +135,7 @@ zoomInLongGun w
     wp = _crInv (_creatures (_cWorld w) IM.! 0) IM.! crSel (_creatures (_cWorld w) IM.! 0)
     Just currentZoom = wp ^? itScope . scopeZoom
     newzoom = (wp ^?! itScope . scopeZoom) / zoomSpeed
-    mousep = rotateV (_cameraRot (_cWorld w)) $ _mousePos w
+    mousep = rotateV (w ^. cWorld . cwCam . cwcRot) $ _mousePos w
 
 zoomOutLongGun :: World -> World
 zoomOutLongGun w
@@ -171,11 +171,11 @@ rotateToOverlappingWall w =
     p = _crPos (you w)
 
 doWallRotate :: Wall -> World -> World
-doWallRotate wl' w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl') - _cameraRot (_cWorld w)
+doWallRotate wl' w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl') - (w ^. cWorld . cwCam . cwcRot)
   where
     rotateUsing a
-        | b - b' > 0.01 = w & cWorld . cameraRot +~ 0.01
-        | b - b' < negate 0.01 = w & cWorld . cameraRot -~ 0.01
+        | b - b' > 0.01 = w & cWorld . cwCam . cwcRot +~ 0.01
+        | b - b' < negate 0.01 = w & cWorld . cwCam . cwcRot -~ 0.01
         | otherwise = w
       where
         --b = a * (2 / pi)
@@ -185,7 +185,7 @@ doWallRotate wl' w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl') - _camer
 rotateCameraBy :: Float -> World -> World
 rotateCameraBy x w =
     w
-        & cWorld . cameraRot +~ x
+        & cWorld . cwCam . cwcRot +~ x
         & cWorld . creatures . ix 0 . crInv . ix (crSel (_creatures (_cWorld w) IM.! 0))
             . itScope
             . scopePos
@@ -221,8 +221,8 @@ clipZoom = min 20 . max 0.2
 
 setViewDistance :: Configuration -> World -> World
 setViewDistance cfig w =
-    w & cWorld . viewDistance
-        .~ sqrt (halfWidth cfig ** 2 + halfHeight cfig ** 2) / _cameraZoom (_cWorld w)
+    w & cWorld . cwCam . cwcViewDistance
+        .~ sqrt (halfWidth cfig ** 2 + halfHeight cfig ** 2) / (w ^. cWorld . cwCam . cwcZoom)
 
 --    .~ max (halfWidth cfig) (halfHeight cfig) / _cameraZoom w
 
@@ -245,7 +245,7 @@ farWallDistDirection p w =
     boundPoints $
         S.map f vps
   where
-    f q = (rotateV (negate $ _cameraRot (_cWorld w)) . (-.- p)) (foldl' findPoint q (wls q))
+    f q = (rotateV (negate $ (w ^. cWorld . cwCam . cwcRot)) . (-.- p)) (foldl' findPoint q (wls q))
     wls q = filter wlIsOpaque $ wlsNearSeg p q w
     findPoint q = fromMaybe q . uncurry (intersectSegSeg p q) . _wlLine
     vps = streamViewpoints p w

src/Dodge/Update/UsingInput.hs

@@ -60,7 +60,7 @@ updatePressedButtons' pkeys w
         w & hammers . ix DoubleMouseHam .~ HammerDown
     | isDown ButtonRight && inTopInv = w
     | isDown ButtonMiddle =
-        w & cWorld . cameraRot -~ rotation
+        w & cWorld . cwCam . cwcRot -~ rotation
             & cWorld . clickMousePos .~ _mousePos w
     | isDown ButtonLeft = w & hammers . ix DoubleMouseHam .~ HammerDown
     | otherwise = w