Cleanup redundant modules

src/Picture.hs

@@ -54,7 +54,6 @@ import Geometry
 import Geometry.Vector3D
 import Geometry.Data
 import Picture.Data
-import Picture.Tree
 
 import Data.List
 import Data.Bifunctor
@@ -125,6 +124,7 @@ bezierQuad cola colc ra rc a b c
     fa' = extrapolate aIn cIn bIn
     fc' = extrapolate cIn aIn bIn
 
+bzhelp :: [(Point2, Point4, (Float, Float), (Float, Float))] -> [(Int, RenderType)]
 bzhelp vs = zl $ RenderBezQ $ zip3 (map zeroZ ps) cols rs
   where 
     (ps,cols,offps,rads) = unzip4 vs
@@ -280,6 +280,7 @@ thickArc startA endA rad wdth
     r = rad + 0.5 * wdth
     w = 1 - wdth / r
 
+thickArcHelp :: Float -> Float -> Float -> Float -> [(Int, RenderType)]
 thickArcHelp startA endA rad wdth = zl $ RenderArc 
     [(  (0,0,0),black,(0,0,wdth))
     ,((xa,ya,0),black,(1,0,wdth))
@@ -334,3 +335,44 @@ bright (r,g,b,a) = (r*1.2,g*1.2,b*1.2,a)
 
 greyN :: Float -> Color
 greyN x = (x,x,x,1)
+
+overPos :: (Point3 -> Point3) -> RenderType -> RenderType
+--{-# INLINE overPos #-}
+overPos f (RenderPoly vs) = RenderPoly $ map (first f) vs
+overPos f (RenderText vs) = RenderText $ map (\(a,b,c) -> (f a,b,c)) vs
+overPos f (RenderBezQ vs) = RenderBezQ $ map (\(a,b,c) -> (f a,b,c)) vs
+overPos f (RenderEllipse vs) = RenderEllipse $ map (first f) vs
+overPos f (RenderArc vs)  = RenderArc $ map (\(a,b,c) -> (f a,b,c)) vs
+overPos f (RenderPolyZ vs) = RenderPolyZ $ map (\(a,b,c) -> (f a,b,c)) vs
+overPos _ _ = undefined
+
+overCol :: (Point4 -> Point4) -> RenderType -> RenderType
+--{-# INLINE overCol #-}
+overCol f (RenderPoly vs)     = RenderPoly    $ map (second f) vs
+overCol f (RenderEllipse vs)  = RenderEllipse $ map (second f) vs
+overCol f (RenderText vs)     = RenderText    $ map (\(a,b,c) -> (a,f b,c)) vs
+overCol f (RenderBezQ vs)     = RenderBezQ    $ map (\(a,b,c) -> (a,f b,c)) vs
+overCol f (RenderArc vs)      = RenderArc     $ map (\(a,b,c) -> (a,f b,c)) vs
+overCol f (RenderPolyZ vs)    = RenderPolyZ   $ map (\(a,b,c) -> (a,f b,c)) vs
+overCol _ _ = undefined
+
+-- no premature optimisation, consider changing to use texture arrays
+stringToList :: String -> [(Point3,Point4,Point2)]
+{-# INLINE stringToList #-}
+--stringToList s = concat $ zipWith charToTuple [0,0.9*dimText ..] s
+stringToList s = concatMap (uncurry charToTuple) $ zip [0,0.9*dimText ..] s
+  where
+    dimText = 100
+
+charToTuple :: Float -> Char -> [(Point3,Point4,Point2)]
+{-# INLINE charToTuple #-}
+charToTuple x c = 
+    [((x-50,-100,0),    white,(offset,1))
+    ,((x-50,100,0),     white,(offset,0))
+    ,((x+50,100,0),   white,(offset+1,0))
+    ,((x-50,-100,0),    white,(offset,1))
+    ,((x+50,-100,0),  white,(offset+1,1))
+    ,((x+50,100,0),   white,(offset+1,0))
+    ]
+  where 
+    offset = fromIntegral (fromEnum c) - 32