Submission: Bradley Crusco

CMakeLists.txt

@@ -77,7 +77,7 @@ find_package(CUDA REQUIRED)
 set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE ON)
 set(CUDA_SEPARABLE_COMPILATION ON)
 
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your own stream compaction
+add_subdirectory(stream_compaction)
 add_subdirectory(src)
 add_subdirectory(util)
 
@@ -89,7 +89,7 @@ cuda_add_executable(${CMAKE_PROJECT_NAME}
 target_link_libraries(${CMAKE_PROJECT_NAME}
     src
     util
-    #stream_compaction  # TODO: uncomment if using your own stream compaction
+    stream_compaction
     ${CORELIBS}
     )
 

src/CMakeLists.txt

@@ -2,6 +2,8 @@ set(SOURCE_FILES
     "rasterize.cu"
     "rasterize.h"
     "rasterizeTools.h"
+    "scene.cpp"
+    "scene.hpp"
     )
 
 cuda_add_library(src

src/main.cpp

@@ -8,6 +8,8 @@
 
 #include "main.hpp"
 
+#include <glm/gtx/rotate_vector.hpp>
+
 //-------------------------------
 //-------------MAIN--------------
 //-------------------------------
@@ -83,7 +85,6 @@ void runCuda() {
 
     frame++;
     fpstracker++;
-
 }
 
 //-------------------------------
@@ -106,6 +107,9 @@ bool init(obj *mesh) {
     }
     glfwMakeContextCurrent(window);
     glfwSetKeyCallback(window, keyCallback);
+	glfwSetCursorPosCallback(window, mouseMoveCallback);
+	glfwSetMouseButtonCallback(window, mousePressCallback);
+	glfwSetScrollCallback(window, mouseScrollCallback);
 
     // Set up GL context
     glewExperimental = GL_TRUE;
@@ -159,7 +163,10 @@ void initCuda() {
     // Use device with highest Gflops/s
     cudaGLSetGLDevice(0);
 
-    rasterizeInit(width, height);
+	scene = new Scene();
+	scene->scissorMax = glm::vec2(width * 0.75f, height * 0.75f);
+	scene->scissorMin = glm::vec2(width * 0.25f, height * 0.25f);
+    rasterizeInit(width, height, scene);
 
     // Clean up on program exit
     atexit(cleanupCuda);
@@ -274,3 +281,75 @@ void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods
         glfwSetWindowShouldClose(window, GL_TRUE);
     }
 }
+
+void mouseMoveCallback(GLFWwindow *window, double x, double y) {
+	if (!scene->mouseState.initialPositionsSet) {
+		// Have to set a baseline position for our offsets to base off of
+		scene->mouseState.x = x;
+		scene->mouseState.y = y;
+		scene->mouseState.initialPositionsSet = true;
+	}
+	else {
+		if (scene->mouseState.leftPressed) {
+			// Holding the left mouse rotates the camera.
+			glm::vec3 inverseLookAt = scene->camera.position - scene->camera.lookAt;
+			float xOffset = 0.005f * (scene->mouseState.x - (float)x);
+			float yOffset = 0.005f * (scene->mouseState.y - (float)y);
+			glm::vec3 tempInverseLookAt = glm::rotateY(inverseLookAt, glm::atan((float)(xOffset / 
+				(TWO_PI * glm::length(inverseLookAt))), glm::length(inverseLookAt)));
+
+			scene->camera.right = glm::normalize(glm::rotateY(glm::vec3(inverseLookAt.x, 0.0f, inverseLookAt.z), (float)(PI / 2.0)));
+			scene->camera.position = scene->camera.lookAt + glm::rotate(tempInverseLookAt, glm::atan(yOffset /
+				(float)(TWO_PI * glm::length(inverseLookAt)), glm::length(tempInverseLookAt)), scene->camera.right);
+			scene->updateModelView();
+		}
+		else if (scene->mouseState.middlePressed) {
+			// Holding middle will translate the camera
+			float xOffset = 0.0001f * (scene->mouseState.x - (float)x);
+			float yOffset = 0.0001f * ((float)y - scene->mouseState.y);
+			glm::vec3 tempPosition = (scene->camera.position + scene->camera.right * xOffset) + (scene->camera.up * yOffset);
+			glm::vec3 tempLookAt = scene->camera.lookAt - tempPosition;
+
+			if (glm::length(tempLookAt) > 1.0f) {
+				// Restrict amount user can pan to stop going through model
+				scene->camera.lookAt = scene->camera.lookAt + tempPosition - scene->camera.position;
+				scene->camera.position = tempPosition;
+				scene->updateModelView();
+			}
+		}
+	}
+}
+
+void mousePressCallback(GLFWwindow *window, int button, int action, int mods) {
+	if (button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS) {
+		// Mark left mouse button as held
+		scene->mouseState.leftPressed = true;
+		scene->mouseState.initialPositionsSet = false;
+	}
+	else if (button == GLFW_MOUSE_BUTTON_MIDDLE && action == GLFW_PRESS) {
+		// Mark right mouse button as held
+		scene->mouseState.middlePressed = true;
+		scene->mouseState.initialPositionsSet = false;
+	}
+	else if (action == GLFW_RELEASE) {
+		// Reset the flags for which button is held
+		scene->mouseState.leftPressed = false;
+		scene->mouseState.middlePressed = false;
+		scene->mouseState.initialPositionsSet = true;
+	}
+}
+
+void mouseScrollCallback(GLFWwindow *window, double x, double y) {
+	if (y > 0.0) {
+		glm::vec3 tempLookAt = scene->camera.lookAt - scene->camera.position;
+		if (glm::length(tempLookAt) > 1.0) {
+			// Stop user from zooming in too close and through/past the model
+			scene->camera.position += glm::normalize(tempLookAt) * 0.1f;
+			scene->updateModelView();
+		}
+	}
+	else if (y < 0.0) {
+		scene->camera.position = scene->camera.position + (glm::normalize(scene->camera.position - scene->camera.lookAt) * 0.1f);
+		scene->updateModelView();
+	}
+}

src/main.hpp

@@ -24,6 +24,7 @@
 #include <util/utilityCore.hpp>
 #include <util/objloader.hpp>
 #include "rasterize.h"
+#include "scene.hpp"
 
 using namespace std;
 
@@ -43,6 +44,8 @@ uchar4 *dptr;
 
 GLFWwindow *window;
 
+Scene *scene;
+
 //-------------------------------
 //----------CUDA STUFF-----------
 //-------------------------------
@@ -93,3 +96,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 mouseMoveCallback(GLFWwindow *window, double x, double y);
+void mousePressCallback(GLFWwindow *window, int button, int action, int mods);
+void mouseScrollCallback(GLFWwindow *window, double x, double y);