diff --git a/src/Dodge/ShortShow.hs b/src/Dodge/ShortShow.hs new file mode 100644 index 000000000..49077b674 --- /dev/null +++ b/src/Dodge/ShortShow.hs @@ -0,0 +1,5 @@ +module Dodge.ShortShow where +import Geometry + +shortPoint2 :: Point2 -> String +shortPoint2 (V2 x y) = "x" ++ show (round x::Int) ++ "y" ++ show (round y::Int) diff --git a/src/Render.hs b/src/Render.hs index e90a7e0a4..d1d871b55 100644 --- a/src/Render.hs +++ b/src/Render.hs @@ -21,6 +21,7 @@ import qualified Data.Vector.Mutable as MV import Control.Monad.Primitive import qualified Data.Vector.Fusion.Stream.Monadic as VS import Graphics.GL.Core43 +import Control.Monad divideSize :: Int -> Size -> Size divideSize i (Size x y) = Size (div x $ fromIntegral i) (div y $ fromIntegral i) @@ -70,7 +71,7 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos = do (marshalEPrimitiveMode $ _shadPrim lwShad) 0 (fromIntegral nWalls) - if drawObjShads then do + when drawObjShads $ do --draw silhouette shadows currentProgram $= Just (_shadProg llsShad) uniform (head $ _shadUnis $ _lightingLineShadowShader pdata) @@ -92,7 +93,6 @@ createLightMap pdata lightPoints nWalls nSils nCaps drawObjShads toPos = do (fromIntegral nCaps) GL_UNSIGNED_SHORT nullPtr - else return () --draw lightmap itself depthFunc $= Just Always -- bind world position texture