From 9f99af1750924a0be6e003842830aec93380dfdc Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Mon, 13 May 2019 19:22:13 -0400 Subject: Use distinct types for TextureData and TextureCubeData. --- MeshSketch.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MeshSketch.hs b/MeshSketch.hs index 440a2f7..b84cd7e 100644 --- a/MeshSketch.hs +++ b/MeshSketch.hs @@ -31,7 +31,7 @@ import LambdaCube.GL as LC import LambdaCube.IR as LC import LambdaCube.Gtk import LambdaCube.GL.Data (uploadCubeMapToGPU) -import LambdaCube.GL.Type (TextureData(..)) +import LambdaCube.GL.Type (TextureCubeData(..)) -- import Text.Show.Pretty (ppShow) import CubeMap @@ -51,7 +51,7 @@ data State = State , stFullscreen :: IO () , stSkyboxes :: Skyboxes , stSkybox :: IORef Int - , stSkyTexture :: IORef TextureData + , stSkyTexture :: IORef TextureCubeData , stDragFrom :: IORef (Maybe (Vector Float,Camera)) } @@ -140,7 +140,7 @@ uploadState obj glarea storage = do return skybox_id Left msg -> do putStrLn msg - return (TextureData 0) + return (TextureCubeName 0) skytex <- newIORef skybox_id mi <- LC.uploadMeshToGPU cubeMesh LC.addMeshToObjectArray storage "SkyCube" [] mi @@ -464,7 +464,7 @@ onEvent w realized ev = do idx <- readIORef (stSkybox st) when (skyboxCount (stSkyboxes st) > 1) $ do Right ts <- skyboxLoad (stSkyboxes st) idx - disposeTexture =<< readIORef (stSkyTexture st) + disposeTextureCube =<< readIORef (stSkyTexture st) skybox_id <- uploadCubeMapToGPU ts LC.updateUniforms (stStorage realized) $ do "CubeMap" @= return skybox_id -- cgit v1.2.3