From cde5231e6afd35a79e8b21fe9584869895257311 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sat, 4 Jan 2014 14:20:26 +0100 Subject: [PATCH] whole map.. --- src/Main.hs | 2 +- src/Map/Map.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Main.hs b/src/Main.hs index 81ad896..3909462 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -405,7 +405,7 @@ draw = do 1, 0, 0, 0 , 0, 0, 1, 0 , 0, 1, 0, 0 - ,-1, -1, -5, 1 + ,-5, -10, -10, 1 ] V.unsafeWith model $ \ptr -> GL.glUniformMatrix4fv mmat 1 0 ptr GL.bindBuffer GL.ArrayBuffer GL.$= Just map' diff --git a/src/Map/Map.hs b/src/Map/Map.hs index 0d1b95e..fd22925 100644 --- a/src/Map/Map.hs +++ b/src/Map/Map.hs @@ -240,8 +240,8 @@ testMapTemplate2 = T.transpose [ testmap :: IO PlayMap testmap = do g <- getStdGen - rawMap <- return $ parseTemplate (randoms g) (T.concat testMapTemplate2) - return $ listArray ((0,0),(9,1)) rawMap + rawMap <- return $ parseTemplate (randoms g) (T.concat testMapTemplate) + return $ listArray ((0,0),(19,19)) rawMap parseTemplate :: [Int] -> Text -> [MapEntry]