From 2407f9f400875b2162c93527f95f49b69ca98dd1 Mon Sep 17 00:00:00 2001 From: Joshua Rahm Date: Sun, 27 Apr 2014 23:51:51 -0600 Subject: made first person motion work well with strafing. Added king of hill map. --- Final.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Final.hs') diff --git a/Final.hs b/Final.hs index 4fd50e0..3b3e2c4 100644 --- a/Final.hs +++ b/Final.hs @@ -346,7 +346,7 @@ main = do (mapping,water) <- getWaterQuads arr coloredArr coloredArr2 <- mapArray (\idx -> if idx == 0 then -1 else Map.findWithDefault (-1) idx mapping) coloredArr - printShowArray coloredArr2 + -- printShowArray coloredArr2 {- Kick off SDL with the callbacks defined in Resources -} makeResources surface (createBuilder arr) forestLocations jungleLocations water arr coloredArr2 -- cgit From a60702dd882768e7f5b7fcadd39253ac8de9114f Mon Sep 17 00:00:00 2001 From: Joshua Rahm Date: Tue, 29 Apr 2014 03:57:40 -0600 Subject: added cheesey snow --- Final.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'Final.hs') diff --git a/Final.hs b/Final.hs index 3b3e2c4..8676b13 100644 --- a/Final.hs +++ b/Final.hs @@ -122,6 +122,7 @@ colorArray marr = do - 2 things: - A map of water bodies ids to elevations (to detect if you are under water - A builder that will generate all of the quads for the water. -} + getWaterQuads :: Array (Int,Int) Tile -> IOArray (Int,Int) Int -> IO ( Map.Map Int GLfloat, BuilderM GLfloat () ) getWaterQuads marr arr = do let (_,(w,h)) = bounds marr -- cgit