This seems to work to use skycube and object texturing together.

1 files changed, 7 insertions, 1 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index 70493bd..8c46d54 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -31,6 +31,8 @@ import LambdaCube.GL as LC
 import LambdaCube.IR as LC
 import LambdaCube.Gtk
 import LambdaCube.GL.Data (uploadCubeMapToGPU)
+import LambdaCube.GL.Type (TextureData(..))
+import Text.Show.Pretty (ppShow)
 
 import CubeMap
 import GLWidget (nullableContext, withCurrentGL)
@@ -41,6 +43,7 @@ import LoadMesh
 import InfinitePlane
 import MtlParser (ObjMaterial(..))
 import Matrix
+import SavedPipeline
 
 -- State created by uploadState.
 data State = State
@@ -193,7 +196,8 @@ new = do
     m <- do
         objName <- head . (++ ["cube.obj"]) <$> getArgs
         mobj <- loadOBJ objName
-        mpipeline <- loadPipeline "hello_obj2.json" $ do
+        -- mpipeline <- loadPipeline "hello_obj2.json" $ do
+        mpipeline <- (\s -> return (Right (DynamicPipeline savedPipeline (makeSchema s)))) $ do
           defObjectArray "SkyCube" Triangles $ do
             "position"  @: Attribute_V3F
           defObjectArray "objects" Triangles $ do
@@ -211,6 +215,8 @@ new = do
         return $ (,) <$> mobj <*> mpipeline
     either (\e _ -> hPutStrLn stderr e >> throwIO (userError e)) (&) m $ \(obj,pipeline) -> do
 
+        -- putStrLn $ ppShow (dynamicPipeline pipeline)
+
         ref <- newIORef Nothing
         -- glarea <- newGLWidget return (lambdaRender app glmethods)
         do