Various performance improvements

src/Dodge/Update/Camera.hs

@@ -26,7 +26,7 @@ import qualified Data.IntMap.Strict as IM
 import qualified SDL
 --import Data.Monoid
 --import Data.Semigroup
-import qualified Control.Foldl as L
+--import qualified Control.Foldl as L
 {- 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
@@ -163,46 +163,28 @@ autoZoomCam w = over cameraZoom changeZoom w
     theScopeZoom = fromMaybe 1 $ yourItem w ^? itAttachment . scopeZoom
 
 farWallDist' :: Point2 -> World -> Float
-farWallDist' p w = (winFac /) $ fromMaybe maxViewDistance $ L.fold L.maximum vdists
+farWallDist' p w = (winFac /) . min maxViewDistance $ ssfold (> maxViewDistance) findMax 1 vps
   where
+    findMax curMax pout = max curMax $ dist p $ collidePointUpToIndirectMinDist p pout curMax wos
     hw = halfWidth w
     hh = halfHeight w
     winFac = min hw hh
-    vdists = map (flip (collideDirectionIndirect maxViewDistance p) wos)
-        vps
     vps = concatMap _grViewpoints grs
     grs = filter (pointInOrOnPolygon p . _grBound) (_gameRooms w)
     wos = wallsOnScreen w
----- | Find the furthest viewable distance from a given point in the world
+
 --farWallDist :: Point2 -> World -> Float
-----{-# INLINE farWallDist #-}
---farWallDist cpos w 
---    = getMin 
---    . uncurry (<>) 
---    $ bimap (toScale hw) (toScale hh) 
---    $ sconcat 
---    $ NEL.map distsMaybeTo viewTestValues
+--farWallDist p w = (winFac /) $ fromMaybe maxViewDistance 
+--    $ L.fold (L.premap (dist p) L.maximum) vdists
 --  where
---    wos = wallsOnScreen w
---    camRot = _cameraRot w
 --    hw = halfWidth w
 --    hh = halfHeight w
---    toScale x = Min . (x /) . (+ 50) . maybe maxViewDistance getMax . getAp
---    distsMaybeTo x = (valueAtWidth x,valueAtHeight x)
---    valueAtHeight h  = cpiv (cpos +.+ x) <> cpiv (cpos -.- x)
---      where
---        x = rotateV camRot $ V2 maxViewDistance h
---        cpiv p = Ap $ Max . horSize <$> collidePointIndirect cpos p wos
---        horSize = abs . dotV rv . (-.- cpos)
---        rv = rotateV camRot (V2 1 0)
---    valueAtWidth h  = cpih (cpos +.+ x) <> cpih (cpos -.- x)
---      where
---        x = rotateV camRot $ V2 h maxViewDistance
---        cpih p = Ap $ Max . verSize <$> collidePointIndirect cpos p wos
---        verSize = abs . dotV rh . (-.- cpos)
---        rh = rotateV camRot (V2 0 1)
---viewTestValues :: NEL.NonEmpty Float
---viewTestValues = NEL.fromList [-maxViewDistance,negate $ 0.75*maxViewDistance..maxViewDistance]
+--    winFac = min hw hh
+--    vdists :: [Point2]
+--    vdists = map (flip (collidePointUpToIndirect p) wos) vps
+--    vps = concatMap _grViewpoints grs
+--    grs = filter (pointInOrOnPolygon p . _grBound) (_gameRooms w)
+--    wos = wallsOnScreen w
 
 maxViewDistance :: Float
 maxViewDistance = 800