1 files changed, 33 insertions, 16 deletions

diff --git a/src/Wavefront.hs b/src/Wavefront.hs
index 51a0e6b..2131d96 100644
--- a/src/Wavefront.hs
+++ b/src/Wavefront.hs
@@ -48,12 +48,15 @@ objBookKeeping builder = (lift Rank2.<$> builder)
     , points = \xs -> do
         n <- gets objLocations
         lift $ points builder $ fixupRef n <$> xs
+        incrementCount objPoints $ \x o -> o { objPoints = x }
     , line = \ts -> do
         o <- get
         lift $ line builder $ fixupTriple o <$> ts
+        incrementCount objLines $ \x o -> o { objLines = x }
     , face = \ts -> do
         o <- get
         lift $ face builder $ fixupTriple o <$> ts
+        incrementCount objFaces $ \x o -> o { objFaces = x }
     }
 
 mkv :: [Double] -> Location
@@ -115,26 +118,40 @@ buildOBJ = nullBuilder
         modify $ second $ \e -> e { elSmoothingGroup = fromIntegral x }
     }
 
-parse :: L.ByteString -> OBJ Vector
-parse bs = Rank2.fmap (Vector.fromList . DList.toList) obj
- where
-    b = objBookKeeping buildOBJ
-    ls = OBJ
-            { objLocations = DList.empty
-            , objTexCoords = DList.empty
-            , objNormals   = DList.empty
-            , objPoints    = DList.empty
-            , objLines     = DList.empty
-            , objFaces     = DList.empty
-            , objMtlLibs   = DList.empty
-            }
-    c = Rank2.fmap (const $ Count 0) ls :: OBJ Count
-    el = Element
+blankElement :: Element ()
+blankElement = Element
             { elObject         = Nothing
             , elGroups         = []
             , elMtl            = Nothing
             , elSmoothingGroup = 0
             , elValue          = ()
             }
+
+emptyCounts :: OBJ Count
+emptyCounts = OBJ
+            { objLocations = Count 0
+            , objTexCoords = Count 0
+            , objNormals   = Count 0
+            , objPoints    = Count 0
+            , objLines     = Count 0
+            , objFaces     = Count 0
+            , objMtlLibs   = Count 0
+            }
+
+mzeroOBJ :: MonadPlus m => OBJ m
+mzeroOBJ = OBJ
+            { objLocations = mzero
+            , objTexCoords = mzero
+            , objNormals   = mzero
+            , objPoints    = mzero
+            , objLines     = mzero
+            , objFaces     = mzero
+            , objMtlLibs   = mzero
+            }
+
+parse :: L.ByteString -> OBJ Vector
+parse bs = Rank2.fmap (Vector.fromList . DList.toList) obj
+ where
+    b = objBookKeeping buildOBJ
     substvars = ObjConfig IntMap.empty
-    (obj,_) = execState (runStateT (parseOBJ b substvars bs) c) (ls,el)
+    (obj,_) = execState (runStateT (parseOBJ b substvars bs) emptyCounts) (mzeroOBJ,blankElement)