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

minor cleanup

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-06-02 08:11:44 +02:00
parent ac832268ca
commit d8747c0bd3
No known key found for this signature in database
GPG Key ID: BC16D887851A1A80
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.hs
View File

@ -9,6 +9,7 @@ import Graphics.Rendering.OpenGL.GL.Texturing.Parameters (TextureFilter(..),text
-- Monad-foo and higher functional stuff -- Monad-foo and higher functional stuff
import Control.Monad (unless, when, join) import Control.Monad (unless, when, join)
import Control.Arrow ((***)) import Control.Arrow ((***))
import Control.Lens ((^.), (.~), (%~))
-- data consistency/conversion -- data consistency/conversion
import Control.Concurrent (threadDelay) import Control.Concurrent (threadDelay)
@ -24,9 +25,6 @@ import qualified Data.HashMap.Strict as Map
import Foreign.Marshal.Array (pokeArray) import Foreign.Marshal.Array (pokeArray)
import Foreign.Marshal.Alloc (allocaBytes) import Foreign.Marshal.Alloc (allocaBytes)
-- Math
import Control.Lens ((^.), (.~), (%~))
-- GUI -- GUI
import qualified Graphics.UI.SDL as SDL import qualified Graphics.UI.SDL as SDL

2
src/Render/Render.hs
View File

@ -287,7 +287,7 @@ initRendering = do
renderIQM :: IQM -> L.V3 CFloat -> L.V3 CFloat -> IO () renderIQM :: IQM -> L.V3 CFloat -> L.V3 CFloat -> IO ()
renderIQM m p@(L.V3 x y z) s@(L.V3 sx sy sz) = do renderIQM m p@(L.V3 x y z) s@(L.V3 sx sy sz) = do
bindVertexArrayObject $= Just (vertexArrayObject m) bindVertexArrayObject $= Just (vertexArrayObject m)
let n = num_vertexes $ header m let n = num_vertexes.header $ m
glDrawArrays gl_TRIANGLES 0 (fromIntegral n) glDrawArrays gl_TRIANGLES 0 (fromIntegral n)
return () return ()