Add test tileset textures
This commit is contained in:
+3
-5
@@ -54,7 +54,7 @@ doDrawing pdata w = do
|
||||
pic = worldPictures w
|
||||
wallPoints = map fst wallPointsCol
|
||||
-- set the coordinate uniforms ready for drawing elements using world coordinates
|
||||
setCommonUniforms pdata rot camzoom trans wins
|
||||
setIsoMatrixUniforms pdata rot camzoom trans wins
|
||||
depthFunc $= Just Less
|
||||
pmat <- (newMatrix RowMajor $ perspectiveMatrix rot camzoom trans wins viewFroms)
|
||||
:: IO (GLmatrix GLfloat)
|
||||
@@ -138,8 +138,7 @@ renderBlankWalls pdata wps pmat = do
|
||||
n <- F.foldM (pokeShader $ _wallBlankShader pdata) wps
|
||||
bindShaderBuffers [_wallBlankShader pdata] [n]
|
||||
currentProgram $= Just (_shaderProgram $ _wallBlankShader pdata)
|
||||
uniform (( _shaderMatrixUniform $ _wallBlankShader pdata) )
|
||||
$= pmat
|
||||
uniform (_shaderMatrixUniform $ _wallBlankShader pdata) $= pmat
|
||||
cullFace $= Just Back
|
||||
drawShader (_wallBlankShader pdata) n
|
||||
cullFace $= Nothing
|
||||
@@ -153,8 +152,7 @@ renderTextureWalls pdata wps pmat = do
|
||||
n <- F.foldM (pokeShader $ _wallTextureShader pdata) wps
|
||||
bindShaderBuffers [_wallTextureShader pdata] [n]
|
||||
currentProgram $= Just (_shaderProgram $ _wallTextureShader pdata)
|
||||
uniform (( _shaderMatrixUniform $ _wallTextureShader pdata) )
|
||||
$= pmat
|
||||
uniform (_shaderMatrixUniform $ _wallTextureShader pdata) $= pmat
|
||||
cullFace $= Just Back
|
||||
drawShader (_wallTextureShader pdata) n
|
||||
cullFace $= Nothing
|
||||
|
||||
Reference in New Issue
Block a user