Move towards serializing saves/loads faster

src/Dodge/Render/ShapePicture.hs

@@ -118,8 +118,8 @@ shiftDraw' fpos fdir fdraw x =
 
 cullPoint :: Configuration -> World -> Point2 -> Bool
 cullPoint cfig w p
-    | debugOn Close_shape_culling cfig = pointInPolygon p (_boundBox (_cWorld w))
-    | otherwise = dist (_cameraCenter (_cWorld w)) p < _viewDistance (_cWorld w)
+    | debugOn Close_shape_culling cfig = pointInPolygon p (w ^. cWorld . cwCam . cwcBoundBox)
+    | otherwise = dist (w ^. cWorld . cwCam . cwcCenter) p < (w ^. cWorld . cwCam . cwcViewDistance)
 
 extraPics :: Configuration -> World -> Picture
 extraPics cfig w =
@@ -277,7 +277,7 @@ drawFarWallDetect w =
             )
         $ runIdentity $ S.toList_ $ streamViewpoints p w
   where
-    p = _cameraViewFrom (_cWorld w)
+    p = w ^. cWorld . cwCam . cwcViewFrom
 
 drawDDATest :: World -> Picture
 drawDDATest w =
@@ -288,7 +288,7 @@ drawDDATest w =
         --        <> color blue (runIdentity (S.foldMap_ drawCross qs'))
         <> setLayer DebugLayer (color yellow (line [cvf, mwp]))
   where
-    cvf = _cameraViewFrom (_cWorld w)
+    cvf = w ^. cWorld . cwCam . cwcViewFrom
     mwp = mouseWorldPos w
     --ps = ddaStreamX 50 cvf mwp
     ps = zoneOfSeg' 50 cvf mwp
@@ -315,15 +315,23 @@ drawWallSearchRays w = foldMap (f . fst) $ allVisibleWalls w
         setLayer DebugLayer $
             color yellow $
                 uncurryV translate p (circle 5)
-                    <> line [_cameraViewFrom (_cWorld w), p]
+                    <> line [w ^. cWorld . cwCam . cwcViewFrom , p]
 
 testPic :: Configuration -> World -> Picture
 testPic _ _ = mempty
+--testPic cfig _ = setLayer FixedCoordLayer $ listPicturesAt 100 100 cfig $ map centerText
+--    ["A"
+--    ,"AA"
+--    ,"AAA"
+--    ,"AAAA"
+--    ,"AAAAA"
+--    ,"AAAAAA"
+--    ]
 
 drawBoundingBox :: World -> Picture
 drawBoundingBox w = setLayer DebugLayer $ color green $ line $ (x : xs) ++ [x]
   where
-    (x : xs) = _boundBox (_cWorld w)
+    (x : xs) = w ^. cWorld . cwCam . cwcBoundBox
 
 clDraw :: Cloud -> Picture
 clDraw c = translate3 (_clPos c) (drawCloud (_clPict c) c)
@@ -351,7 +359,7 @@ soundPic cfig w s = fixedSizePicClampArrow 50 50 thePic p cfig w
   where
     p = _soundPos s
     thePic =
-        rotate (_cameraRot (_cWorld w))
+        rotate (w ^. cWorld . cwCam . cwcRot)
             . scale theScale theScale
             . centerText
             . soundToOnomato