From 540b871c58e2fee158386e31f951a4cffb35d126 Mon Sep 17 00:00:00 2001
From: Doyle Thai <dyl.thai@gmail.com>
Date: Fri, 3 Jun 2016 17:05:28 +1000
Subject: [PATCH] Add camera linear rotation

---
 data/blackboard.art            | Bin 0 -> 2833 bytes
 data/shaders/default.vert.glsl |   6 +-
 src/dengine.cpp                | 145 ++++++++++++++++++++++++++++-----
 src/include/Dengine/Common.h   |   3 +
 4 files changed, 133 insertions(+), 21 deletions(-)
 create mode 100644 data/blackboard.art

diff --git a/data/blackboard.art b/data/blackboard.art
new file mode 100644
index 0000000000000000000000000000000000000000..d93a09dcce9ad0548fa5282e7e6f06fffee21068
GIT binary patch
literal 2833
zcmV+s3-0vAvy170000000RjL40000400962000000DwOL000020002#3IG5*4*&oF
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

literal 0
HcmV?d00001

diff --git a/data/shaders/default.vert.glsl b/data/shaders/default.vert.glsl
index 7415173..6221268 100644
--- a/data/shaders/default.vert.glsl
+++ b/data/shaders/default.vert.glsl
@@ -7,11 +7,13 @@ layout (location = 2) in vec2 texCoord;
 out vec3 OurColor;
 out vec2 TexCoord;
 
-uniform mat4 transform;
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
 
 void main()
 {
-	gl_Position = transform * vec4(position, 1.0f);
+	gl_Position = projection * view * model * vec4(position, 1.0f);
 	OurColor = color;
 	TexCoord = texCoord;
 }
diff --git a/src/dengine.cpp b/src/dengine.cpp
index 6c9a8cf..45b2e53 100644
--- a/src/dengine.cpp
+++ b/src/dengine.cpp
@@ -79,16 +79,17 @@ int main()
 		return -1;
 	}
 
-	i32 width, height;
-	glfwGetFramebufferSize(window, &width, &height);
-	glViewport(0, 0, width, height);
+	i32 screenWidth, screenHeight;
+	glfwGetFramebufferSize(window, &screenWidth, &screenHeight);
+	glViewport(0, 0, screenWidth, screenHeight);
 
 	glfwSetKeyCallback(window, key_callback);
 
+	glEnable(GL_DEPTH_TEST);
+
 	/* Initialise shaders */
 	Dengine::Shader shader = Dengine::Shader("data/shaders/default.vert.glsl",
 	                                         "data/shaders/default.frag.glsl");
-
 	GLuint texture;
 	glGenTextures(1, &texture);
 	glBindTexture(GL_TEXTURE_2D, texture);
@@ -123,23 +124,85 @@ int main()
 	stbi_image_free(image);
 
 	/* Create OGL Vertex objects */
+	GLfloat vertices[] = {
+		-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
+		 0.5f, -0.5f, -0.5f,  1.0f, 0.0f,
+		 0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+		 0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
+		-0.5f, -0.5f, -0.5f,  0.0f, 0.0f,
+
+		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+		 0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+		 0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
+		 0.5f,  0.5f,  0.5f,  1.0f, 1.0f,
+		-0.5f,  0.5f,  0.5f,  0.0f, 1.0f,
+		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+
+		-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+		-0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+		-0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+
+		 0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+		 0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+		 0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+		 0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+		 0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+		 0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+
+		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+		 0.5f, -0.5f, -0.5f,  1.0f, 1.0f,
+		 0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+		 0.5f, -0.5f,  0.5f,  1.0f, 0.0f,
+		-0.5f, -0.5f,  0.5f,  0.0f, 0.0f,
+		-0.5f, -0.5f, -0.5f,  0.0f, 1.0f,
+
+		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f,
+		 0.5f,  0.5f, -0.5f,  1.0f, 1.0f,
+		 0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+		 0.5f,  0.5f,  0.5f,  1.0f, 0.0f,
+		-0.5f,  0.5f,  0.5f,  0.0f, 0.0f,
+		-0.5f,  0.5f, -0.5f,  0.0f, 1.0f
+	};
+
+	glm::vec3 cubePositions[] = {
+		glm::vec3( 0.0f,  0.0f,  0.0f),
+		glm::vec3( 2.0f,  5.0f, -15.0f),
+		glm::vec3(-1.5f, -2.2f, -2.5f),
+		glm::vec3(-3.8f, -2.0f, -12.3f),
+		glm::vec3( 2.4f, -0.4f, -3.5f),
+		glm::vec3(-1.7f,  3.0f, -7.5f),
+		glm::vec3( 1.3f, -2.0f, -2.5f),
+		glm::vec3( 1.5f,  2.0f, -2.5f),
+		glm::vec3( 1.5f,  0.2f, -1.5f),
+		glm::vec3(-1.3f,  1.0f, -1.5f)
+	};
+
+#if 0
 	GLfloat vertices[] = {
 		// Positions          Colors             Texture Coords
 		+0.5f, +0.5f, +0.0f,  1.0f, 0.0f, 0.0f,  1.0f, 1.0f, // Top Right
 		+0.5f, -0.5f, +0.0f,  0.0f, 1.0f, 0.0f,  1.0f, 0.0f, // Bottom Right
-	    -0.5f, -0.5f, +0.0f,  0.0f, 0.0f, 1.0f,  0.0f, 0.0f, // Bottom left
-	    -0.5f, +0.5f, +0.0f,  1.0f, 1.0f, 0.0f,  0.0f, 1.0f, // Top left
+		-0.5f, -0.5f, +0.0f,  0.0f, 0.0f, 1.0f,  0.0f, 0.0f, // Bottom left
+		-0.5f, +0.5f, +0.0f,  1.0f, 1.0f, 0.0f,  0.0f, 1.0f, // Top left
 	};
-
+#endif
 	GLuint indices[] = {
 	    0, 1, 3, // First triangle
 	    1, 2, 3, // First triangle
 	};
 
-	GLuint vbo, vao, ebo;
+
+	GLuint vbo, vao;
 	glGenVertexArrays(1, &vao);
 	glGenBuffers(1, &vbo);
+#if 0
+	GLuint ebo;
 	glGenBuffers(1, &ebo);
+#endif
 
 	// 1. Bind vertex array object
 	glBindVertexArray(vao);
@@ -148,10 +211,10 @@ int main()
 	glBindBuffer(GL_ARRAY_BUFFER, vbo);
 	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
 
+#if 0
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
 
-
 	const i32 numPos      = 3;
 	const i32 numColors   = 3;
 	const i32 numTexCoord = 2;
@@ -172,12 +235,32 @@ int main()
 	glVertexAttribPointer(2, numTexCoord, GL_FLOAT, GL_FALSE, vertexSize,
 	                      (GLvoid *)texCoordByteOffset);
 	glEnableVertexAttribArray(2);
+#endif
 
+	glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
+	                      (GLvoid *)0);
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat),
+	                      (GLvoid *)(3 * sizeof(GLfloat)));
+	glEnableVertexAttribArray(2);
+		
 
 	// 4. Unbind to prevent mistakes
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 	glBindVertexArray(0);
 
+	glm::vec3 cameraPos       = glm::vec3(0.0f, 0.0f, 3.0f);
+	glm::vec3 cameraTarget    = glm::vec3(0.0f, 0.0f, 0.0f);
+	glm::vec3 cameraDirection = glm::normalize(cameraPos - cameraTarget);
+
+	glm::vec3 upVec       = glm::vec3(0.0f, 1.0f, 0.0f);
+	glm::vec3 cameraRight = glm::normalize(glm::cross(upVec, cameraPos));
+	glm::vec3 cameraUp    = glm::cross(cameraDirection, cameraRight);
+
+	glm::mat4 view;
+	// NOTE(doyle): Lookat generates the matrix for camera coordinate axis
+	view = glm::lookAt(cameraPos, cameraTarget, upVec);
+
 	/* Main game loop */
 	while (!glfwWindowShouldClose(window))
 	{
@@ -186,26 +269,48 @@ int main()
 
 		/* Rendering commands here*/
 		glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
-		glClear(GL_COLOR_BUFFER_BIT);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 		shader.use();
 
+		/* Camera */
+		GLfloat radius = 10.0f;
+		GLfloat camX   = sin(glfwGetTime()) * radius;
+		GLfloat camZ   = cos(glfwGetTime()) * radius;
+		view = glm::lookAt(glm::vec3(camX, 0.0, camZ), cameraTarget, upVec);
+
 		/* Math */
-		glm::mat4 trans;
-		trans = glm::translate(trans, glm::vec3(0.5f, -0.5f, 0.0f));
-		GLfloat rotation = glm::radians((GLfloat)glfwGetTime() * 50.0f);
-		trans = glm::rotate(trans, rotation,
-		                    glm::vec3(0.0, 0.0, 1.0));
-		GLuint transformLoc =
-		    glGetUniformLocation(shader.mProgram, "transform");
-		glUniformMatrix4fv(transformLoc, 1, GL_FALSE, glm::value_ptr(trans));
+		view = glm::translate(view, glm::vec3(0.0f, 0.0f, -3.0f));
+
+		glm::mat4 projection;
+		projection =
+		    glm::perspective(glm::radians(45.0f), ((f32)screenWidth / (f32)screenHeight), 0.1f, 100.0f);
+
+		
+		GLuint modelLoc = glGetUniformLocation(shader.mProgram, "model");
+		GLuint viewLoc = glGetUniformLocation(shader.mProgram, "view");
+		glUniformMatrix4fv(viewLoc, 1, GL_FALSE, glm::value_ptr(view));
+
+		GLuint projectionLoc = glGetUniformLocation(shader.mProgram, "projection");
+		glUniformMatrix4fv(projectionLoc, 1, GL_FALSE, glm::value_ptr(projection));
 
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, texture);
 		glUniform1i(glGetUniformLocation(shader.mProgram, "ourTexture"), 0);
 
 		glBindVertexArray(vao);
-		glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
+		// glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
+		for (GLuint i = 0; i < 10; i++)
+		{
+			glm::mat4 model;
+			model = glm::translate(model, cubePositions[i]);
+
+			GLfloat angle = glm::radians(20.0f * i);
+			model = glm::rotate(model, angle, glm::vec3(1.0f, 0.3f, 0.5f));
+
+			glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
+			glDrawArrays(GL_TRIANGLES, 0, 36);
+		}
 		glBindVertexArray(0);
 
 		/* Swap the buffers */
@@ -214,7 +319,9 @@ int main()
 
 	glDeleteVertexArrays(1, &vao);
 	glDeleteBuffers(1, &vbo);
+#if 0
 	glDeleteBuffers(1, &ebo);
+#endif
 
 	glfwTerminate();
 	return 0;
diff --git a/src/include/Dengine/Common.h b/src/include/Dengine/Common.h
index 958e52d..88cde63 100644
--- a/src/include/Dengine/Common.h
+++ b/src/include/Dengine/Common.h
@@ -5,9 +5,12 @@
 
 typedef uint8_t u8;
 typedef uint32_t u32;
+
 typedef int32_t i32;
 typedef i32 b32;
 
+typedef float f32;
+
 #define TRUE 1
 #define FALSE 0