From d8747c0bd3bda2bfce3e058373ebdfa8bdac822f Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Mon, 2 Jun 2014 08:11:44 +0200 Subject: [PATCH] minor cleanup --- src/Main.hs | 4 +--- src/Render/Render.hs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index b7b2eab..58c8da5 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -9,6 +9,7 @@ import Graphics.Rendering.OpenGL.GL.Texturing.Parameters (TextureFilter(..),text -- Monad-foo and higher functional stuff import Control.Monad (unless, when, join) import Control.Arrow ((***)) +import Control.Lens ((^.), (.~), (%~)) -- data consistency/conversion import Control.Concurrent (threadDelay) @@ -24,9 +25,6 @@ import qualified Data.HashMap.Strict as Map import Foreign.Marshal.Array (pokeArray) import Foreign.Marshal.Alloc (allocaBytes) --- Math -import Control.Lens ((^.), (.~), (%~)) - -- GUI import qualified Graphics.UI.SDL as SDL diff --git a/src/Render/Render.hs b/src/Render/Render.hs index 0fb03ec..7926418 100644 --- a/src/Render/Render.hs +++ b/src/Render/Render.hs @@ -287,7 +287,7 @@ initRendering = do renderIQM :: IQM -> L.V3 CFloat -> L.V3 CFloat -> IO () renderIQM m p@(L.V3 x y z) s@(L.V3 sx sy sz) = do bindVertexArrayObject $= Just (vertexArrayObject m) - let n = num_vertexes $ header m + let n = num_vertexes.header $ m glDrawArrays gl_TRIANGLES 0 (fromIntegral n) return ()