Commit before attempting to remove bottom and mid picture layers

This commit is contained in:
2024-10-01 00:16:46 +01:00
parent c2214dae60
commit c3d112e52e
8 changed files with 28 additions and 14 deletions
+1 -1
View File
@@ -49,4 +49,4 @@ arcPart startA sw sc endA ew ec r centercol =
(V2 xa ya) = rotateV startA (V2 r 0)
(V2 xb yb) = rotateV (0.5 * (startA + endA)) (V2 (r * sqrt 2) 0)
(V2 xc yc) = rotateV endA (V2 r 0)
f (pos, col, V3 a b c) = Verx pos col [a, b, c] BottomLayer ArcShad
f (pos, col, V3 a b c) = Verx pos col [a, b, c] minBound ArcShad
+5 -5
View File
@@ -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 PolyShad
f (V2 x y) = Verx (V3 x y 0) black [] minBound PolyShad
polygonCol :: [(Point2, RGBA)] -> Picture
{-# INLINE polygonCol #-}
polygonCol = polyToTris . map f
where
f (V2 x y, col) = Verx (V3 x y 0) col [] BottomLayer PolyShad
f (V2 x y, col) = Verx (V3 x y 0) col [] minBound 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 PolyShad
f (pos, col) = Verx pos col [] minBound 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 EllShad
f (pos, col) = Verx pos col [] minBound 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 TextShad
f (pos, col, V3 a b c) = Verx pos col [a, b, c, 1] minBound TextShad
line :: [Point2] -> Picture
{-# INLINE line #-}
+1 -1
View File
@@ -46,4 +46,4 @@ arcTest' startA sw sc endA ew ec r centercol =
(V2 xa ya) = rotateV startA (V2 r 0)
(V2 xb yb) = rotateV (0.5 * (startA + endA)) (V2 (r * sqrt 2) 0)
(V2 xc yc) = rotateV endA (V2 r 0)
f (pos, col, V3 a b c) = Verx pos col [a, b, c] BottomLayer ArcShad
f (pos, col, V3 a b c) = Verx pos col [a, b, c] minBound ArcShad
+1 -1
View File
@@ -6,7 +6,7 @@ textGrad :: Color -> Color -> String -> Picture
{-# INLINE textGrad #-}
textGrad topc botc = map f . stringToListGrad topc botc
where
f (pos, col, V2 a b) = Verx pos col [a, b] BottomLayer TextShad
f (pos, col, V2 a b) = Verx pos col [a, b] minBound TextShad
-- no premature optimisation, consider changing to use texture arrays
stringToListGrad :: Color -> Color -> String -> [(Point3, Point4, Point2)]