From c21863c03ab36460c95d1c9e9b575962f5c62286 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sun, 24 Aug 2014 22:59:35 +0200 Subject: [PATCH] re-enabled GUI --- src/Render/Render.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Render/Render.hs b/src/Render/Render.hs index 23f0310..17aff76 100644 --- a/src/Render/Render.hs +++ b/src/Render/Render.hs @@ -458,9 +458,9 @@ render = do ---- RENDER MAP IN TEXTURE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -- COLORMAP liftIO $ do - bindFramebuffer Framebuffer $= defaultFramebufferObject - drawBuffer $= BackBuffers - {-tex <- liftIO $ readTVarIO (state ^. mapTexture) + {-bindFramebuffer Framebuffer $= defaultFramebufferObject + drawBuffer $= BackBuffers-} + tex <- liftIO $ readTVarIO (state ^. mapTexture) textureBinding Texture2D $= Just tex framebufferTexture2D Framebuffer @@ -470,7 +470,7 @@ render = do 0 -- Render to FrameBufferObject - drawBuffers $= [FBOColorAttachment 0]-} + drawBuffers $= [FBOColorAttachment 0] checkError "setup Render-Target" clear [ColorBuffer, DepthBuffer] @@ -502,7 +502,7 @@ render = do ---- COMPOSE RENDERING -------------------------------------------- -- Render to BackBuffer (=Screen) - {-bindFramebuffer Framebuffer $= defaultFramebufferObject + bindFramebuffer Framebuffer $= defaultFramebufferObject drawBuffer $= BackBuffers -- Drawing HUD clear [ColorBuffer, DepthBuffer] @@ -531,6 +531,6 @@ render = do drawElements TriangleStrip 4 UnsignedInt offset0 bindBuffer ArrayBuffer $= Nothing - bindBuffer ElementArrayBuffer $= Nothing-} + bindBuffer ElementArrayBuffer $= Nothing