More streaming refactoring

2022-06-25 22:31:49 +01:00
parent 4eaa31bf32
commit 3c7ea4d73b
12 changed files with 88 additions and 28 deletions
@@ -114,10 +114,11 @@ defaultArcStep itparams w (ArcStep p dir _) = do
            . filter (\cr -> dist center (_crPos cr) < csize)
            . IM.elems
            $ _creatures w
-        wlsnearpoint = wallsNearPoint p w
+        wlsnearpoint = wallsNearPoint' p w
        mwl = listToMaybe
            . sortOn (dist p . fst)
-            . mapMaybe (\ q -> collidePointWallsWall p (center +.+ q) wlsnearpoint)
+            . mapMaybe (\ q -> sequence $ collidePointWallsFilterStream (const True) p (center +.+ q) w)
+                -- collidePointWallsWall and wlsnearpoint
            $ polyCirc 6 csize
        f (q,wl) = ArcStep q dir (Just $ Right wl)
        g cr   = ArcStep (_crPos cr +.+ csize *.* unitVectorAtAngle dir) dir (Just $ Left cr)