Restrict some arguments

src/Dodge/Update/Camera.hs

@@ -17,7 +17,8 @@ import Data.Maybe
 import qualified Data.Set as Set
 import Dodge.Base
 import Dodge.Creature.Test
-import Dodge.Data.Universe
+import Dodge.Data.Config
+import Dodge.Data.World
 import Dodge.Equipment
 import Dodge.GameRoom
 import Dodge.Zoning.Wall
@@ -28,27 +29,25 @@ import qualified SDL
 
 {- Update the screen camera rotation and position, including any in rold scope/remote camera modifiers;
 update where your avatar's view is from.  -}
-updateCamera :: Universe -> Universe
-updateCamera uv =
-    uv
-        & over uvWorld (setViewDistance cfig)
-        & moveZoomCamera
-        & over uvWorld updateScopeZoom
-        & over uvWorld (rotateCamera cfig)
-  where
-    cfig = _uvConfig uv
+updateCamera :: Configuration -> World -> World
+updateCamera cfig w =
+    w
+        & over (cWorld . lWorld . camPos) (setViewDistance cfig)
+        & moveZoomCamera cfig
+        & updateScopeZoom
+        & rotateCamera cfig
 
-moveZoomCamera :: Universe -> Universe
-moveZoomCamera uv =
-    uv
-        & uvWorld . cWorld . lWorld . camPos . camCenter .~ newcen
-        & uvWorld . cWorld . lWorld . camPos . camViewFrom .~ newvf
-        & uvWorld . cWorld . lWorld . camPos . camZoom .~ newzoom
-        & uvWorld . cWorld . lWorld . camPos . camDefaultZoom .~ newDefaultZoom
-        & uvWorld . cWorld . lWorld . camPos . camItemZoom .~ newItemZoom
+moveZoomCamera :: Configuration -> World -> World
+moveZoomCamera cfig w =
+    w
+        & cWorld . lWorld . camPos . camCenter .~ newcen
+        & cWorld . lWorld . camPos . camViewFrom .~ newvf
+        & cWorld . lWorld . camPos . camZoom .~ newzoom
+        & cWorld . lWorld . camPos . camDefaultZoom .~ newDefaultZoom
+        & cWorld . lWorld . camPos . camItemZoom .~ newItemZoom
   where
-    cfig = _uvConfig uv
-    w = _uvWorld uv
+    --cfig = _uvConfig uv
+    --w = _uvWorld uv
     cpos = _crPos (you w)
     newvf = cpos +.+ fromMaybe (V2 0 0) vfoffset
     vfoffset = do
@@ -126,7 +125,6 @@ zoomInLongGun w
   where
     decreaseScopeZoomChange = wpPointer . itScope . scopeZoomChange -~ 1
     wpPointer = cWorld . lWorld . creatures . ix 0 . crInv . ix (crSel (w ^?! cWorld . lWorld . creatures . ix 0))
-    --wp = _crInv (_creatures (_cWorld w) IM.! 0) IM.! crSel (_creatures (_cWorld w) IM.! 0)
     wp = ycr ^?! crInv . ix (crSel ycr)
     ycr = you w
     Just currentZoom = wp ^? itScope . scopeZoom
@@ -179,11 +177,11 @@ doWallRotate wl' w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl') - (w ^.
         b = a * (4 / pi)
         b' = fromIntegral (round b :: Int)
 
-rotateCameraBy :: Float -> World -> World
+rotateCameraBy :: Float -> LWorld -> LWorld
 rotateCameraBy x w =
     w
-        & cWorld . lWorld . camPos . camRot +~ x
-        & cWorld . lWorld . creatures . ix 0 . crInv . ix (crSel (_creatures (_lWorld (_cWorld w)) IM.! 0))
+        & camPos . camRot +~ x
+        & creatures . ix 0 . crInv . ix (crSel (w ^?! creatures . ix 0))
             . itScope
             . scopePos
             %~ rotateV x
@@ -191,8 +189,8 @@ rotateCameraBy x w =
 rotateCamera :: Configuration -> World -> World
 rotateCamera cfig w
     | keyl && keyr = w
-    | keyl = rotateCameraBy 0.025 w
-    | keyr = rotateCameraBy (-0.025) w
+    | keyl = over (cWorld . lWorld) (rotateCameraBy 0.025) w
+    | keyr = over (cWorld . lWorld) (rotateCameraBy (-0.025)) w
     | otherwise = ifConfigWallRotate cfig w
   where
     keyl = SDL.ScancodeQ `Set.member` _keys w && notAtTerminal w
@@ -216,16 +214,16 @@ clipZoom ::
     Float
 clipZoom = min 20 . max 0.2
 
-setViewDistance :: Configuration -> World -> World
+setViewDistance :: Configuration -> CamPos -> CamPos
 setViewDistance cfig w =
-    w & cWorld . lWorld . camPos . camViewDistance
-        .~ sqrt (halfWidth cfig ** 2 + halfHeight cfig ** 2) / (w ^. cWorld . lWorld . camPos . camZoom)
+    w & camViewDistance
+        .~ sqrt (halfWidth cfig ** 2 + halfHeight cfig ** 2) / (w ^. camZoom)
 
-getViewpoints :: Point2 -> World -> [Point2]
+getViewpoints :: Point2 -> CWorld -> [Point2]
 {-# INLINE getViewpoints #-}
 getViewpoints p w =
     concatMap (gameRoomViewpoints p) $
-        filter (pointInOrOnPolygon p . _grBound) (_cwgGameRooms $ _cwGen (_cWorld w))
+        filter (pointInOrOnPolygon p . _grBound) (_cwgGameRooms $ _cwGen w)
 
 gameRoomViewpoints :: Point2 -> GameRoom -> [Point2]
 {-# INLINE gameRoomViewpoints #-}
@@ -239,7 +237,7 @@ gameRoomViewpoints p gr =
 farWallDistDirection :: Point2 -> World -> Maybe (Float, Float, Float, Float)
 farWallDistDirection p w =
     boundPoints $
-        map f $ getViewpoints p w
+        map f $ getViewpoints p (_cWorld w)
   where
     f q = (rotateV (negate (w ^. cWorld . lWorld . camPos . camRot)) . (-.- p)) (foldl' findPoint q (wls q))
     wls q = filter wlIsOpaque $ wlsNearSeg p q w