Mid strictifying

src/Geometry.hs

@@ -53,13 +53,13 @@ closestPointOnLineParam !a !b !p
     = (p -.- a) `dotV` (b -.- a) / (b -.- a) `dotV` (b -.- a)
 -- | Draw a rectangle based on maximal N E S W values.
 rectNESW :: Float -> Float -> Float -> Float -> [Point2]
-rectNESW !a !b !c !d = [(b,a),(b,c),(d,c),(d,a) ]
+rectNESW !a !b !c !d = [(V2 b a),(V2 b c),(V2 d c),(V2 d a) ]
 -- | Draw a rectangle based on maximal N S E W values.
 rectNSEW :: Float -> Float -> Float -> Float -> [Point2]
 rectNSEW !n !s !e !w = rectNESW n e s w
 -- | Draw a rectangle based on maximal N S W E values.
 rectNSWE :: Float -> Float -> Float -> Float -> [Point2]
-rectNSWE !n !s !w !e = [ (w,n), (w,s), (e,s), (e,n)]
+rectNSWE !n !s !w !e = [ (V2 w n), (V2 w s), (V2 e s), (V2 e n)]
 -- | Draw a rectangle around the origin with given height and width
 rectWdthHght :: Float -> Float -> [Point2]
 rectWdthHght w h = rectNSWE h (-h) (-w) w
@@ -83,12 +83,12 @@ errorPointInPolygon !i !p xs
     | otherwise = error $ "errorPointInPolygon "++ show i
 -- | Debug version of 'normalizeV'.
 errorNormalizeV :: Int -> Point2 -> Point2
-errorNormalizeV !i (0,0) = error $ "problem with function: errorNormalizeV "++show i
+errorNormalizeV !i (V2 0 0) = error $ "problem with function: errorNormalizeV "++show i
 errorNormalizeV _ !p = normalizeV p
 -- | Debug version of 'angleVV'.
 errorAngleVV :: Int -> Point2 -> Point2 -> Float
-errorAngleVV !i (0,0) _ = error $ "problem with function: errorAngleVV "++show i
-errorAngleVV !i _ (0,0) = error $ "problem with function: errorAngleVV "++show i
+errorAngleVV !i (V2 0 0) _ = error $ "problem with function: errorAngleVV "++show i
+errorAngleVV !i _ (V2 0 0) = error $ "problem with function: errorAngleVV "++show i
 errorAngleVV _  !p !p' = angleVV p p'
 -- | Debug version of 'isLHS'.
 errorIsLHS :: Int -> Point2 -> Point2 -> Point2 -> Bool
@@ -114,9 +114,9 @@ isLHS
     -> Bool
 {-# INLINE isLHS #-}
 isLHS 
-    (x,y)      
-    (x',y')   
-    (x'',y'') 
+    (V2 x y)      
+    (V2 x' y')   
+    (V2 x'' y'') 
     | (x,y) == (x',y')  = False
     | otherwise = a1 * b2 - a2 * b1 > 0
   where 
@@ -133,9 +133,9 @@ isRHS
     -> Bool
 {-# INLINE isRHS #-}
 isRHS 
-    (x,y)       
-    (x',y')    
-    (x'',y'')  
+    (V2 x y)       
+    (V2 x' y')    
+    (V2 x'' y'')  
     | (x,y) == (x',y')  = False
     | otherwise = a1 * b2 - a2 * b1 < 0
   where 
@@ -166,7 +166,7 @@ addPointPolygon p ps
     | otherwise = orderPolygon $ p : ps
 -- | Creates the convex hull of a set of points.
 convexHull :: [Point2] -> [Point2]
-convexHull (x:y:z:xs) = grahamScan $ orderAroundFirst $ sortOn (\(a,b) -> (b,a)) (x:y:z:xs)
+convexHull (x:y:z:xs) = grahamScan $ orderAroundFirst $ sortOn (\(V2 a b) -> (b,a)) (x:y:z:xs)
 convexHull _ = error "Tried to create the convex hull of two or fewer points"
 
 grahamScan :: [Point2] -> [Point2]
@@ -259,10 +259,10 @@ polyToTris _ = []
 
 -- | Return n equidistant points on a circle with a radius of 600.
 nRays :: Int -> [Point2]
-nRays n = take n $ iterate (rotateV (2*pi/fromIntegral n)) (600,0)
+nRays n = take n $ iterate (rotateV (2*pi/fromIntegral n)) (V2 600 0)
 -- | Return n equidistant points on a circle with a radius of x.
 nRaysRad :: Int -> Float -> [Point2]
-nRaysRad n x = take n $ iterate (rotateV (2*pi/fromIntegral n)) (x,0)
+nRaysRad n x = take n $ iterate (rotateV (2*pi/fromIntegral n)) (V2 x 0)
 -- | Test whether an angle is to the left of another angle, according to the
 -- smallest change in rotation between them.
 -- This appears to sometimes fail if the angles are not normalized.
@@ -366,7 +366,7 @@ reflectInParam :: Float -> Point2 -> Point2 -> Point2
 reflectInParam x line vec = 
     let angle = 2 * angleBetween line vec
         rAng = rotateV angle vec
-        p = x *.* errorClosestPointOnLine 3 (0,0) (vNormal line) rAng
+        p = x *.* errorClosestPointOnLine 3 (V2 0 0) (vNormal line) rAng
     in  rAng -.- p
 --reflectIn' :: Point2 -> Point2 -> Point2 -> Point2 -> Point2
 --reflectIn' l1 l2 v1 v2 = v1 +.+ reflectIn (l1 -.- l2) (v2 -.- v1)
@@ -497,4 +497,4 @@ pointIsInCone
 pointIsInCone c (rightp,leftp) p = isLHS c rightp p && isLHS leftp c p
 -- | TODO: implement using Control.Foldl
 centroid :: Foldable t => t Point2 -> Point2
-centroid xs = 1 / fromIntegral (length xs) *.* foldl' (+.+) (0,0) xs
+centroid xs = 1 / fromIntegral (length xs) *.* foldl' (+.+) (V2 0 0) xs