Remove some Streaming

src/Dodge/Update/Camera.hs

@@ -4,8 +4,9 @@ and the position that the character sees from: '_cameraViewFrom'.  -}
 module Dodge.Update.Camera (
     updateCamera,
     farWallPoints,
-    streamViewpoints,
+    --    streamViewpoints,
     farWallDistDirection,
+    getViewpoints,
 ) where
 
 import Bound
@@ -24,11 +25,6 @@ import Geometry
 import qualified IntMapHelp as IM
 import LensHelp
 import qualified SDL
---import Data.Monoid
---import Data.Semigroup
-
-import Streaming
-import qualified Streaming.Prelude as S
 
 {- Update the screen camera rotation and position, including any in rold scope/remote camera modifiers;
 update where your avatar's view is from.  -}
@@ -65,7 +61,6 @@ moveZoomCamera uv =
         yourItem w ^? _Just . itScope . scopePos
     newcen = cpos +.+ fromMaybe (V2 0 0) mscopeoffset +.+ offset
     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
         _ -> newDefaultZoom * newItemZoom
@@ -81,7 +76,6 @@ moveZoomCamera uv =
         | 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 (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
@@ -224,18 +218,17 @@ setViewDistance cfig w =
     w & cWorld . cwCam . cwcViewDistance
         .~ sqrt (halfWidth cfig ** 2 + halfHeight cfig ** 2) / (w ^. cWorld . cwCam . cwcZoom)
 
---    .~ max (halfWidth cfig) (halfHeight cfig) / _cameraZoom w
+getViewpoints :: Point2 -> World -> [Point2]
+{-# INLINE getViewpoints #-}
+getViewpoints p w =
+    concatMap (gameRoomViewpoints p) $
+        filter (pointInOrOnPolygon p . _grBound) (_cwgGameRooms $ _cwGen (_cWorld w))
 
-streamViewpoints :: Monad m => Point2 -> World -> Stream (Of Point2) m ()
-{-# INLINE streamViewpoints #-}
-streamViewpoints p w =
-    flip S.for (gameRoomViewpoints p) $
-        S.filter (pointInOrOnPolygon p . _grBound) $ S.each (_cwgGameRooms $ _cwGen (_cWorld w))
-
-gameRoomViewpoints :: Monad m => Point2 -> GameRoom -> Stream (Of Point2) m ()
+gameRoomViewpoints :: Point2 -> GameRoom -> [Point2]
+{-# INLINE gameRoomViewpoints #-}
 gameRoomViewpoints p gr =
-    S.each (_grViewpoints gr)
-        <> S.map extend (S.each (_grViewpointsEx gr) <> S.map addDir (S.each $ _grLinkDirs gr))
+    (_grViewpoints gr)
+        <> map extend ((_grViewpointsEx gr) <> map addDir (_grLinkDirs gr))
   where
     extend outp = p +.+ maxViewDistance *.* squashNormalizeV (outp -.- p)
     addDir a = p +.+ unitVectorAtAngle a
@@ -243,12 +236,11 @@ gameRoomViewpoints p gr =
 farWallDistDirection :: Point2 -> World -> Maybe (Float, Float, Float, Float)
 farWallDistDirection p w =
     boundPoints $
-        S.map f vps
+        map f $ getViewpoints p w
   where
     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
 
 extendedViewPoints :: Point2 -> [GameRoom] -> [Point2]
 extendedViewPoints p grs =