Continue refactor

src/Dodge/WorldEvent/ThingsHit.hs

@@ -57,18 +57,12 @@ thingsHitExceptCr (Just cid) sp ep = S.filter crNotCid . thingsHit sp ep
     crNotCid (_,Left cr) = _crID cr /= cid
     crNotCid _ = True
 
---wallsHit
---    :: Point2    -- ^ Line start point
---    -> Point2    -- ^ Line end point
---    -> World 
---    -> [(Point2, Wall)]
---wallsHit sp ep w 
---    | sp == ep  = []
---    | otherwise = sortOn (dist sp . fst) wls
---  where 
---    wls = IM.elems $ wallsOnLineHit sp ep 
---        $ IM.unions [f b $ f a $ _znObjects $ _wallsZone w 
---            | a<-[x-1,x,x+1] , b<-[y-1,y,y+1]]
---       -- $ _walls w
---    V2 x y = wallZoneOfPoint (0.5 *.* (sp +.+ ep))
---    f i = fromMaybe IM.empty . IM.lookup i
+wallsHit
+    :: Point2    -- ^ Line start point
+    -> Point2    -- ^ Line end point
+    -> World 
+    -> Stream (Of (Point2, Wall)) Identity ()
+wallsHit sp ep w 
+    | sp == ep  = S.each []
+    | otherwise = sortStreamOn (dist sp . fst)
+        . overlapSegWalls sp ep $ wallsAlongLine sp ep w