1 files changed, 7 insertions, 5 deletions

diff --git a/src/Graphics/WaveFront/Model.hs b/src/Graphics/WaveFront/Model.hs
index 96172a8..dfd90ef 100644
--- a/src/Graphics/WaveFront/Model.hs
+++ b/src/Graphics/WaveFront/Model.hs
@@ -60,7 +60,7 @@ import           Data.Set (Set)
 import Data.List   (groupBy)
 import Data.Maybe  (listToMaybe, catMaybes)
 
-import Linear (V2(..), V3(..))
+import Linear (V2(..), V3(..), V4(..))
 
 import Control.Lens ((^.), (.~), (%~), (&), _1, _2, _3)
 
@@ -271,14 +271,16 @@ tessellate = indices %~ triangles
 --        - Refactor
 --        - Folding over applicative (fold in parallel)
 --        - Make sure the order is right
-bounds :: (Num f, Ord f, Foldable m, HasVertices (Model f s i m) (m (V3 f))) => Model f s i m -> BoundingBox (V3 f)
+bounds :: (Num f, Ord f, Foldable m, HasVertices (Model f s i m) (m (V4 f))) => Model f s i m -> BoundingBox (V3 f)
 bounds model = fromExtents $ axisBounds (model^.vertices) <$> V3 x y z
   where
     -- TODO | - Factor out 'minmax'
     minmaxBy :: (Ord o, Num o, Foldable m) => (a -> o) -> m a -> (o, o)
     minmaxBy f values = foldr (\val' acc -> let val = f val' in (min val (fst acc), max val (snd acc))) (0, 0) values -- TODO: Factor out
 
-    axisBounds vs axis = minmaxBy (^.axis) vs
+    axisBounds vs axis = minmaxBy ((^.axis) . proj) vs
+
+    proj (V4 x y z _) = V3 x y z
 
 -- Orphaned TODOs?
 
@@ -316,7 +318,7 @@ diffuseColours faces' = V.concatMap (\f -> V.replicate (V.length $ f^.indices) (
 --        - Add docstrings
 
 -- |
-unindexedVertices :: Model f Text Int Vector -> Maybe (Vector (V3 f))
+unindexedVertices :: Model f Text Int Vector -> Maybe (Vector (V4 f))
 unindexedVertices model = sequence $ fromFaceIndices (model^.vertices) (index) (^.ivertex) (model^.faces)
   where
     index coords i = coords !? (i-1)
@@ -326,7 +328,7 @@ unindexedNormals model = sequence $ fromFaceIndices (model^.normals) (index) (^.
   where
     index coords mi = mi >>= \i -> coords !? (i-1)
 
-unindexedTexcoords :: Model f Text Int Vector -> Maybe (Vector (V2 f))
+unindexedTexcoords :: Model f Text Int Vector -> Maybe (Vector (V3 f))
 unindexedTexcoords model = sequence $ fromFaceIndices (model^.texcoords) (index) (^.itexcoord) (model^.faces)
   where
     index coords mi = mi >>= \i -> coords !? (i-1)