Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-enabled GUI

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-08-24 22:59:35 +02:00
parent b4710797fc
commit c21863c03a
No known key found for this signature in database
GPG Key ID: BC16D887851A1A80
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Render/Render.hs
View File

@ -458,9 +458,9 @@ render = do
---- RENDER MAP IN TEXTURE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ---- RENDER MAP IN TEXTURE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-- COLORMAP -- COLORMAP
liftIO $ do liftIO $ do
bindFramebuffer Framebuffer $= defaultFramebufferObject {-bindFramebuffer Framebuffer $= defaultFramebufferObject
drawBuffer $= BackBuffers drawBuffer $= BackBuffers-}
{-tex <- liftIO $ readTVarIO (state ^. mapTexture) tex <- liftIO $ readTVarIO (state ^. mapTexture)
textureBinding Texture2D $= Just tex textureBinding Texture2D $= Just tex
framebufferTexture2D framebufferTexture2D
Framebuffer Framebuffer
@ -470,7 +470,7 @@ render = do
0 0
-- Render to FrameBufferObject -- Render to FrameBufferObject
drawBuffers $= [FBOColorAttachment 0]-} drawBuffers $= [FBOColorAttachment 0]
checkError "setup Render-Target" checkError "setup Render-Target"
clear [ColorBuffer, DepthBuffer] clear [ColorBuffer, DepthBuffer]
@ -502,7 +502,7 @@ render = do
---- COMPOSE RENDERING -------------------------------------------- ---- COMPOSE RENDERING --------------------------------------------
-- Render to BackBuffer (=Screen) -- Render to BackBuffer (=Screen)
{-bindFramebuffer Framebuffer $= defaultFramebufferObject bindFramebuffer Framebuffer $= defaultFramebufferObject
drawBuffer $= BackBuffers drawBuffer $= BackBuffers
-- Drawing HUD -- Drawing HUD
clear [ColorBuffer, DepthBuffer] clear [ColorBuffer, DepthBuffer]
@ -531,6 +531,6 @@ render = do
drawElements TriangleStrip 4 UnsignedInt offset0 drawElements TriangleStrip 4 UnsignedInt offset0
bindBuffer ArrayBuffer $= Nothing bindBuffer ArrayBuffer $= Nothing
bindBuffer ElementArrayBuffer $= Nothing-} bindBuffer ElementArrayBuffer $= Nothing