1 files changed, 24 insertions, 0 deletions

diff --git a/src/Wavefront/Types.hs b/src/Wavefront/Types.hs
index 99bbb15..2ab48ba 100644
--- a/src/Wavefront/Types.hs
+++ b/src/Wavefront/Types.hs
@@ -18,9 +18,12 @@ data OBJ v = OBJ {
     objLocations :: v Location
   , objTexCoords :: v TexCoord
   , objNormals   :: v Normal
+  , objEmbeddedCurves :: v EmbeddedCurve
   , objPoints    :: v (Element Point)
   , objLines     :: v (Element Line)
   , objFaces     :: v (Element Face)
+  , objCurves    :: v (Element Curve)
+  , objSurfaces  :: v (Element Surface)
   , objMtlLibs   :: v Text
   }
 
@@ -28,18 +31,24 @@ type ForThisOBJ (c :: * -> Constraint) v =
         ( c (v Location)
         , c (v TexCoord)
         , c (v Normal)
+        , c (v EmbeddedCurve)
         , c (v (Element Point))
         , c (v (Element Line))
         , c (v (Element Face))
+        , c (v (Element Curve))
+        , c (v (Element Surface))
         , c (v Text) )
 
 type ForAllOBJ (c :: * -> Constraint) =
         ( c Location
         , c TexCoord
         , c Normal
+        , c EmbeddedCurve
         , c (Element Point)
         , c (Element Line)
         , c (Element Face)
+        , c (Element Curve)
+        , c (Element Surface)
         , c Text
         )
 
@@ -51,9 +60,12 @@ instance Rank2.Functor OBJ where
         { objLocations = f (objLocations obj)
         , objTexCoords = f (objTexCoords obj)
         , objNormals   = f (objNormals obj)
+        , objEmbeddedCurves = f (objEmbeddedCurves obj)
         , objPoints    = f (objPoints obj)
         , objLines     = f (objLines obj)
         , objFaces     = f (objFaces obj)
+        , objCurves    = f (objCurves obj)
+        , objSurfaces  = f (objSurfaces obj)
         , objMtlLibs   = f (objMtlLibs obj)
         }
 
@@ -65,9 +77,12 @@ instance ForAllOBJ c => Payload c OBJ where
         { objLocations = f (objLocations obj)
         , objTexCoords = f (objTexCoords obj)
         , objNormals   = f (objNormals obj)
+        , objEmbeddedCurves = f (objEmbeddedCurves obj)
         , objPoints    = f (objPoints obj)
         , objLines     = f (objLines obj)
         , objFaces     = f (objFaces obj)
+        , objCurves    = f (objCurves obj)
+        , objSurfaces  = f (objSurfaces obj)
         , objMtlLibs   = f (objMtlLibs obj)
         }
 
@@ -111,6 +126,15 @@ data Normal = Normal {
   , norZ :: {-# UNPACK #-} !Float
   } deriving (Eq,Ord,Show)
 
+data EmbeddedCurve = EmbeddedCurve
+  deriving (Eq,Ord,Show)
+
+data Curve = Curve
+  deriving (Eq,Ord,Show)
+
+data Surface = Surface
+  deriving (Eq,Ord,Show)
+
 -- | A point is a single index that references the locations. It’s a canonical
 -- type that truly represents a polygonal point.
 data Point = Point {