From 0e13d1c5bab8f72aca8285909977306560c0e9c8 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Fri, 29 Aug 2014 21:25:31 +0200 Subject: [PATCH] fixes #503 --- src/Render/Misc.hs | 6 +++--- src/UI/Callbacks.hs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Render/Misc.hs b/src/Render/Misc.hs index fe6b048..c9519d0 100644 --- a/src/Render/Misc.hs +++ b/src/Render/Misc.hs @@ -3,7 +3,7 @@ module Render.Misc where import Control.Monad import qualified Data.ByteString as B (ByteString) import Data.Int (Int8) -import Data.Word (Word32) +import Data.Word (Word32,Word8) import Graphics.Rendering.OpenGL.GL.Shaders import Graphics.Rendering.OpenGL.GL.StateVar import Graphics.Rendering.OpenGL.GL.StringQueries @@ -160,8 +160,8 @@ tryWithTexture t f fail' = _ -> fail' genColorData :: Int -- ^ Amount - -> [Int8] -- ^ [r,g,b,a], [r,g,b] - whatever should be repeatet. - -> [Int8] + -> [Word8] -- ^ [r,g,b,a], [r,g,b] - whatever should be repeatet. + -> [Word8] genColorData n c = take (length c*n) (cycle c) chunksOf :: Int -> [a] -> [[a]] diff --git a/src/UI/Callbacks.hs b/src/UI/Callbacks.hs index 924b718..bb60306 100644 --- a/src/UI/Callbacks.hs +++ b/src/UI/Callbacks.hs @@ -117,7 +117,7 @@ eventCallback e = do case state of SDL.Pressed -> maybe (return ()) (`mousePressHandler` (x, y)) $ transformButton button SDL.Released -> maybe (return ()) (`mouseReleaseHandler` (x, y)) $ transformButton button - _ -> return () + --_ -> return () -- causes "pattern match overlapped" SDL.MouseWheel _ _ _ vscroll -> -- windowID mouseID hScroll vScroll do -- TODO: MouseWheelHandler state <- get