Cleanup

src/Picture/Base.hs

@@ -73,13 +73,13 @@ polygon :: [Point2] -> Picture
 {-# INLINE polygon #-}
 polygon = map f . polyToTris
   where
-    f (V2 x y) = Verx (V3 x y 0) black [] BottomLayer polyNum
+    f (V2 x y) = Verx (V3 x y 0) black [] BottomLayer PolyShad
 
 polygonCol :: [(Point2, RGBA)] -> Picture
 {-# INLINE polygonCol #-}
 polygonCol = polyToTris . map f
   where
-    f (V2 x y, col) = Verx (V3 x y 0) col [] BottomLayer polyNum
+    f (V2 x y, col) = Verx (V3 x y 0) col [] BottomLayer PolyShad
 
 poly3 :: [Point3] -> Picture
 {-# INLINE poly3 #-}
@@ -89,7 +89,7 @@ poly3Col :: [(Point3, RGBA)] -> Picture
 {-# INLINE poly3Col #-}
 poly3Col = map f . polyToTris
   where
-    f (pos, col) = Verx pos col [] BottomLayer polyNum
+    f (pos, col) = Verx pos col [] BottomLayer PolyShad
 
 ---- given a one and two zeros of a linear function over x and y,
 ---- determine the function
@@ -175,7 +175,7 @@ circleSolidCol colC colE r =
         , (V3 r (- r) 0, black)
         ]
   where
-    f (pos, col) = Verx pos col [] BottomLayer ellNum
+    f (pos, col) = Verx pos col [] BottomLayer EllShad
 
 circle :: Float -> Picture
 {-# INLINE circle #-}
@@ -221,7 +221,7 @@ drawText :: Float -> String -> [Verx]
 {-# INLINE drawText #-}
 drawText gap = map f . stringToList gap
   where
-    f (pos, col, V3 a b c) = Verx pos col [a, b, c, 1] BottomLayer textNum
+    f (pos, col, V3 a b c) = Verx pos col [a, b, c, 1] BottomLayer TextShad
 
 line :: [Point2] -> Picture
 {-# INLINE line #-}