CIS565-Fall-2015 · arizonat · Oct 5, 2015 · Oct 5, 2015 · Oct 6, 2015 · Oct 6, 2015
diff --git a/README.md b/README.md
diff --git a/renders/aa_vs_fps.png.png b/renders/aa_vs_fps.png.png
diff --git a/renders/anti_aliasing_3_v_1.PNG b/renders/anti_aliasing_3_v_1.PNG
diff --git a/renders/anti_aliasing_cow_3_v_1.PNG b/renders/anti_aliasing_cow_3_v_1.PNG
diff --git a/renders/cow_color_interpolation.PNG b/renders/cow_color_interpolation.PNG
diff --git a/renders/cow_initial_GS.PNG b/renders/cow_initial_GS.PNG
diff --git a/renders/cow_instancing.PNG b/renders/cow_instancing.PNG
diff --git a/renders/cow_normals.PNG b/renders/cow_normals.PNG
diff --git a/renders/cows_normals.PNG b/renders/cows_normals.PNG
diff --git a/renders/depth_test_flower.PNG b/renders/depth_test_flower.PNG
diff --git a/renders/pie_chart.png b/renders/pie_chart.png
diff --git a/renders/render_gone_wrong.PNG b/renders/render_gone_wrong.PNG
diff --git a/renders/trisize_vs_fps.png.png b/renders/trisize_vs_fps.png.png
diff --git a/src/main.cpp b/src/main.cpp
@@ -7,6 +7,13 @@
  */
 
 #include "main.hpp"
+#include <cuda.h>
+#include <glm/gtc/constants.hpp>
+#include <glm/gtx/rotate_vector.hpp>
+
+static Cam cam;
+static bool camIsMobile;
+static glm::vec2 oldCursorPos;
 
 //-------------------------------
 //-------------MAIN--------------
@@ -78,7 +85,7 @@ void runCuda() {
     dptr = NULL;
 
     cudaGLMapBufferObject((void **)&dptr, pbo);
-    rasterize(dptr);
+    rasterize(dptr, cam);
     cudaGLUnmapBufferObject(pbo);
 
     frame++;
@@ -99,13 +106,27 @@ bool init(obj *mesh) {
 
     width = 800;
     height = 800;
+
+	cam.width = width;
+	cam.height = height;
+	cam.pos = glm::vec3(0.0f, 0.0f, 5.0f);
+	cam.focus = glm::vec3(0.0f, 0.0f, 0.0f);
+	cam.up = glm::vec3(0.0f, -1.0f, 0.0f);
+	cam.fovy = 45.0f * glm::pi<float>() / 180.0f;
+	cam.zNear = 0.1f;
+	cam.zFar = 100.0f;
+	cam.aspect = 1.0f;
+
     window = glfwCreateWindow(width, height, "CIS 565 Pathtracer", NULL, NULL);
     if (!window) {
         glfwTerminate();
         return false;
     }
     glfwMakeContextCurrent(window);
     glfwSetKeyCallback(window, keyCallback);
+	glfwSetScrollCallback(window, scrollCallback);
+	glfwSetCursorPosCallback(window, cursorCallback);
+	glfwSetMouseButtonCallback(window, mouseCallback);
 
     // Set up GL context
     glewExperimental = GL_TRUE;
@@ -270,7 +291,68 @@ void errorCallback(int error, const char *description) {
 }
 
 void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods) {
+
+	glm::vec3 camView = glm::normalize(cam.focus - cam.pos);
+	glm::vec3 camUp = cam.up;
+	glm::vec3 camRight = glm::cross(camView, camUp);
+
     if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS) {
         glfwSetWindowShouldClose(window, GL_TRUE);
-    }
+	}
+	else if (key == GLFW_KEY_DOWN && action == GLFW_PRESS){
+		cam.pos += camUp * 0.1f;
+		cam.focus += camUp * 0.1f;
+	}
+	else if (key == GLFW_KEY_UP && action == GLFW_PRESS){
+		cam.pos += camUp * -0.1f;
+		cam.focus += camUp * -0.1f;
+	}
+	else if (key == GLFW_KEY_RIGHT && action == GLFW_PRESS){
+		cam.pos += camRight * -0.1f;
+		cam.focus += camRight * -0.1f;
+	}
+	else if (key == GLFW_KEY_LEFT && action == GLFW_PRESS){
+		cam.pos += camRight * 0.1f;
+		cam.focus += camRight * 0.1f;
+	}
+	// Reset
+	else if (key == GLFW_KEY_R && action == GLFW_PRESS){
+		cam.pos = glm::vec3(0.0, 0.0, 4.0);
+		cam.focus = glm::vec3(0.0);
+	}
 }
+
+void scrollCallback(GLFWwindow *window, double x_offset, double y_offset){
+	glm::vec3 camView = glm::normalize(cam.focus - cam.pos);
+	cam.pos += camView * (float)y_offset;
+	cam.focus += camView * (float)y_offset;
+}
+
+void mouseCallback(GLFWwindow *window, int button, int action, int mods){
+	if (button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS){
+		camIsMobile = true;
+	}
+	else {
+		camIsMobile = false;
+	}
+}
+
+void cursorCallback(GLFWwindow *window, double x_pos, double y_pos){
+	glm::vec3 camView = glm::normalize(cam.focus - cam.pos);
+	glm::vec3 camUp = cam.up;
+	glm::vec3 camRight = glm::cross(camView, camUp);
+
+	glm::vec3 rotatedView;
+
+	if (camIsMobile){
+		float x_diff = x_pos - oldCursorPos[0];
+		float y_diff = y_pos - oldCursorPos[1];
+
+		rotatedView = glm::rotate(camView, y_diff/100.0f, camRight);
+		rotatedView = glm::rotate(rotatedView, x_diff/100.0f, camUp);
+		cam.up = camUp;
+		cam.focus = cam.pos + glm::normalize(rotatedView);
+	}
+	oldCursorPos[0] = x_pos;
+	oldCursorPos[1] = y_pos;
+}
diff --git a/src/main.hpp b/src/main.hpp
@@ -93,3 +93,6 @@ void deleteTexture(GLuint *tex);
 void mainLoop();
 void errorCallback(int error, const char *description);
 void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods);
+void scrollCallback(GLFWwindow *window, double x_offset, double y_offset);
+void mouseCallback(GLFWwindow *window, int button, int action, int mods);
+void cursorCallback(GLFWwindow *window, double x_pos, double y_pos);