Skybox-related uniforms.

2 files changed, 15 insertions, 7 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index 288488b..7f01d4d 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -131,11 +131,11 @@ uploadState obj glarea storage = do
     skybox <- newIORef 0
     Right ts <- skyboxLoad skyboxes 0
     skybox_id <- uploadCubeMapToGPU ts
-    -- LC.updateUniforms storage $ do
-    --    "CubeMap" @= return skybox_id
+    LC.updateUniforms storage $ do
+       "CubeMap" @= return skybox_id
     skytex <- newIORef skybox_id
     mi <- LC.uploadMeshToGPU cubeMesh
-    -- LC.addMeshToObjectArray storage "SkyCube" [] mi -- TODO
+    LC.addMeshToObjectArray storage "SkyCube" [] mi
 
     let st = State
             { stAnimator     = tm
@@ -194,6 +194,8 @@ new = do
         objName <- head . (++ ["cube.obj"]) <$> getArgs
         mobj <- loadOBJ objName
         mpipeline <- loadPipeline "hello_obj2.json" $ do
+          defObjectArray "SkyCube" Triangles $ do
+            "position"  @: Attribute_V3F
           defObjectArray "objects" Triangles $ do
             "position"  @: Attribute_V4F
             "normal"    @: Attribute_V3F
@@ -201,6 +203,7 @@ new = do
           defObjectArray "plane" Triangles $ do
             "position"  @: Attribute_V4F
           defUniforms $ do
+            "CubeMap"         @: FTextureCube
             "CameraPosition"  @: V3F
             "ViewProjection"  @: M44F
             "diffuseTexture"  @: FTexture2D
@@ -314,8 +317,8 @@ onEvent w realized ev = do
                     Right ts <- skyboxLoad (stSkyboxes st) idx
                     disposeTexture =<< readIORef (stSkyTexture st)
                     skybox_id <- uploadCubeMapToGPU ts
-                    -- LC.updateUniforms storage $ do
-                    --    "CubeMap" @= return skybox_id
+                    LC.updateUniforms (stStorage realized) $ do
+                        "CubeMap" @= return skybox_id
                     writeIORef (stSkyTexture st) skybox_id
                     put (skyboxNames (stSkyboxes st) !! idx)
                     return ()
diff --git a/hello_obj2.lc b/hello_obj2.lc
index d0fc35b..52d4a52 100644
--- a/hello_obj2.lc
+++ b/hello_obj2.lc
@@ -7,7 +7,9 @@ blendplane = -- NoBlending -- BlendLogicOp Xor
           ((OneBF,SrcAlpha),(DstAlpha,DstAlpha))
           (V4 0 0 0 0)
 
-makeFrame (cameraPosition :: Vec 3 Float)
+makeFrame (cubemap :: Texture)
+          (skybox :: PrimitiveStream Triangle ((Vec 3 Float)))
+          (cameraPosition :: Vec 3 Float)
           (cam ::  Mat 4 4 Float)
           (color :: Vec 4 Float)
           (texture :: Texture)
@@ -30,9 +32,12 @@ makeFrame (cameraPosition :: Vec 3 Float)
                                 in ((r + V4 0 0 0 (0.8))))
     & accumulateWith (DepthOp Less True, ColorOp blendplane (V4 True True True True))
 
+textureCubeSlot s = Texture2DSlot s
 
 main = renderFrame $
-   makeFrame (Uniform "CameraPosition")
+   makeFrame (textureCubeSlot "CubeMap")
+             (fetch "SkyCube" ((Attribute "position")))
+             (Uniform "CameraPosition")
              (Uniform "ViewProjection")
              (Uniform "diffuseColor")
              (Texture2DSlot "diffuseTexture")