diff options
| author | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-18 22:31:25 -0600 |
|---|---|---|
| committer | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-04-18 22:31:25 -0600 |
| commit | e380f8f31246afc2a14eccc51d40aa78dbd12cb1 (patch) | |
| tree | 7de51c820532ab896ce81a72df84872431b30f50 /Resources.hs | |
| parent | 0f408f531f8b569fe89fbd5d953833d9271e7764 (diff) | |
| download | terralloc-e380f8f31246afc2a14eccc51d40aa78dbd12cb1.tar.gz terralloc-e380f8f31246afc2a14eccc51d40aa78dbd12cb1.tar.bz2 terralloc-e380f8f31246afc2a14eccc51d40aa78dbd12cb1.zip | |
getting things to run
Diffstat (limited to 'Resources.hs')
| -rw-r--r-- | Resources.hs | 2 |
1 files changed, 1 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 |