Reorganizing.

3 files changed, 24 insertions, 21 deletions

diff --git a/src/Wavefront.hs b/src/Wavefront.hs
index 6195eee..1fc8ec3 100644
--- a/src/Wavefront.hs
+++ b/src/Wavefront.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 module Wavefront where
 
-import Data.Wavefront
+import Wavefront.Types
 import Wavefront.Lex
 
 import Control.Arrow
@@ -16,10 +16,13 @@ import qualified Data.Vector                as Vector
          ;import Data.Vector                (Vector)
 import qualified Rank2
 
+type WavefrontOBJ = OBJ Vector
+
 newtype Count x = Count Int
 
-updateCount :: MonadState s m => (s -> Count x) -> (Count x -> s -> s) -> m ()
-updateCount field setField = do
+
+incrementCount :: MonadState s m => (s -> Count x) -> (Count x -> s -> s) -> m ()
+incrementCount field setField = do
     Count c0 <- gets field
     let c = succ c0
     c `seq` modify (setField $ Count c)
@@ -28,20 +31,20 @@ fixupRef :: Count x -> Int -> Int
 fixupRef (Count n) x | x >  0    = x - 1 -- Renumber from 0.
                      | otherwise = n + x -- Negative values are relative.
 
-fixupTriple :: WavefrontOBJ Count -> RefTriple -> RefTriple
+fixupTriple :: OBJ Count -> RefTriple -> RefTriple
 fixupTriple o (RefTriple v t n) =
     RefTriple (fixupRef (objLocations o) v)
               (fixupRef (objTexCoords o) <$> t)
               (fixupRef (objNormals   o) <$> n)
 
-objBookKeeping :: Monad m => ObjBuilder m -> ObjBuilder (StateT (WavefrontOBJ Count) m)
+objBookKeeping :: Monad m => ObjBuilder m -> ObjBuilder (StateT (OBJ Count) m)
 objBookKeeping builder = (lift Rank2.<$> builder)
     { vertex = \xs -> do lift $ vertex builder xs
-                         updateCount objLocations $ \x o -> o { objLocations = x }
+                         incrementCount objLocations $ \x o -> o { objLocations = x }
     , vertexT = \xs -> do lift $ vertexT builder xs
-                          updateCount objTexCoords $ \x o -> o { objTexCoords = x }
+                          incrementCount objTexCoords $ \x o -> o { objTexCoords = x }
     , vertexN = \xs -> do lift $ vertexN builder xs
-                          updateCount objNormals $ \x o -> o { objNormals = x }
+                          incrementCount objNormals $ \x o -> o { objNormals = x }
     , points = \xs -> do
         n <- gets objLocations
         lift $ points builder $ fixupRef n <$> xs
@@ -75,7 +78,7 @@ elemental element x = fmap (const x) element
 modifyFirst :: MonadState (c, d) m => (c -> c) -> m ()
 modifyFirst = modify' . first
 
-buildOBJ :: ObjBuilder (State (WavefrontOBJ DList,Element ()))
+buildOBJ :: ObjBuilder (State (OBJ DList,Element ()))
 buildOBJ = (nullBuilder $ pure ())
     { vertex = \xs -> modifyFirst $ \o -> o { objLocations = objLocations o `DList.snoc` mkv xs }
     , vertexT = \xs -> modifyFirst $ \o -> o { objTexCoords = objTexCoords o `DList.snoc` mkt xs }
@@ -112,11 +115,11 @@ buildOBJ = (nullBuilder $ pure ())
         modify $ second $ \e -> e { elSmoothingGroup = fromIntegral x }
     }
 
-parse :: L.ByteString -> WavefrontOBJ Vector
+parse :: L.ByteString -> OBJ Vector
 parse bs = Rank2.fmap (Vector.fromList . DList.toList) obj
  where
     b = objBookKeeping buildOBJ
-    ls = WavefrontOBJ
+    ls = OBJ
             { objLocations = DList.empty
             , objTexCoords = DList.empty
             , objNormals   = DList.empty
@@ -125,7 +128,7 @@ parse bs = Rank2.fmap (Vector.fromList . DList.toList) obj
             , objFaces     = DList.empty
             , objMtlLibs   = DList.empty
             }
-    c = Rank2.fmap (const $ Count 0) ls :: WavefrontOBJ Count
+    c = Rank2.fmap (const $ Count 0) ls :: OBJ Count
     el = Element
             { elObject         = Nothing
             , elGroups         = []
diff --git a/src/Data/Wavefront.hs b/src/Wavefront/Types.hs
index 2284d38..564f5d5 100644
--- a/src/Data/Wavefront.hs
+++ b/src/Wavefront/Types.hs
@@ -7,14 +7,14 @@
 {-# LANGUAGE RankNTypes            #-}
 {-# LANGUAGE StandaloneDeriving    #-}
 {-# LANGUAGE UndecidableInstances  #-}
-module Data.Wavefront where
+module Wavefront.Types where
 
 import Data.Kind
 import Data.Text (Text)
 import Numeric.Natural
 import qualified Rank2
 
-data WavefrontOBJ v = WavefrontOBJ {
+data OBJ v = OBJ {
     objLocations :: v Location
   , objTexCoords :: v TexCoord
   , objNormals   :: v Normal
@@ -24,7 +24,7 @@ data WavefrontOBJ v = WavefrontOBJ {
   , objMtlLibs   :: v Text
   }
 
-type ForThisWavefrontOBJ (c :: * -> Constraint) v =
+type ForThisOBJ (c :: * -> Constraint) v =
         ( c (v Location)
         , c (v TexCoord)
         , c (v Normal)
@@ -33,7 +33,7 @@ type ForThisWavefrontOBJ (c :: * -> Constraint) v =
         , c (v (Element Face))
         , c (v Text) )
 
-type ForAllWavefrontOBJ (c :: * -> Constraint) =
+type ForAllOBJ (c :: * -> Constraint) =
         ( c Location
         , c TexCoord
         , c Normal
@@ -43,10 +43,10 @@ type ForAllWavefrontOBJ (c :: * -> Constraint) =
         , c Text
         )
 
-deriving instance ForThisWavefrontOBJ Eq v => Eq (WavefrontOBJ v)
-deriving instance ForThisWavefrontOBJ Show v => Show (WavefrontOBJ v)
+deriving instance ForThisOBJ Eq v => Eq (OBJ v)
+deriving instance ForThisOBJ Show v => Show (OBJ v)
 
-instance Rank2.Functor WavefrontOBJ where
+instance Rank2.Functor OBJ where
     f <$> obj = obj
         { objLocations = f (objLocations obj)
         , objTexCoords = f (objTexCoords obj)
@@ -60,7 +60,7 @@ instance Rank2.Functor WavefrontOBJ where
 class Rank2.Functor g => Payload c g where
     mapPayload :: proxy c -> (forall a. c a => p a -> q a) -> g p -> g q
 
-instance ForAllWavefrontOBJ c => Payload c WavefrontOBJ where
+instance ForAllOBJ c => Payload c OBJ where
     mapPayload _ f obj = obj
         { objLocations = f (objLocations obj)
         , objTexCoords = f (objTexCoords obj)
diff --git a/wavefront-obj.cabal b/wavefront-obj.cabal
index d4df055..5baa231 100644
--- a/wavefront-obj.cabal
+++ b/wavefront-obj.cabal
@@ -15,7 +15,7 @@ extra-source-files:  CHANGELOG.md
 
 library
   exposed-modules:    Wavefront.Lex
-                    , Data.Wavefront
+                    , Wavefront.Types
                     , Wavefront
   -- other-modules:
   other-extensions:   ConstraintKinds