From 71c1b73ec330fa00dfd7647401145869f3a7dce2 Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Sat, 1 Jun 2019 13:14:17 +0200
Subject: [PATCH] Display terrain

---
 .vscode/tasks.json        |  2 +-
 exercise3/src/terrain.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0f44973..219d479 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -39,7 +39,7 @@
     {
       "label": "Run Exercise 3",
       "type": "shell",
-      "command": "exercise3/build/cmake/./exercise3",
+      "command": "cd exercise3/build/cmake/ && ./exercise3",
       "dependsOn": "Build Exercise 3",
       "problemMatcher": []
     },
diff --git a/exercise3/src/terrain.cpp b/exercise3/src/terrain.cpp
index 177dc3f..b2e8cfb 100644
--- a/exercise3/src/terrain.cpp
+++ b/exercise3/src/terrain.cpp
@@ -194,7 +194,7 @@ void terrain::render_terrain()
 
 	Task 2.2.3.    Make sure to call "set_normal" for every vertex and continue this 
 	               task in "set_normal".
-    Aufgabe 2.2.3. Stellen Sie sicher, dass Sie "set_normal" für jeden Vertex aufrufen
+    Aufgabe 2.2.3. Stellen Sie sicher, dass Sie "set_normal" f�r jeden Vertex aufrufen
 	               und fahren Sie in "set_normal" mit der Aufgabe fort.
 
 
@@ -208,17 +208,17 @@ void terrain::render_terrain()
 
 
 	// Go through all rows (-1)
-	for (int y = 0; y<map_height-1; y++) {
+	for (int y = 0; y < map_height-1; y++) {
 
-		// ... to be completed
+		glBegin(GL_TRIANGLE_STRIP);
 
 		// Draw one strip
-		for (int x = 0; x<map_width; x++) {
-
-			// ... to be completed
-
+		for (int x = 0; x < map_width; x++) {
+			glVertex3f(static_cast<float>(x), get_heightmap_value(x, y), static_cast<float>(y));
+			glVertex3f(static_cast<float>(x), get_heightmap_value(x, y + 1), static_cast<float>(y) + 1.0f);
 		}
 
+		glEnd();
 	}
 
 	glPopMatrix();