Move wall destruction

src/Dodge/Zoning/Base.hs

@@ -11,8 +11,6 @@ module Dodge.Zoning.Base
     , zoneOfCirc
     , zonesAroundPoint
     , xIntercepts
-    , xIntercepts'
-    , yIntercepts'
     , yIntercepts
     , updateInt2Map
     ) where
@@ -50,8 +48,7 @@ zoneOfPoint = fmap . divTo
 
 zoneOfSeg :: Float -> Point2 -> Point2 -> [Int2]
 {-# INLINE zoneOfSeg #-}
---zoneOfSeg s sp ep = map (zoneOfPoint s) (sp : xIntercepts s sp ep ++ yIntercepts s sp ep)
-zoneOfSeg s sp ep = map (zoneOfPoint s) (sp : xIntercepts' s sp ep ++ yIntercepts' s sp ep)
+zoneOfSeg s sp ep = map (zoneOfPoint s) (sp : xIntercepts s sp ep ++ yIntercepts s sp ep)
 
 zoneOfSegSet :: Float -> Point2 -> Point2 -> S.Set Int2
 {-# INLINE zoneOfSegSet #-}
@@ -68,23 +65,7 @@ zonesExtract = foldMap . flip zoneExtract
 
 xIntercepts :: Float -> Point2 -> Point2 -> [Point2]
 {-# INLINE xIntercepts #-}
-xIntercepts s (V2 sx sy) (V2 ex ey)
-    | divTo s sx == divTo s ex = []
-    | otherwise = zipWith V2 [halfstep + sx', halfstep + sx' + xdx * s .. ex] ([sy', sy' + ydx * s .. ey] ++ repeat ey)
-  where
-    halfstep
-        | xdx > 0 = -s/2
-        | otherwise = s/2
-    xdx = signum (ex - sx)
-    ydx = (ey - sy) / abs (ex - sx) -- carefull: if this is zero
-    sy' = sy + ydx * abs (sx - sx')
-    sx'
-        | xdx < 0 = sx - modTo s sx
-        | otherwise = s + sx - modTo s sx
-
-xIntercepts' :: Float -> Point2 -> Point2 -> [Point2]
-{-# INLINE xIntercepts' #-}
-xIntercepts' s (V2 sx sy) (V2 ex ey) 
+xIntercepts s (V2 sx sy) (V2 ex ey) 
     | divTo s sx == divTo s ex = []
     | otherwise = g <$> [a, a + s .. b]
   where
@@ -100,12 +81,6 @@ yIntercepts s sp ep = map f $ xIntercepts s (f sp) (f ep)
   where
     f (V2 x y) = V2 y x
 
-yIntercepts' :: Float -> Point2 -> Point2 -> [Point2]
-{-# INLINE yIntercepts' #-}
-yIntercepts' s sp ep = map f $ xIntercepts' s (f sp) (f ep)
-  where
-    f (V2 x y) = V2 y x
-
 -- consider using: at x . non mempty . at y . non mempty <>~ a
 zoneMonoid :: Semigroup m => Int2 -> m -> IM.IntMap (IM.IntMap m) -> IM.IntMap (IM.IntMap m)
 {-# INLINE zoneMonoid #-}