Cope with missing skybox.

1 files changed, 18 insertions, 12 deletions

diff --git a/MeshSketch.hs b/MeshSketch.hs
index 02ba53a..440a2f7 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -132,10 +132,15 @@ uploadState obj glarea storage = do
     toggle <- mkFullscreenToggle parent
     skyboxes <- loadSkyboxes
     skybox <- newIORef 0
-    Right ts <- skyboxLoad skyboxes 0
-    skybox_id <- uploadCubeMapToGPU ts
-    LC.updateUniforms storage $ do
-       "CubeMap" @= return skybox_id
+    skybox_id <- skyboxLoad skyboxes 0 >>= \case
+        Right ts -> do
+            skybox_id <- uploadCubeMapToGPU ts
+            LC.updateUniforms storage $ do
+               "CubeMap" @= return skybox_id
+            return skybox_id
+        Left msg -> do
+            putStrLn msg
+            return (TextureData 0)
     skytex <- newIORef skybox_id
     mi <- LC.uploadMeshToGPU cubeMesh
     LC.addMeshToObjectArray storage "SkyCube" [] mi
@@ -457,14 +462,15 @@ onEvent w realized ev = do
                 KEY_N -> do
                     modifyIORef' (stSkybox st) $ \n -> (n + 1) `mod` (skyboxCount $ stSkyboxes st)
                     idx <- readIORef (stSkybox st)
-                    Right ts <- skyboxLoad (stSkyboxes st) idx
-                    disposeTexture =<< readIORef (stSkyTexture st)
-                    skybox_id <- uploadCubeMapToGPU ts
-                    LC.updateUniforms (stStorage realized) $ do
-                        "CubeMap" @= return skybox_id
-                    writeIORef (stSkyTexture st) skybox_id
-                    put (skyboxNames (stSkyboxes st) !! idx)
-                    return ()
+                    when (skyboxCount (stSkyboxes st) > 1) $ do
+                        Right ts <- skyboxLoad (stSkyboxes st) idx
+                        disposeTexture =<< readIORef (stSkyTexture st)
+                        skybox_id <- uploadCubeMapToGPU ts
+                        LC.updateUniforms (stStorage realized) $ do
+                            "CubeMap" @= return skybox_id
+                        writeIORef (stSkyTexture st) skybox_id
+                        put (skyboxNames (stSkyboxes st) !! idx)
+                        return ()
                 KEY_F -> do
                     put 'F'
                     stFullscreen st