Render curve from obj file.

1 files changed, 37 insertions, 3 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index a51cd3d..a2e4cbe 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -54,6 +54,10 @@ import Text.Printf
 import qualified Foreign.C.Types
 import System.FilePath
 import System.Directory
+import Wavefront.Types
+import Wavefront.Util
+
+
 
 import CubeMap
 import GLWidget (nullableContext, withCurrentGL)
@@ -160,8 +164,8 @@ stateChangeMesh obj mm storage st = do
     let glarea = mmWidget mm
     -- load OBJ geometry and material descriptions
     let workarea = BoundingBox (-2.5) (2.5) (-2.5) 2.5 (-2.5) (2.5)
-        mtlLib = snd obj
-    (objMesh,objscale) <- uploadOBJToGPU (Just workarea) obj
+        mtlLib = matLib obj
+    ((objMesh,curveData),objscale) <- uploadOBJToGPU (Just workarea) obj
     putStrLn $ "Using object scale:\n" ++ show objscale
     -- load materials textures
     gpuMtlLib <- uploadMtlLib mtlLib
@@ -172,6 +176,36 @@ stateChangeMesh obj mm storage st = do
         addToGroupsPane (mmListStore mm) True groupname
     writeIORef (stObjects st) bufs
     writeIORef (stMasks st) $ map (objSpan . maskableObject) bufs
+    forM_ (take 1 $ curves curveData) $ \c -> do
+        let mn = minimum $ curvePoints c
+            mx = maximum $ curvePoints c
+            bs = decomposeCurve (curvePt curveData) c
+        mapM_ (putStrLn . show) bs
+        clearRing (stRingBuffer st)
+        forM_ bs $ \(BezierSegment [a,b,c,d]) -> do
+            let cv = Bezier.Curve Nothing (vecLocation a)
+                                          (vecLocation b)
+                                          (vecLocation c)
+                                          (vecLocation d)
+                                          Nothing
+                δ = 0.005 -- TODO
+                range = Polygonization
+                    { curveBufferID     = error "curveBufferID"
+                    , curveStartIndex   = 0
+                    , curveSegmentCount = ringCapacity (stRingBuffer st)
+                    }
+            r <- subdivideCurve δ cv range $ \_ _ v -> do
+                RingBuffer.pushBack (stRingBuffer st) $ \RingPoint{..} -> do
+                    rpPosition @<- v
+                    rpColor @<- yellow
+            putStrLn $ "Subdivided "++show (curveSegmentCount r)++" poly-lines."
+            return ()
+        {-
+        RingBuffer.pushBack (stRingBuffer st) $ \RingPoint{..} -> do
+            rpPosition @<- V3 0 0 (0::Float)
+            rpColor @<- red -}
+        return ()
+    putStrLn $ "Returning from stateChangeMesh."
     return st
 
 initializeState :: MeshSketch -> GLStorage -> IO State
@@ -321,7 +355,7 @@ loadInitialMesh kont = do
     objName <- head . (++ ["cube.obj"]) <$> getArgs
     putStrLn $ "Loading object "++objName++"..."
     mobj <- loadOBJ objName
-    putStrLn $ "Finisehd loading object "++objName++"."
+    putStrLn $ "Finished loading object "++objName++"."
     kont mobj
 
 new :: IO Gtk.Paned