diff --git a/src/Dodge/Room/Start.hs b/src/Dodge/Room/Start.hs index feb5c094b..7db66d297 100644 --- a/src/Dodge/Room/Start.hs +++ b/src/Dodge/Room/Start.hs @@ -1,6 +1,6 @@ module Dodge.Room.Start where import Dodge.LevelGen.Data -import Dodge.PlacementSpot +--import Dodge.PlacementSpot import Dodge.Room.RunPast import Dodge.Room.LasTurret import Dodge.Data @@ -25,7 +25,7 @@ import Padding import Color import Shape -import Data.Maybe +--import Data.Maybe import Data.Tree import Control.Monad.State import Control.Lens diff --git a/src/Framebuffer/Setup.hs b/src/Framebuffer/Setup.hs index b63365b87..eac0620b3 100644 --- a/src/Framebuffer/Setup.hs +++ b/src/Framebuffer/Setup.hs @@ -23,7 +23,9 @@ setupTextureFramebuffer x y = do textureFilter Texture2D $= minMagFilter framebufferTexture2D Framebuffer (ColorAttachment 0) Texture2D fboTO 0 fboStatus <- framebufferStatus Framebuffer - print fboStatus + case fboStatus of + Complete -> return () + _ -> putStrLn $ "Texture framebuffer status: " ++ show fboStatus return (fboName, fboTO) setupFramebufferGivenStencil @@ -36,7 +38,9 @@ setupFramebufferGivenStencil rboName = do toName <- genObjectName framebufferRenderbuffer Framebuffer DepthStencilAttachment Renderbuffer rboName fboStatus <- framebufferStatus Framebuffer - print fboStatus + case fboStatus of + Complete -> return () + _ -> putStrLn $ "Framebuffer with given stencil status: " ++ show fboStatus return (fboName,toName) setupFramebuffer2GivenStencil :: RenderbufferObject @@ -48,7 +52,9 @@ setupFramebuffer2GivenStencil rboName = do toName2 <- genObjectName framebufferRenderbuffer Framebuffer DepthStencilAttachment Renderbuffer rboName fboStatus <- framebufferStatus Framebuffer - print fboStatus + case fboStatus of + Complete -> return () + _ -> putStrLn $ "Framebuffer with given stencil and two texture objects status: " ++ show fboStatus return (fboName,(toName,toName2)) minMagFilter :: ((TextureFilter, Maybe TextureFilter),TextureFilter) diff --git a/src/Framebuffer/Update.hs b/src/Framebuffer/Update.hs index 0b25afbd8..b2a57e623 100644 --- a/src/Framebuffer/Update.hs +++ b/src/Framebuffer/Update.hs @@ -94,7 +94,9 @@ resizeFBOTO2 (fboName,(toOld1,toOld2)) xsize ysize mmfilt inFormat1 inFormat2 = framebufferTexture2D Framebuffer (ColorAttachment 1) Texture2D toName2 0 drawBuffers $= [FBOColorAttachment 0,FBOColorAttachment 1] fboStatus <- framebufferStatus Framebuffer - putStrLn $ "after resize, framebuffer status:" ++ show fboStatus + case fboStatus of + Complete -> return () + _ -> putStrLn $ "after resize, resizeFBOTO2 framebuffer status:" ++ show fboStatus return (fboName, (toName1,toName2)) resizeFBOTO @@ -115,7 +117,9 @@ resizeFBOTO (fboName,toOld) xsize ysize mmfilt inFormat = do textureFilter Texture2D $= mmfilt framebufferTexture2D Framebuffer (ColorAttachment 0) Texture2D toName 0 fboStatus <- framebufferStatus Framebuffer - putStrLn $ "after resize, framebuffer status:" ++ show fboStatus + case fboStatus of + Complete -> return () + _ -> putStrLn $ "after resize, resizeFBOTO framebuffer status:" ++ show fboStatus return (fboName, toName) minMagFilter :: ((TextureFilter, Maybe TextureFilter),TextureFilter)