1 files changed, 50 insertions, 10 deletions

diff --git a/LoadMesh.hs b/LoadMesh.hs
index aaf0e06..cd7a8ad 100644
--- a/LoadMesh.hs
+++ b/LoadMesh.hs
@@ -18,6 +18,7 @@ import Data.Maybe
 import Data.Map (Map)
 import qualified Data.Map as Map
 import qualified Data.Vector as V
+import qualified Data.Vector.Storable as StorableV
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.Lazy.Char8 as L
 import Data.Text (unpack,Text,pack)
@@ -37,10 +38,19 @@ data MaterialMesh m = MaterialMesh
     , materialMasks :: Map Text Mask
     }
 
-type MeshData = ( [MaterialMesh Mesh]  -- List of uniform-material meshes (and the name of the material).
-                , ( V.Vector MtlLib    -- Material definitions.
-                  , FilePath )         -- Path to wavefront obj file.
-                )
+data CurveData = CurveData
+    { curves   :: [Curve]
+    , curvePt  :: Int -> Location
+    , curveMax :: Int
+    }
+
+
+data MeshData = MeshData
+    { matMeshes :: [MaterialMesh Mesh]  -- List of uniform-material meshes (and the name of the material).
+    , matLib    :: ( V.Vector MtlLib    -- Material definitions.
+                   , FilePath )         -- Path to wavefront obj file.
+    , matCurves :: CurveData
+    }
 
 relativeFrom :: FilePath -> FilePath -> FilePath
 relativeFrom path file | isAbsolute file = file
@@ -51,7 +61,12 @@ loadOBJ fname = L.readFile fname >>= \bs -> do
     let  obj@OBJ{..} = Wavefront.parse bs
     -- load materials
     mtlLib <- mapM (readMtlWithFallback . relativeFrom fname . unpack) objMtlLibs
-    return $ Right (objToMesh obj,(mtlLib,fname))
+    return $ Right MeshData
+        { matMeshes = objToMesh obj
+        , matLib    = (mtlLib,fname)
+        , matCurves = objToCurveData obj
+        }
+
 
 
 data BoundingBox = BoundingBox
@@ -122,22 +137,37 @@ transformMesh t m = m
     { mAttributes = Map.adjust (tranformAttribute t) "position" (mAttributes m)
     }
 
-uploadOBJToGPU :: Maybe BoundingBox -> MeshData -> IO ([MaterialMesh GPUMesh],Matrix Float)
-uploadOBJToGPU scalebb (subModels,(mtlLib,objpath)) = do
-    let meshbb = foldMap (attribBoundingBox . mAttributes . materialMesh) subModels :: BoundingBox
+transformLocation :: Matrix Float -> Location -> Location
+transformLocation t (Location x y z w) = Location xx yy zz ww
+ where
+    [xx,yy,zz,ww] = toList $ t #> fromList [x,y,z,w]
+
+locationBoundingBox :: Location -> BoundingBox
+locationBoundingBox (Location x y z w) = BoundingBox x x y y z z
+
+uploadOBJToGPU :: Maybe BoundingBox -> MeshData -> IO (([MaterialMesh GPUMesh],CurveData),Matrix Float)
+uploadOBJToGPU scalebb (MeshData subModels (mtlLib,objpath) curveData) = do
+    let meshbb = foldMap (attribBoundingBox . mAttributes . materialMesh) subModels
+                 <> foldMap (foldMap (locationBoundingBox . curvePt curveData) . curvePoints)
+                            (curves curveData)
         m = maybe (ident 4) (scaleWithin meshbb) scalebb
+        curveData' = case scalebb of
+            Just _  -> curveData { curvePt = transformLocation m . curvePt curveData }
+            Nothing -> curveData
     putStrLn $ show meshbb
     gpuSubModels <- forM subModels $ \matmesh -> do
         a <- LambdaCubeGL.uploadMeshToGPU (transformMesh m (materialMesh matmesh))
         return matmesh { materialMesh = a }
-    return (gpuSubModels,m)
+    return ((gpuSubModels,curveData'),m)
 
 uploadMtlLib :: (V.Vector MtlLib,FilePath) -> IO (V.Vector (Map Text (ObjMaterial,TextureData)))
 uploadMtlLib (mtlLib,objpath) = do
   -- collect used textures
   let usedTextures = nub . concatMap (maybeToList . mtl_map_Kd) $ concatMap Map.elems $ V.toList mtlLib
       whiteImage = Juicy.ImageRGB8 $ Juicy.generateImage (\_ _ -> Juicy.PixelRGB8 255 255 255) 1 1
-      checkerImage = Juicy.ImageRGB8 $ Juicy.generateImage (\x y -> if mod (x + y) 2 == 0 then Juicy.PixelRGB8 0 0 0 else Juicy.PixelRGB8 255 255 0) 2 2
+      checkerImage = Juicy.ImageRGB8 $ Juicy.generateImage mkchecker 2 2
+                    where mkchecker x y = if mod (x + y) 2 == 0 then Juicy.PixelRGB8 0 0 0
+                                                                else Juicy.PixelRGB8 255 255 0
   checkerTex <- LC.uploadTexture2DToGPU checkerImage
   -- load images and upload to gpu
   textureLib <- forM (Map.fromList $ zip usedTextures usedTextures) $ \fname -> Juicy.readImage (relativeFrom objpath fname) >>= \case
@@ -147,6 +177,16 @@ uploadMtlLib (mtlLib,objpath) = do
   -- pair textures and materials
   return $ fmap (\a -> (a, maybe whiteTex (fromMaybe checkerTex . flip Map.lookup textureLib) . mtl_map_Kd $ a)) <$> mtlLib
 
+vecLocation :: Location -> StorableV.Vector Float
+vecLocation (Location x y z w) = StorableV.fromList [x,y,z,w]
+
+objToCurveData :: WavefrontOBJ -> CurveData
+objToCurveData OBJ{..} = CurveData
+    { curves   = map elValue $ V.toList $ objCurves
+    , curvePt  = (objLocations V.!)
+    , curveMax = V.length objLocations
+    }
+
 objToMesh :: WavefrontOBJ -> [MaterialMesh Mesh]
 objToMesh OBJ{..} = [ toMesh faceGroup | faceGroup <- faces ]
  where