Refactor dynamic camera code

src/Dodge/Update.hs

@@ -88,6 +88,7 @@ functionalUpdate w = case _menuLayers w of
       where 
         (x,y) = cloudZoneOfPoint $ _clPos cl
 
+-- | Note the explict use of record syntax. Using lens creates a space leak.
 resetWorldEvents :: World -> World
 resetWorldEvents w = w {_worldEvents = id}
 

src/Dodge/Update/Camera.hs

@@ -14,11 +14,15 @@ import Dodge.Config.KeyConfig
 import Dodge.Item.Attachment.Data
 import Geometry
 
+import qualified Data.List.NonEmpty as NEL
 import Control.Lens
+--import Control.Applicative
 import Data.Maybe
 import qualified Data.Set as S
 import qualified Data.IntMap.Strict as IM
 import qualified SDL
+import Data.Monoid
+import Data.Semigroup
 {- Update the screen camera rotation and position, including any in rold scope/remote camera modifiers; 
 update where your avatar's view is from.  -}
 updateCamera :: World -> World
@@ -154,25 +158,47 @@ autoZoomCam w = over cameraZoom changeZoom w
     zoomOutSpeed = 15
     scZoom = fromMaybe 1 $ yourItem w ^? itAttachment . _Just . scopeZoom
 
+
 farWallDist :: Point2 -> World -> Float
-{-# INLINE farWallDist #-}
+--{-# INLINE farWallDist #-}
-farWallDist cpos w = min (halfWidth w / (horizontalMax+50) ) (halfHeight w / (verticalMax+50) )
+farWallDist cpos w = values'
+    --min (halfWidth w / (horizontalMax+50) ) (halfHeight w / (verticalMax+50) )
   where
-    horizontalMax = maximum $ map (h' (V2 1 0)) rRays ++ map (h' (V2 (-1) 0)   ) lRays
+    horizontalMax = maximum $ map (horSize . h . (+.+) cpos . rotateV camRot) hRays
-    verticalMax   = maximum $ map (h' (V2 0 1)) tRays ++ map (h' (V2 0    (-1))) bRays
+    verticalMax   = maximum $ map (verSize . h . (+.+) cpos . rotateV camRot) vRays
-    --h p = fromMaybe p $ collidePointIndirect cpos p $ wallsAlongLine cpos p w
-    --h p = fromMaybe p . collidePointIndirect cpos p $ _walls w
     wos = wallsOnScreen w
-    h p = fromMaybe p $ collidePointIndirect cpos p wos
+    rv = rotateV camRot (V2 1 0)
-    h' x p = dotV (rotateV camRot x) (p -.- cpos)
+    rh = rotateV camRot (V2 0 1)
+    horSize = abs . dotV rv . (-.- cpos)
+    verSize = abs . dotV rh . (-.- cpos)
     camRot = _cameraRot w
-    rRays = rotF [V2   maxViewDistance  y | y <- zs]
+    hRays = [V2 x y | y <- zs , x <- [-maxViewDistance,maxViewDistance]]
-    lRays = rotF [V2 (-maxViewDistance) y | y <- zs]
+    vRays = [V2 x y | x <- zs , y <- [-maxViewDistance,maxViewDistance]]
-    tRays = rotF [V2 y   maxViewDistance  | y <- zs]
+    h p = fromMaybe p $ collidePointIndirect cpos p wos
-    bRays = rotF [V2 y (-maxViewDistance) | y <- zs]
+    zs = [-maxViewDistance,negate $ 0.75*maxViewDistance..maxViewDistance]
-    rotF = map (h . (+.+) cpos . rotateV (_cameraRot w))
+    zs' = NEL.fromList [-maxViewDistance,negate $ 0.75*maxViewDistance..maxViewDistance]
-    zs = takeWhile (< maxViewDistance) [-maxViewDistance,negate $ 0.75*maxViewDistance..]
+    hw = halfWidth w
-    maxViewDistance = 800
+    hh = halfHeight w
+    d x = Min . (x /) . (+ 50) . fromMaybe maxViewDistance . fmap getMax . getAp
+    values' = getMin . uncurry (<>) $ bimap (d hw) (d hh) $ sconcat $ NEL.map vsAt zs'
+    --values = map (\x -> (valueAtWidth x, valueAtHeight x)) zs
+    viewDistAtHeight  = rotateV camRot . V2 maxViewDistance
+    viewDistAtWidth x = rotateV camRot $ V2 x maxViewDistance
+    vsAt x = (valueAtWidth x,valueAtHeight x)
+    valueAtHeight h  = cpiv (cpos +.+ x) <> cpiv (cpos -.- x)
+      where
+        x = viewDistAtHeight h
+    valueAtWidth h  = cpih (cpos +.+ x) <> cpih (cpos -.- x)
+      where
+        x = viewDistAtWidth h
+    cpiv p = Ap $ fmap (Max . horSize) $ collidePointIndirect cpos p wos
+    cpih p = Ap $ fmap (Max . verSize) $ collidePointIndirect cpos p wos
+
+zs :: [Float]
+zs = [-maxViewDistance,negate $ 0.75*maxViewDistance..maxViewDistance]
     
+maxViewDistance :: Float
+maxViewDistance = 800
+
 --dirRays :: Float -> [Point2]
 --dirRays dir = take 11 $ iterate (rotateV (0.5 * pi / 10)) $ rotateV (dir-pi*0.25) (600,0)