Refactor, move towards adding cylinders

2023-03-16 17:01:58 +00:00
parent 24c1264f96
commit 46d6d91138
4 changed files with 70 additions and 62 deletions
@@ -13,16 +13,13 @@ import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data

-{-# INLINE shVfromList #-}
-shVfromList = id
-
-{-# INLINE shEfromList #-}
-shEfromList = id
-data ShapeType = TopPrism { _prismSize :: Int }
-    | TopBox { _topBoxSize :: Int }
-    | TopCylinder { _topCylinderSize :: Int }
+data ShapeType 
+    = TopPrism { _prismSize :: Int }
+    | FlatFaces { _topBoxSize :: Int }
+    | RoundedFaces { _shapeHalfSize :: Int }
+    | Cylinder { _cylinderSize :: Int }
    deriving (Eq, Ord, Show, Read)
-- for TopCylinder, the first vertex in _sfVs should be the center of the top
+-- for RoundedFaces, the first vertex in _sfVs should be the center of the top
 -- plane, the second should be the center of the bottom plane.

 data Surface = Surface