1 files changed, 7 insertions, 6 deletions

diff --git a/src/Graphics/WaveFront/Types.hs b/src/Graphics/WaveFront/Types.hs
index ccd1425..5b093de 100644
--- a/src/Graphics/WaveFront/Types.hs
+++ b/src/Graphics/WaveFront/Types.hs
@@ -43,7 +43,7 @@ module Graphics.WaveFront.Types where
 import Data.Functor.Classes (Show1) --Eq1, Show1, showsPrec1, eq1)
 import Data.Map as M (Map)
 import Data.Set as S (Set)
-import Linear (V2(..), V3(..))
+import Linear (V2(..), V3(..), V4(..))
 
 
 
@@ -65,9 +65,9 @@ import Linear (V2(..), V3(..))
 --
 --        - Cover the entire spec (http://www.martinreddy.net/gfx/3d/OBJ.spec)
 --          (and handle unimplemented attributes gracefully)
-data OBJToken f s i m = OBJVertex   (V3 f) |
+data OBJToken f s i m = OBJVertex   (V4 f) |
                         OBJNormal   (V3 f) |
-                        OBJTexCoord (V2 f) |
+                        OBJTexCoord (V3 f) |
                         OBJFace (m (VertexIndices i)) | -- TODO: Associate material with each face, handle absent indices
 
                         Line i i | -- Line (I'm assuming the arguments are indices to the endpoint vertices)
@@ -202,9 +202,9 @@ data Material f s = Material {
 -- fTextures  :: Set s,
 -- data Model f s i m = Model {
 data Model f s i m = Model {
-  fVertices  :: m (V3 f),
+  fVertices  :: m (V4 f),
   fNormals   :: m (V3 f),
-  fTexcoords :: m (V2 f),
+  fTexcoords :: m (V3 f),
   fFaces     :: m (Face f s i m),
   fMaterials :: MTLTable f s,         -- TODO: Type synonym (?)
   fGroups    :: Map (Set s) (i, i), -- TODO: Type synonym
@@ -229,6 +229,7 @@ deriving instance (Show1 m,
                    Show (m f),
                    Show (m (V2 f)),
                    Show (m (V3 f)),
+                   Show (m (V4 f)),
                    Show (m (Face f s i m)),
                    Show (m s),
                    Show f,
@@ -251,4 +252,4 @@ deriving instance (Show1 m,
                    Show (m s),
                    Show f,
                    Show s,
-                   Show i) => Show (OBJToken f s i m) -- where showsPrec = _
\ No newline at end of file
+                   Show i) => Show (OBJToken f s i m) -- where showsPrec = _