little cleanup
- some formatting - changed y/z-Coords on Map (y is height now, map is in x/z-plane)
This commit is contained in:
		| @@ -1,17 +1,19 @@ | ||||
| {-# LANGUAGE BangPatterns #-} | ||||
| module Render.Render where | ||||
|  | ||||
| import Graphics.Rendering.OpenGL.GL.BufferObjects | ||||
| import Graphics.Rendering.OpenGL.GL.ObjectName | ||||
| import Graphics.Rendering.OpenGL.GL.StateVar | ||||
| import Render.Misc | ||||
| import Graphics.Rendering.OpenGL.Raw.Core31.Types (GLfloat) | ||||
| import Foreign.Storable (sizeOf) | ||||
| import Foreign.Marshal.Array (withArray) | ||||
| import Graphics.Rendering.OpenGL.GL.VertexSpec | ||||
| import Graphics.Rendering.OpenGL.GL.Shaders | ||||
| import Graphics.Rendering.OpenGL.GL.VertexArrays (Capability(..), vertexAttribArray) | ||||
| import qualified Data.ByteString as B | ||||
| import qualified Data.ByteString                            as B | ||||
| import           Foreign.Marshal.Array                      (withArray) | ||||
| import           Foreign.Storable                           (sizeOf) | ||||
| import           Graphics.Rendering.OpenGL.GL.BufferObjects | ||||
| import           Graphics.Rendering.OpenGL.GL.Framebuffer   (clearColor) | ||||
| import           Graphics.Rendering.OpenGL.GL.ObjectName | ||||
| import           Graphics.Rendering.OpenGL.GL.Shaders | ||||
| import           Graphics.Rendering.OpenGL.GL.StateVar | ||||
| import           Graphics.Rendering.OpenGL.GL.VertexArrays  (Capability (..), | ||||
|                                                              vertexAttribArray) | ||||
| import           Graphics.Rendering.OpenGL.GL.VertexSpec | ||||
| import           Graphics.Rendering.OpenGL.Raw.Core31.Types (GLfloat) | ||||
| import           Render.Misc | ||||
|  | ||||
| vertexShaderFile :: String | ||||
| vertexShaderFile = "shaders/vertex.shader" | ||||
| @@ -19,7 +21,7 @@ fragmentShaderFile :: String | ||||
| fragmentShaderFile = "shaders/fragment.shader" | ||||
|  | ||||
| initBuffer :: [GLfloat] -> IO BufferObject | ||||
| initBuffer varray =  | ||||
| initBuffer varray = | ||||
|         let | ||||
|                 sizeOfVarray = length varray * sizeOfComponent | ||||
|                 sizeOfComponent = sizeOf (head varray) | ||||
| @@ -49,4 +51,9 @@ initShader = do | ||||
|    vertexAttribArray vertexIndex $= Enabled | ||||
|  | ||||
|    checkError "initShader" | ||||
|    return (projectionMatrixIndex, colorIndex, vertexIndex) | ||||
|    return (projectionMatrixIndex, colorIndex, vertexIndex) | ||||
|  | ||||
| initRendering :: IO () | ||||
| initRendering = do | ||||
|         clearColor $= Color4 0 0 0 0 | ||||
|         checkError "initRendering" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user