Refactor wall zoning, remove streaming

src/Dodge/Zoning/Creature.hs

@@ -3,22 +3,22 @@ import FoldableHelp
 import Dodge.Data
 import Geometry
 import Dodge.Zoning.Base
-import qualified FoldlHelp as L
+--import qualified FoldlHelp as L
 import qualified IntMapHelp as IM
 
 import Data.Maybe
-import Data.Function
+--import Data.Function
 import qualified Data.IntSet as IS
 import Control.Lens
 
 crIXsNearPoint :: Point2 -> World -> IS.IntSet
-crIXsNearPoint p w = zoneExtract (zoneOfPoint' crZoneSize p) (w ^. crZoning . getCrZoning)
+crIXsNearPoint p w = zoneExtract (zoneOfPoint' crZoneSize p) (w ^. crZoning)
 
 crsNearPoint :: Point2 -> World -> [Creature]
 crsNearPoint p w = mapMaybe (\cid -> w ^? creatures . ix cid) . IS.toList $ crIXsNearPoint p w
 
 crsNearSeg :: Point2 -> Point2 -> World -> IS.IntSet
-crsNearSeg sp ep w = zonesExtract (w ^. crZoning . getCrZoning) (zoneOfSeg' crZoneSize sp ep)
+crsNearSeg sp ep w = zonesExtract (w ^. crZoning) (zoneOfSeg' crZoneSize sp ep)
 
 crIXsNearCirc :: Point2 -> Float -> World -> IS.IntSet
 crIXsNearCirc p r = crsNearRect (p +.+ V2 r r) (p -.- V2 r r)
@@ -27,7 +27,7 @@ crsNearCirc :: Point2 -> Float -> World -> [Creature]
 crsNearCirc p r w = mapMaybe (\cid -> w ^? creatures . ix cid) . IS.toList $ crIXsNearCirc p r w
 
 crsNearRect :: Point2 -> Point2 -> World -> IS.IntSet
-crsNearRect sp ep w = zonesExtract (w ^. crZoning . getCrZoning) $ zoneOfRect' crZoneSize sp ep
+crsNearRect sp ep w = zonesExtract (w ^. crZoning) $ zoneOfRect' crZoneSize sp ep
 
 crZoneSize :: Float
 crZoneSize = 15
@@ -36,19 +36,13 @@ zoneOfCr :: Creature -> [Int2]
 zoneOfCr cr = zoneOfCirc crZoneSize (_crPos cr) (_crRad cr)
 
 minCrIXOn :: Ord a => (Creature -> a) -> IS.IntSet -> World -> Maybe Creature
-minCrIXOn f is w = fmap fst $ IS.foldl' (g w) Nothing is
+minCrIXOn f is w = fmap fst $ IS.foldl' g Nothing is
   where
-    g w mcrx cid = minOn snd <$> getpair cid <*> mcrx
+    g mcrx cid = minOn snd <$> getpair cid <*> mcrx
     getpair cid = fmap h $ w ^? creatures . ix cid
     h cr = (cr, f cr)
 
-zoneCreature :: Creature -> CrZoning -> CrZoning
-zoneCreature cr = over getCrZoning (zoneCr' cr)
-
-zoneCr' :: Creature -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
-zoneCr' cr im = foldl' f im (zoneOfCr cr)
+zoneCreature :: Creature -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
+zoneCreature cr im = foldl' f im (zoneOfCr cr)
   where
-    f im i2 = zoneMonoid i2 (IS.singleton $ _crID cr) im
-
---crsInZones :: [Int2] -> CrZoning -> IS.IntSet
---crsInZones is 
+    f im' i2 = zoneMonoid i2 (IS.singleton $ _crID cr) im'

src/Dodge/Zoning/Wall.hs

@@ -0,0 +1,61 @@
+module Dodge.Zoning.Wall where
+import FoldableHelp
+import Dodge.Data
+import Geometry
+import Dodge.Zoning.Base
+import qualified IntMapHelp as IM
+
+import Data.Maybe
+import qualified Data.IntSet as IS
+import Control.Lens
+
+wlIXsNearPoint :: Point2 -> World -> IS.IntSet
+wlIXsNearPoint p w = zoneExtract (zoneOfPoint' wlZoneSize p) (w ^. wlZoning)
+
+wlIXsNearSeg :: Point2 -> Point2 -> World -> IS.IntSet
+wlIXsNearSeg sp ep w = zonesExtract (w ^. wlZoning) (zoneOfSeg' wlZoneSize sp ep)
+
+wlIXsNearRect :: Point2 -> Point2 -> World -> IS.IntSet
+wlIXsNearRect sp ep w = zonesExtract (w ^. wlZoning) $ zoneOfRect' wlZoneSize sp ep
+
+wlIXsNearCirc :: Point2 -> Float -> World -> IS.IntSet
+wlIXsNearCirc p r = wlIXsNearRect (p +.+ V2 r r) (p -.- V2 r r)
+
+wlsFromIXs :: World -> IS.IntSet -> [Wall]
+wlsFromIXs w = mapMaybe (\wlid -> w ^? walls . ix wlid) . IS.toList
+
+wlsNearPoint :: Point2 -> World -> [Wall]
+wlsNearPoint p w = wlsFromIXs w $ wlIXsNearPoint p w
+
+wlsNearSeg :: Point2 -> Point2 -> World -> [Wall]
+wlsNearSeg sp ep w = wlsFromIXs w $ wlIXsNearSeg sp ep w
+
+wlsNearRect :: Point2 -> Point2 -> World -> [Wall]
+wlsNearRect sp ep w = wlsFromIXs w $ wlIXsNearRect sp ep w
+
+wlsNearCirc :: Point2 -> Float -> World -> [Wall]
+wlsNearCirc p r w = wlsFromIXs w $ wlIXsNearCirc p r w
+
+wlZoneSize :: Float
+wlZoneSize = 50
+
+zoneOfWl :: Wall -> [Int2]
+zoneOfWl = uncurry (zoneOfSeg' wlZoneSize) . _wlLine
+
+--minCrIXOn :: Ord a => (Creature -> a) -> IS.IntSet -> World -> Maybe Creature
+--minCrIXOn f is w = fmap fst $ IS.foldl' g Nothing is
+--  where
+--    g mcrx cid = minOn snd <$> getpair cid <*> mcrx
+--    getpair cid = fmap h $ w ^? creatures . ix cid
+--    h cr = (cr, f cr)
+
+zoneWall :: Wall -> IM.IntMap (IM.IntMap IS.IntSet) -> IM.IntMap (IM.IntMap IS.IntSet)
+zoneWall wl im = foldl' f im (zoneOfWl wl)
+  where
+    f im' i2 = zoneMonoid i2 (IS.singleton $ _wlID wl) im'
+
+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

src/Dodge/Zoning/World.hs

@@ -0,0 +1,17 @@
+module Dodge.Zoning.World where
+import Dodge.Data
+import Geometry.Data
+
+zoneOfSight' :: Float -> World -> [Int2]
+zoneOfSight' s w = 
+    [ V2 a b 
+    | a <- [minimum xs .. maximum xs]
+    , b <- [minimum ys .. maximum ys]
+    ]
+  where 
+    --(xs,ys) = unzip $ map zoneOfPoint $ screenPolygon cfig w -- ++ [_cameraViewFrom w]
+    (xs,ys) = unzip $ map sizeZoneOfPoint $ _boundBox w -- ++ [_cameraViewFrom w]
+    sizeZoneOfPoint (V2 x y) = (f x, f y)
+      where
+        f = floor . (/ s)
+