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

whole map..

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-01-04 14:20:26 +01:00
parent f23b4e38fd
commit cde5231e6a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.hs
View File

@ -405,7 +405,7 @@ draw = do
1, 0, 0, 0 1, 0, 0, 0
, 0, 0, 1, 0 , 0, 0, 1, 0
, 0, 1, 0, 0 , 0, 1, 0, 0
,-1, -1, -5, 1 ,-5, -10, -10, 1
] ]
V.unsafeWith model $ \ptr -> GL.glUniformMatrix4fv mmat 1 0 ptr V.unsafeWith model $ \ptr -> GL.glUniformMatrix4fv mmat 1 0 ptr
GL.bindBuffer GL.ArrayBuffer GL.$= Just map' GL.bindBuffer GL.ArrayBuffer GL.$= Just map'

4
src/Map/Map.hs
View File

@ -240,8 +240,8 @@ testMapTemplate2 = T.transpose [
testmap :: IO PlayMap testmap :: IO PlayMap
testmap = do testmap = do
g <- getStdGen g <- getStdGen
rawMap <- return $ parseTemplate (randoms g) (T.concat testMapTemplate2) rawMap <- return $ parseTemplate (randoms g) (T.concat testMapTemplate)
return $ listArray ((0,0),(9,1)) rawMap return $ listArray ((0,0),(19,19)) rawMap
parseTemplate :: [Int] -> Text -> [MapEntry] parseTemplate :: [Int] -> Text -> [MapEntry]