From e03c33d622397fa7f4b797ae7131256ca4c6492e Mon Sep 17 00:00:00 2001
From: Bluepr1nt <martijncaluwe@gmail.com>
Date: Mon, 25 Apr 2016 13:31:41 +0200
Subject: [PATCH 1/2] boom

---
 OpenGL2/Main.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 8 deletions(-)

diff --git a/OpenGL2/Main.cpp b/OpenGL2/Main.cpp
index a864699..3f7eeeb 100644
--- a/OpenGL2/Main.cpp
+++ b/OpenGL2/Main.cpp
@@ -69,6 +69,31 @@ void drawCube(int index)
 	glEnd();
 }
 
+void drawTree(int xlocation, int ylocation, int zlocation, int height)
+{
+	for (int z = zlocation; z <= zlocation+height; z += 2)
+	{
+		glPushMatrix();
+		glTranslatef((float)xlocation, (float)z, (float)ylocation);
+		drawCube(20);
+		glPopMatrix();
+	}
+
+
+	for (int x = xlocation-(height/2); x <= xlocation+ (height / 2); x += 2)
+	{
+		for (int y = ylocation- (height / 2); y <= ylocation+ (height / 2); y += 2)
+		{
+			for (int z = zlocation + height -(height/3); z <= zlocation + height+(height / 3); z += 2)
+			{
+				glPushMatrix();
+				glTranslatef((float)x, (float)z, (float)y);
+				drawCube(53);
+				glPopMatrix();
+			}
+		}
+	}
+}
 
 void display()
 {
@@ -77,7 +102,7 @@ void display()
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-	gluPerspective(60.0f, (float)width/height, 0.1, 30);
+	gluPerspective(60.0f, (float)width/height, 0.1, 200);
 
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
@@ -89,12 +114,11 @@ void display()
 	glColor3f(1.0f, 1.0f, 1.0f);
 	glBindTexture(GL_TEXTURE_2D, grassTexture);
 	glBegin(GL_QUADS);
-		glTexCoord2f(0, 0); glVertex3f(-15, -1, -15);
-		glTexCoord2f(0, 8); glVertex3f( 15, -1, -15);
-		glTexCoord2f(8, 8); glVertex3f( 15, -1,  15);
-		glTexCoord2f(8, 0); glVertex3f(-15, -1,  15);
+		glTexCoord2f(0, 0); glVertex3f(-30, -1, -30);
+		glTexCoord2f(0, 8); glVertex3f( 30, -1, -30);
+		glTexCoord2f(8, 8); glVertex3f( 30, -1,  30);
+		glTexCoord2f(8, 0); glVertex3f(-30, -1,  30);
 	glEnd();
-	
 
 	glBindTexture(GL_TEXTURE_2D, blocksTexture);
 	for (int x = -10; x <= 10; x += 5)
@@ -103,11 +127,42 @@ void display()
 		{
 			glPushMatrix();
 			glTranslatef((float)x, 0.0f, (float)y);
-			drawCube(39);
+			drawCube(21);
 			glPopMatrix();
 		}
 	}
 
+	for (int x = 12; x <= 22; x += 2)
+	{
+		for (int y = 12; y <= 22; y += 2)
+		{
+			for (int z = 1; z <= 22; z += 2)
+			{
+				glPushMatrix();
+				glTranslatef((float)x, (float)z, (float)y);
+				drawCube(1);
+				glPopMatrix();
+			}
+		}
+	}
+
+	for (int x = 12; x <= 22; x += 2)
+	{
+				glPushMatrix();
+				glTranslatef((float)x, 0.0f, 0.0f);
+				drawCube(6);
+				glPopMatrix();
+
+	}
+
+	drawTree(0, 0, 0,10);
+
+	drawTree(-12, -12, 0, 5);
+	drawTree(15, 15, 22, 10);
+	drawTree(12, -12, 0, 6);
+
+	//drawTree(-12, 12, 0, 50);
+	
 	glDisable(GL_TEXTURE_2D);
 	glutSwapBuffers();
 }
@@ -183,7 +238,7 @@ int main(int argc, char* argv[])
 
 	//Cursor
 	glutWarpPointer(width / 2, height / 2);
-	glutSetCursor(GLUT_CURSOR_NONE);
+	//glutSetCursor(GLUT_CURSOR_NONE);
 
 	//Load Textures :: grass
 	int width1, height1, bpp1;

From fa9482d092f7cf45a172d43c6a53d6eaf1fe4335 Mon Sep 17 00:00:00 2001
From: Bluepr1nt <martijncaluwe@gmail.com>
Date: Mon, 25 Apr 2016 13:32:39 +0200
Subject: [PATCH 2/2] boom merge

---
 OpenGL2/Main.cpp | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/OpenGL2/Main.cpp b/OpenGL2/Main.cpp
index 3f7eeeb..8d5f017 100644
--- a/OpenGL2/Main.cpp
+++ b/OpenGL2/Main.cpp
@@ -131,37 +131,6 @@ void display()
 			glPopMatrix();
 		}
 	}
-
-	for (int x = 12; x <= 22; x += 2)
-	{
-		for (int y = 12; y <= 22; y += 2)
-		{
-			for (int z = 1; z <= 22; z += 2)
-			{
-				glPushMatrix();
-				glTranslatef((float)x, (float)z, (float)y);
-				drawCube(1);
-				glPopMatrix();
-			}
-		}
-	}
-
-	for (int x = 12; x <= 22; x += 2)
-	{
-				glPushMatrix();
-				glTranslatef((float)x, 0.0f, 0.0f);
-				drawCube(6);
-				glPopMatrix();
-
-	}
-
-	drawTree(0, 0, 0,10);
-
-	drawTree(-12, -12, 0, 5);
-	drawTree(15, 15, 22, 10);
-	drawTree(12, -12, 0, 6);
-
-	//drawTree(-12, 12, 0, 50);
 	
 	glDisable(GL_TEXTURE_2D);
 	glutSwapBuffers();