haddock now works as well..
This commit is contained in:
parent
d0ce4dcf6a
commit
f7dea8e964
@ -33,8 +33,10 @@ import Linear
|
|||||||
import Map.Types
|
import Map.Types
|
||||||
import Map.StaticMaps
|
import Map.StaticMaps
|
||||||
|
|
||||||
|
type Height = Float
|
||||||
|
|
||||||
type MapEntry = (
|
type MapEntry = (
|
||||||
Float, -- ^ Height
|
Height,
|
||||||
TileType
|
TileType
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -48,18 +48,20 @@ initBuffer varray =
|
|||||||
return bufferObject
|
return bufferObject
|
||||||
|
|
||||||
initMapShader :: IO (
|
initMapShader :: IO (
|
||||||
Program -- ^ the GLSL-Program
|
Program -- the GLSL-Program
|
||||||
, AttribLocation -- ^ color
|
, AttribLocation -- color
|
||||||
, AttribLocation -- ^ normal
|
, AttribLocation -- normal
|
||||||
, AttribLocation -- ^ vertex
|
, AttribLocation -- vertex
|
||||||
, UniformLocation -- ^ ProjectionMat
|
, UniformLocation -- ProjectionMat
|
||||||
, UniformLocation -- ^ ViewMat
|
, UniformLocation -- ViewMat
|
||||||
, UniformLocation -- ^ ModelMat
|
, UniformLocation -- ModelMat
|
||||||
, UniformLocation -- ^ NormalMat
|
, UniformLocation -- NormalMat
|
||||||
, UniformLocation -- ^ TessLevelInner
|
, UniformLocation -- TessLevelInner
|
||||||
, UniformLocation -- ^ TessLevelOuter
|
, UniformLocation -- TessLevelOuter
|
||||||
, TextureObject -- ^ Texture where to draw into
|
, 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
|
initMapShader = do
|
||||||
! vertexSource <- B.readFile mapVertexShaderFile
|
! vertexSource <- B.readFile mapVertexShaderFile
|
||||||
! tessControlSource <- B.readFile mapTessControlShaderFile
|
! tessControlSource <- B.readFile mapTessControlShaderFile
|
||||||
@ -138,7 +140,7 @@ initHud = do
|
|||||||
texIndex <- get (uniformLocation program "tex[1]")
|
texIndex <- get (uniformLocation program "tex[1]")
|
||||||
checkError "ui-tex"
|
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]
|
let vertexBufferData = reverse [-1, -1, 1, -1, -1, 1, 1, 1] :: [GLfloat]
|
||||||
|
|
||||||
vertexIndex <- get (attribLocation program "position")
|
vertexIndex <- get (attribLocation program "position")
|
||||||
|
Loading…
Reference in New Issue
Block a user