2 files changed, 35 insertions, 9 deletions

diff --git a/src/Wavefront/Lex.hs b/src/Wavefront/Lex.hs
index f4cb54a..811553a 100644
--- a/src/Wavefront/Lex.hs
+++ b/src/Wavefront/Lex.hs
@@ -38,7 +38,7 @@ data ObjBuilder m = ObjBuilder
     , trim             :: [CurveSpec] -> m ()
     , hole             :: [CurveSpec] -> m ()
     , specialCurves    :: [CurveSpec] -> m ()
-    , equivalentCurves :: [EmbeddedCurve] -> m ()
+    , equivalentCurves :: [EmbeddedCurveRef] -> m ()
     , groups           :: [S.ByteString] -> m ()
     , smoothingGroup   :: Int -> m ()
     , mergingGroup     :: Int -> Double -> m ()
@@ -188,7 +188,7 @@ echoBuilder = ObjBuilder
     , trim             = \ss -> echo $ unwords ("trim":concatMap (\(CurveSpec s e r) -> [show s,show e,show r]) ss)
     , hole             = \ss -> echo $ unwords ("hole":concatMap (\(CurveSpec s e r) -> [show s,show e,show r]) ss)
     , specialCurves    = \ss -> echo $ unwords ("scrv":concatMap (\(CurveSpec s e r) -> [show s,show e,show r]) ss)
-    , equivalentCurves = \ccs -> echo $ unwords ("con":map showEmbeddedCurve ccs)
+    , equivalentCurves = \ccs -> echo $ unwords ("con":map showEmbeddedCurveRef ccs)
     , groups           = \gs -> echo $ unwords $ "g":map unpackUtf8 gs
     , smoothingGroup   = \sg -> echo ("s " ++ show sg)
     , mergingGroup     = \mg δ -> echo $ unwords ["mg",show mg,show δ]
@@ -264,6 +264,8 @@ newtype ObjConfig = ObjConfig
     { cfgSubst :: IntMap L.ByteString
     }
 
+defaultConfig = ObjConfig IntMap.empty
+
 -- consChunk :: S.ByteString -> L.ByteString -> L.ByteString
 -- consChunk c bs = L.fromChunks (c : L.toChunks bs)
 
@@ -430,11 +432,11 @@ parseCurveSpecsN n tok bs cont = parseFloatsN 2 tok bs $ \fs bs' -> case fs of
 
     _ -> cont [] bs'
 
-parseEmbeddedCurves :: (L.ByteString -> L.ByteString) -> L.ByteString -> ([EmbeddedCurve] -> L.ByteString -> b) -> b
-parseEmbeddedCurves tok bs cont = parseIntsN 1 tok bs $ \is bs' -> case is of
+parseEmbeddedCurveRefs :: (L.ByteString -> L.ByteString) -> L.ByteString -> ([EmbeddedCurveRef] -> L.ByteString -> b) -> b
+parseEmbeddedCurveRefs tok bs cont = parseIntsN 1 tok bs $ \is bs' -> case is of
     (sref:_) -> do
         parseCurveSpecsN 1 tok bs' $ \cs bs'' -> case cs of
-            (c:_) -> parseEmbeddedCurves tok bs'' $ cont . (EmbeddedCurve sref c :)
+            (c:_) -> parseEmbeddedCurveRefs tok bs'' $ cont . (EmbeddedCurveRef sref c :)
             _     -> cont [] bs''
 
     _ -> cont [] bs'
@@ -472,14 +474,14 @@ data CurveSpec = CurveSpec
     }
  deriving (Eq,Ord,Show)
 
-data EmbeddedCurve = EmbeddedCurve
+data EmbeddedCurveRef = EmbeddedCurveRef
     { curveSurfaceRef :: Int
     , embeddedCurve :: CurveSpec
     }
  deriving (Eq,Ord,Show)
 
-showEmbeddedCurve :: EmbeddedCurve -> String
-showEmbeddedCurve (EmbeddedCurve s c) = unwords
+showEmbeddedCurveRef :: EmbeddedCurveRef -> String
+showEmbeddedCurveRef (EmbeddedCurveRef s c) = unwords
     [ show s
     , show (curveStart c)
     , show (curveEnd c)
@@ -560,7 +562,7 @@ parseOBJ builder args bs0
                     then parseI deprecated_cdc 4 -- cdc
                     else parseI deprecated_cdp 4 -- cdp
         "co" -> -- con
-                parseEmbeddedCurves (findToken args) (next 2 bs) $ \ss bs' -> do
+                parseEmbeddedCurveRefs (findToken args) (next 2 bs) $ \ss bs' -> do
                     equivalentCurves builder ss
                     parseOBJ builder args bs'
         "cs" -> if lengthLessThan 3 bs
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 {