summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2014-01-13 03:06:09 +0100
committerFrank v/d Haterd <f.h.a.v.d.haterd@student.tue.nl>2014-01-13 03:06:09 +0100
commit646e75208290fe1593df9494591195fd41054c2e (patch)
treeb8cfd77838191e0b18d24e9a8d68f9288819de88
parentfded8cd1926933e1293de5a4ece7c3edec08af94 (diff)
download2iv60-robots-646e75208290fe1593df9494591195fd41054c2e.tar.gz
Whole terrain added
Todo: 1D textures instead of colors new heightAt function instead of default one (however it works) normals improved ??
-rw-r--r--src/RobotRace.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/RobotRace.java b/src/RobotRace.java
index 57e0a98..eac9ed5 100644
--- a/src/RobotRace.java
+++ b/src/RobotRace.java
@@ -228,6 +228,9 @@ public class RobotRace extends Base {
// initialize lighting effects (lighting bit is not enabled here though)
initLighting();
+
+ // init terrain
+ terrain.createTerrain();
}
/**
@@ -379,11 +382,10 @@ public class RobotRace extends Base {
gl.glEnable(GL_COLOR_MATERIAL);
// Draw race track
raceTrack.draw(gs.trackNr);
- // restore
- gl.glDisable(GL_COLOR_MATERIAL);
-
// Draw terrain
terrain.draw();
+ // restore
+ gl.glDisable(GL_COLOR_MATERIAL);
}
/**