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

haddock now works as well..

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-04-15 17:28:38 +02:00
parent d0ce4dcf6a
commit f7dea8e964
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Map/Graphics.hs
View File

@ -33,8 +33,10 @@ import Linear
import Map.Types
import Map.StaticMaps
type Height = Float
type MapEntry = (
Float, -- ^ Height
Height,
TileType
)

28
src/Render/Render.hs
View File

@ -48,18 +48,20 @@ initBuffer varray =
return bufferObject
initMapShader :: IO (
Program -- ^ the GLSL-Program
, AttribLocation -- ^ color
, AttribLocation -- ^ normal
, AttribLocation -- ^ vertex
, UniformLocation -- ^ ProjectionMat
, UniformLocation -- ^ ViewMat
, UniformLocation -- ^ ModelMat
, UniformLocation -- ^ NormalMat
, UniformLocation -- ^ TessLevelInner
, UniformLocation -- ^ TessLevelOuter
, TextureObject -- ^ Texture where to draw into
)
Program -- the GLSL-Program
, AttribLocation -- color
, AttribLocation -- normal
, AttribLocation -- vertex
, UniformLocation -- ProjectionMat
, UniformLocation -- ViewMat
, UniformLocation -- ModelMat
, UniformLocation -- NormalMat
, UniformLocation -- TessLevelInner
, UniformLocation -- TessLevelOuter
, TextureObject -- Texture where to draw into
) -- ^ (the GLSL-Program, color, normal, vertex, ProjectionMat, ViewMat,
-- ModelMat, NormalMat, TessLevelInner, TessLevelOuter,
-- Texture where to draw into)
initMapShader = do
! vertexSource <- B.readFile mapVertexShaderFile
! tessControlSource <- B.readFile mapTessControlShaderFile
@ -138,7 +140,7 @@ initHud = do
texIndex <- get (uniformLocation program "tex[1]")
checkError "ui-tex"
-- | simple triangle over the whole screen.
-- simple triangle over the whole screen.
let vertexBufferData = reverse [-1, -1, 1, -1, -1, 1, 1, 1] :: [GLfloat]
vertexIndex <- get (attribLocation program "position")