Experimenting...

1 files changed, 31 insertions, 8 deletions

diff --git a/GtkHello.hs b/GtkHello.hs
index bf83378..43de1d2 100644
--- a/GtkHello.hs
+++ b/GtkHello.hs
@@ -13,6 +13,7 @@ import qualified Data.Vector as V
 
 import LambdaCube.GL as LambdaCubeGL -- renderer
 import LambdaCube.GL.Mesh as LambdaCubeGL
+import LambdaCube.IR
 
 import Codec.Picture as Juicy
 
@@ -23,17 +24,18 @@ type State = ()
 
 data Event = Closed | Ignored
 
-view' :: State -> AppView Gtk.Window Event
-view' _ = bin
+view' :: Constants -> State -> AppView Gtk.Window Event
+view' storage _ = bin
     Gtk.Window
     [ #title := "LambdaCube 3D DSL Hello World"
     , on #deleteEvent $ {- GI.Gdk.Unions.Event.Event -> (Bool, Event) -} \_ -> (True,Closed)
     ]
-    $ widget Gtk.GLArea [onM #render render]
+    $ widget Gtk.GLArea [onM #render $ render storage]
 
 
 update' :: State -> Event -> Transition State Event
 update' _ Closed = Exit
+update' _ _      = Transition () (return Nothing)
 
 -- geometry data: triangles
 triangleA :: LambdaCubeGL.Mesh
@@ -54,9 +56,24 @@ triangleB = Mesh
     , mPrimitive    = P_Triangles
     }
 
-render :: GLContext -> Gtk.GLArea -> IO (Bool, Event)
-render _ _ = do
+data Constants = Constants
+    { cStorage  :: GLStorage
+    , cPipeline :: Pipeline
+    }
+
+
+render :: Constants -> GLContext -> Gtk.GLArea -> IO (Bool, Event)
+render c _ _ = do
     putStrLn "render!"
+
+    renderer <- LambdaCubeGL.allocRenderer (cPipeline c)
+
+    {-
+    -- upload geometry to GPU and add to pipeline input
+    LambdaCubeGL.uploadMeshToGPU triangleA >>= LambdaCubeGL.addMeshToObjectArray storage "objects" []
+    LambdaCubeGL.uploadMeshToGPU triangleB >>= LambdaCubeGL.addMeshToObjectArray storage "objects" []
+    -}
+
     return (True,Ignored)
 
 main :: IO ()
@@ -82,12 +99,18 @@ main = do
     Right img <- Juicy.readImage "logo.png"
     textureData <- LambdaCubeGL.uploadTexture2DToGPU img
 
-    -- allocate GL pipeline
-    renderer <- LambdaCubeGL.allocRenderer pipelineDesc
+    -- Disabled, triggers shader compilation.
+    -- This triggers lots of garbage to be dumped to the terminal and apparently
+    -- never returns to display the gtk window.
+    let _ = do
+            -- allocate GL pipeline
+            renderer <- LambdaCubeGL.allocRenderer pipelineDesc
+            return ()
 
+    putStrLn "Starting Gtk window!"
     run App
         -- :: App Gtk.Window State Event
-        { view         = view'
+        { view         = view' Constants { cStorage = storage, cPipeline = pipelineDesc }
         , update       = update'
         , inputs       = []
         , initialState = ()