Mid strictifying

src/Dodge/Picture.hs

@@ -36,21 +36,21 @@ wedgeOfThickness :: Float -> Point2 -> Point2 -> Picture
 wedgeOfThickness t x y 
     | x == y    = blank
     | otherwise = pictures 
-        [uncurry translate x $ circleSolid (0.5*t)
+        [uncurryV translate x $ circleSolid (0.5*t)
         ,polygon [x +.+ n x y, x -.- n x y, y]
         ]
   where 
     n a b = (t*0.5) *.* errorNormalizeV 4200 (vNormal (a -.- b))
 
 verticalPipe :: Float -> Color -> Point2 -> Float -> Float -> Picture
-verticalPipe w col (xx,xy) za zb = pictures $ map (poly3Col . f) ps
+verticalPipe w col (V2 xx xy) za zb = pictures $ map (poly3Col . f) ps
   where
-    x = (xx,xy,0)
-    xs = map (\(a,b) -> x +.+.+ (a,b,za)) [(w,0),(0,w),(-w,0),(0,-w)]
+    x = (V3 xx xy 0)
+    xs = map (\(V2 a b) -> x +.+.+ (V3 a b za)) (map toV2 [(w,0),(0,w),(-w,0),(0,-w)])
     ps = zip xs (tail xs ++ [head xs])
     f (a,b) = map f' [a,b,g b,g a]
     g :: Point3 -> Point3
-    g (a,b,_) = (a,b,zb)
+    g (V3 a b _) = (V3 a b zb)
     f' a = (a,col)
 
 expandLine :: Point3 -> Point3 -> Point3 -> [Point3]