Redo shape vertices as a list, should allow for mirroring

src/Shape.hs

@@ -45,7 +45,7 @@ prismPoly
     -> [Point3] 
     -> Shape
 {-# INLINE prismPoly #-}
-prismPoly upps downps = S.yield (ShapeObj (TopPrism n) (S.each $ f upps downps))
+prismPoly upps downps = S.yield (ShapeObj (TopPrism n) (f upps downps))
   where
     n = length upps
     f (a:as) (b:bs) = g a:g b:f as bs
@@ -58,7 +58,7 @@ upperPrismPoly
     -> [Point2] 
     -> Shape
 {-# INLINE upperPrismPoly #-}
-upperPrismPoly h ps = S.yield (ShapeObj (TopPrism n) (S.each $ f ps))
+upperPrismPoly h ps = S.yield (ShapeObj (TopPrism n) (f ps))
   where
     n = length ps
     g h' (V2 x y) = pairToSV (V3 x y h', black)
@@ -70,7 +70,7 @@ upperPrismPolyHalf
     -> [Point2] 
     -> Shape
 {-# INLINE upperPrismPolyHalf #-}
-upperPrismPolyHalf h ps = S.yield (ShapeObj (TopPrism n) (S.each $ f upps downps))
+upperPrismPolyHalf h ps = S.yield (ShapeObj (TopPrism n) (f upps downps))
   where
     n = length ps
     upps = map f' ps
@@ -88,17 +88,9 @@ overColSH :: (Point4 -> Point4) -> Shape -> Shape
 {-# INLINE overColSH #-}
 overColSH = S.map . overColObj
 
---overColSHM :: Monad m => (Point4 -> m Point4) -> Shape -> m Shape
---{-# INLINE overColSHM #-}
---overColSHM = mapM . overColObjM
-
-overPosSHI :: (Point3 -> Point3) -> Shape -> Shape
-{-# INLINE overPosSHI #-}
-overPosSHI = S.map . overPosObj
-
 translateSH :: Point3 -> Shape -> Shape
 {-# INLINE translateSH #-}
-translateSH !p = overPosSHI (+.+.+ p)
+translateSH !p = overPosSH (+.+.+ p)
 
 translateSHf :: Float -> Float -> Shape -> Shape
 {-# INLINE translateSHf #-}
@@ -110,23 +102,23 @@ translateSHz !z = translateSH (V3 0 0 z)
 
 rotateSH :: Float -> Shape -> Shape
 {-# INLINE rotateSH #-}
-rotateSH = overPosSHI . rotate3
+rotateSH = overPosSH . rotate3
 
 overPosSH :: (Point3 -> Point3) -> Shape -> Shape
 {-# INLINEABLE overPosSH #-}
-overPosSH = overPosSHI
+overPosSH = S.map . overPosObj
 
 rotateSHx :: Float -> Shape -> Shape
 {-# INLINE rotateSHx #-}
-rotateSHx a = overPosSHI (rotate3x a)
+rotateSHx a = overPosSH (rotate3x a)
 
 scaleSH :: Point3 -> Shape -> Shape
 {-# INLINE scaleSH #-}
-scaleSH (V3 a b c) = overPosSHI (\(V3 x y z) -> V3 (x*a) (y*b) (z*c))
+scaleSH (V3 a b c) = overPosSH (\(V3 x y z) -> V3 (x*a) (y*b) (z*c))
 
 overColObj :: (Point4 -> Point4) -> ShapeObj -> ShapeObj
 {-# INLINE overColObj #-}
-overColObj f (ShapeObj st vs) = ShapeObj st (S.map (overColVertex f) vs)
+overColObj f (ShapeObj st vs) = ShapeObj st (fmap (overColVertex f) vs)
 
 --overColObjM :: Monad m => (Point4 -> m Point4) -> ShapeObj -> m ShapeObj
 --{-# INLINE overColObjM #-}
@@ -138,7 +130,7 @@ overColVertex f (ShapeV a b) = ShapeV a (f b)
 
 overPosObj :: (Point3 -> Point3) -> ShapeObj -> ShapeObj
 {-# INLINE overPosObj #-}
-overPosObj f (ShapeObj st vs) = ShapeObj st $ S.map (overPosVertex f) vs
+overPosObj f (ShapeObj st vs) = ShapeObj st $ fmap (overPosVertex f) vs
 
 overPosVertex :: (Point3 -> Point3) -> ShapeV -> ShapeV
 {-# INLINE overPosVertex #-}