getting things to run

7 files changed, 26 insertions, 1 deletions

diff --git a/Resources.hs b/Resources.hs
index a7f7c14..f06d8fa 100644
--- a/Resources.hs
+++ b/Resources.hs
@@ -253,7 +253,7 @@ buildTerrainObject builder = do
            "tundra.png" ]
     print terrainList
     terrainProg <- loadProgramSafe' "shaders/basic.vert" "shaders/basic.frag" (Nothing::Maybe String)
-    lst <- forM (zip [0..7::Int] $ terrainList ++ repeat "height.png") $ \(idx,str) -> do
+    lst <- forM (zip [0..7::Int] $ terrainList ++ repeat "terrain/unknown.png") $ \(idx,str) -> do
             location <- get $ uniformLocation terrainProg $ "textures[" ++! idx ++ "]"
             load str >>= textureFromSurface >>= return . (,) location
 
diff --git a/Terralloc.cabal b/Terralloc.cabal
new file mode 100644
index 0000000..bd0545f
--- /dev/null
+++ b/Terralloc.cabal
@@ -0,0 +1,25 @@
+-- Initial jora2470_hw2.cabal generated by cabal init.  For further 
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+--enable-library-profiling and/or
+--enable-executable-profiling.
+name:                homework9
+version:             0.1.0.0
+-- synopsis:            
+-- description:         
+-- license:             
+license-file:        LICENSE
+author:              Josh Rahm
+maintainer:          joshuarahm@gmail.com
+-- copyright:           
+-- category:            
+build-type:          Simple
+cabal-version:       >=1.8
+
+executable final
+  main-is: Final.hs
+  extensions: FlexibleInstances
+  ghc-options: -rtsopts -O3
+ -- ghc-options: -prof -osuf h_o
+  -- other-modules:       
+  build-depends:       setters, base, OpenGL, bytestring, array, SDL, random, OpenGLRaw, AC-Angle, deepseq, containers, SDL-image, cpu, template-haskell, filepath, MissingH, StateVar
diff --git a/maps/spain_height.png b/maps/spain_height.png
new file mode 100644
index 0000000..8b150a2
--- /dev/null
+++ b/maps/spain_height.png
diff --git a/maps/spain_terrain.png b/maps/spain_terrain.png
new file mode 100644
index 0000000..22b1165
--- /dev/null
+++ b/maps/spain_terrain.png
diff --git a/maps/wonderland_height.png b/maps/wonderland_height.png
new file mode 100644
index 0000000..4667af0
--- /dev/null
+++ b/maps/wonderland_height.png
diff --git a/maps/wonderland_terrain.png b/maps/wonderland_terrain.png
new file mode 100644
index 0000000..64704d5
--- /dev/null
+++ b/maps/wonderland_terrain.png
diff --git a/terrain/unknown.png b/terrain/unknown.png
new file mode 100644
index 0000000..f21fa86
--- /dev/null
+++ b/terrain/unknown.png