Further strictifying

src/Dodge/Base/Zone.hs

@@ -19,12 +19,12 @@ floorHun :: Float -> Int
 floorHun x = floor $ x / zoneSize
 
 sizeZoneOfPoint :: Float -> Point2 -> (Int,Int)
-sizeZoneOfPoint s (x,y) = (f x, f y)
+sizeZoneOfPoint s (V2 x y) = (f x, f y)
   where
     f = floor . (/ s)
 
 zoneOfPoint :: Point2 -> (Int,Int)
-zoneOfPoint (x,y) = (floorHun x, floorHun y)
+zoneOfPoint (V2 x y) = (floorHun x, floorHun y)
 
 cloudZoneOfPoint :: Point2 -> (Int,Int)
 cloudZoneOfPoint = sizeZoneOfPoint 20
@@ -33,19 +33,19 @@ crZoneOfPoint :: Point2 -> (Int,Int)
 crZoneOfPoint = sizeZoneOfPoint 15
 
 zoneNearPoint :: Point2 -> [(Int,Int)]
-zoneNearPoint (x',y') = [(a,b) | a<-[x-1,x,x+1] , b<-[y-1,y,y+1]]
+zoneNearPoint (V2 x' y') = [(a,b) | a<-[x-1,x,x+1] , b<-[y-1,y,y+1]]
   where 
     x = floorHun x'
     y = floorHun y'
 
 zoneAroundPoint :: Point2 -> [(Int,Int)]
-zoneAroundPoint (x',y') = [(a,b) | a<-[x-3..x+3] , b<-[y-3..y+3]]
+zoneAroundPoint (V2 x' y') = [(a,b) | a<-[x-3..x+3] , b<-[y-3..y+3]]
   where 
     x = floorHun x'
     y = floorHun y'
 
 zoneAroundPoint' :: Int -> Point2 -> IM.IntMap IS.IntSet
-zoneAroundPoint' i (x',y') = IM.fromSet (const ys) xs
+zoneAroundPoint' i (V2 x' y') = IM.fromSet (const ys) xs
   where 
     x = floorHun x'
     y = floorHun y'
@@ -65,10 +65,10 @@ bresx a b = digitalLine (x-1,y-1) (x'-1,y'-1)
     (x',y') = zoneOfPoint b
 
 zoneOfLine :: Point2 -> Point2 -> [(Int,Int)]
-zoneOfLine (aa,ab) (ba,bb) 
+zoneOfLine (V2 aa ab) (V2 ba bb) 
     = nub 
     . concatMap f 
-    $ digitalLine (zoneOfPoint (aa,ab)) (zoneOfPoint (ba,bb))
+    $ digitalLine (zoneOfPoint (V2 aa ab)) (zoneOfPoint (V2 ba bb))
   where 
     f (x,y) = [(p,r) | p <-[x-1,x,x+1] , r<-[y-1,y,y+1]]
 
@@ -154,7 +154,7 @@ wallsNearZones is w -- = IM.unions [f b $ f a $ _wallsZone w | (a,b) <- is]
         _        -> IM.empty
 
 ixZone :: IM.IntMap (IM.IntMap a) -> Point2 -> a
-ixZone z (x,y) = z IM.! floorHun x IM.! floorHun y
+ixZone z (V2 x y) = z IM.! floorHun x IM.! floorHun y
 
 ixNZ :: IM.IntMap (IM.IntMap a) -> Point2 -> [a]
 ixNZ z p = lookLookups (zoneNearPoint p) z