Refactor cloud zoning

src/Dodge/Zoning/Base.hs

@@ -3,6 +3,7 @@ import Geometry
 import Geometry.Zone
 import qualified IntMapHelp as IM
 
+import qualified Data.IntSet as IS
 import Control.Lens
 import Data.Maybe
 
@@ -60,3 +61,10 @@ zoneMonoid :: Semigroup m => Int2 -> m -> IM.IntMap (IM.IntMap m) -> IM.IntMap (
 zoneMonoid (V2 x y) a = IM.insertWith f x $ IM.singleton y a
   where
     f _ = IM.insertWith (<>) y a
+
+deZoneIX :: Int -> IM.IntMap (IM.IntMap IS.IntSet) -> Int2 ->  IM.IntMap (IM.IntMap IS.IntSet)
+deZoneIX i im (V2 x y) = im & ix x . ix y %~ IS.delete i
+
+zoneOfPoint'' :: Float -> Point2 -> V2 Int
+{-# INLINE zoneOfPoint'' #-}
+zoneOfPoint'' s = fmap (divTo s)

src/Dodge/Zoning/Cloud.hs

@@ -0,0 +1,31 @@
+module Dodge.Zoning.Cloud
+    where
+import Geometry.Vector
+import Dodge.Zoning.Base
+import Dodge.Data
+import Geometry
+
+import Data.Foldable
+import Control.Lens
+import qualified IntMapHelp as IM
+
+clsNearPoint :: Point2 -> World -> [Cloud]
+clsNearPoint p w = zoneExtract (zoneOfPoint' clZoneSize p) (w ^. clZoning)
+
+clsNearSeg :: Point2 -> Point2 -> World -> [Cloud]
+clsNearSeg sp ep w = zonesExtract (w ^. clZoning) (zoneOfSeg' clZoneSize sp ep)
+
+clsNearRect :: Point2 -> Point2 -> World -> [Cloud]
+clsNearRect sp ep w = zonesExtract (w ^. clZoning) $ zoneOfRect' clZoneSize sp ep
+
+clsNearCirc :: Point2 -> Float -> World -> [Cloud]
+clsNearCirc p r = clsNearRect (p +.+ V2 r r) (p -.- V2 r r)
+
+clZoneSize :: Float
+clZoneSize = 20
+
+zoneOfCl :: Cloud -> Int2
+zoneOfCl = zoneOfPoint'' clZoneSize . xyV3 . _clPos
+
+zoneCloud :: Cloud -> IM.IntMap (IM.IntMap [Cloud]) -> IM.IntMap (IM.IntMap [Cloud])
+zoneCloud cl = zoneMonoid (zoneOfCl cl) [cl]

src/Dodge/Zoning/Wall.hs

@@ -56,6 +56,3 @@ zoneWall wl im = foldl' f im (zoneOfWl wl)
 
 deZoneWall :: Wall -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
 deZoneWall wl im = foldl' (deZoneIX (_wlID wl)) im (zoneOfWl wl)
-
-deZoneIX :: Int -> IM.IntMap (IM.IntMap IS.IntSet) -> Int2 ->  IM.IntMap (IM.IntMap IS.IntSet)
-deZoneIX i im (V2 x y) = im & ix x . ix y %~ IS.delete i