Move configuration from world to universe

src/Dodge/Zone.hs

@@ -76,17 +76,17 @@ zoneOfLineIntMap = ddaExt zoneSize
 zoneOfCircle :: Point2 -> Float -> [(Int,Int)]
 zoneOfCircle p r = concatMap zoneNearPoint $ divideCircle (1.5 * zoneSize) p r
 
-zoneOfSight :: World -> [(Int,Int)]
-zoneOfSight w = 
+zoneOfSight :: Configuration -> World -> [(Int,Int)]
+zoneOfSight cfig w = 
     [(a,b) 
         | a <- [minimum xs .. maximum xs]
         , b <- [minimum ys .. maximum ys]
     ]
   where 
-    (xs,ys) = unzip $ map zoneOfPoint $ screenPolygon w ++ [_cameraViewFrom w]
+    (xs,ys) = unzip $ map zoneOfPoint $ screenPolygon cfig w ++ [_cameraViewFrom w]
 
-wallsDoubleScreen :: World -> IM.IntMap Wall
-wallsDoubleScreen w
+wallsDoubleScreen :: Configuration -> World -> IM.IntMap Wall
+wallsDoubleScreen cfig w
     -- = foldl' (flip $ IM.union . \i -> innerFold (f i (_znObjects $ _wallsZone w))) IM.empty xs
     -- for some reason (TODO diagnose) the foldl' version causes errors
     = foldr (IM.union . \i -> innerFold (f i (_znObjects $ _wallsZone w))) IM.empty xs
@@ -97,13 +97,13 @@ wallsDoubleScreen w
         _        -> IM.empty
     (x,y) = zoneOfPoint $ _cameraCenter w
     n = ceiling (wh / (_cameraZoom w * zoneSize)) * 2
-    wh = max (getWindowX w) (getWindowY w)
+    wh = max (getWindowX cfig) (getWindowY cfig)
     xs = [x - n .. x + n]
     ys = [y - n .. y + n]
 
-wallsOnScreen :: World -> IM.IntMap Wall
+wallsOnScreen :: Configuration -> World -> IM.IntMap Wall
 {-# INLINABLE wallsOnScreen #-}
-wallsOnScreen w
+wallsOnScreen cfig w
    -- = foldl' (flip $ IM.union . \i -> innerFold (f i (_znObjects $ _wallsZone w))) IM.empty xs
     = foldr (IM.union . \i -> innerFold (f i (_znObjects $ _wallsZone w))) IM.empty xs
   where 
@@ -114,7 +114,7 @@ wallsOnScreen w
         _        -> IM.empty
     (x,y) = zoneOfPoint $ _cameraCenter w
     n = ceiling (wh / (_cameraZoom w * zoneSize))
-    wh = max (getWindowX w) (getWindowY w)
+    wh = max (getWindowX cfig) (getWindowY cfig)
     xs = [x - n .. x + n]
     ys = [y - n .. y + n]