CIS565-Fall-2015 · ziyezhou-Jerry · Oct 9, 2015 · Oct 9, 2015 · Oct 10, 2015 · Oct 10, 2015
diff --git a/README.md b/README.md
diff --git a/image/1.png b/image/1.png
diff --git a/image/2.png b/image/2.png
diff --git a/image/3.png b/image/3.png
diff --git a/image/4.png b/image/4.png
diff --git a/image/bending_compare.png b/image/bending_compare.png
diff --git a/image/blending.png b/image/blending.png
diff --git a/image/color_interpolation.png b/image/color_interpolation.png
diff --git a/image/compare.png b/image/compare.png
diff --git a/image/cow.png b/image/cow.png
diff --git a/image/cow_smooth.png b/image/cow_smooth.png
diff --git a/image/debug_image.png b/image/debug_image.png
diff --git a/image/excel.png b/image/excel.png
diff --git a/image/flower.png b/image/flower.png
diff --git a/image/flower2.png b/image/flower2.png
diff --git a/image/image.docx b/image/image.docx
diff --git a/image/more_results.png b/image/more_results.png
diff --git a/image/multiple_sample.png b/image/multiple_sample.png
diff --git a/image/representive.png b/image/representive.png
diff --git a/image/sample_combine.png b/image/sample_combine.png
diff --git a/image/sample_inside.png b/image/sample_inside.png
diff --git a/image/sample_outside.png b/image/sample_outside.png
diff --git a/image/suzanne.png b/image/suzanne.png
diff --git a/image/suzanne_smooth.png b/image/suzanne_smooth.png
diff --git a/image/w_anti_aliasing.png b/image/w_anti_aliasing.png
diff --git a/image/w_anti_aliasing_new - Copy.png b/image/w_anti_aliasing_new - Copy.png
diff --git a/image/w_anti_aliasing_new.png b/image/w_anti_aliasing_new.png
diff --git a/image/wo_anti_aliasing.png b/image/wo_anti_aliasing.png
diff --git a/image/wo_anti_aliasing_new - Copy.png b/image/wo_anti_aliasing_new - Copy.png
diff --git a/image/wo_anti_aliasing_new.png b/image/wo_anti_aliasing_new.png
diff --git a/image/wo_blending.png b/image/wo_blending.png
diff --git a/src/main.cpp b/src/main.cpp
@@ -13,7 +13,17 @@
 //-------------------------------
 
 int main(int argc, char **argv) {
-    if (argc != 2) {
+
+	/*glm::mat4 m_model = glm::translate(glm::mat4(1.0),glm::vec3(1.0,0.0,0.0));
+
+	glm::vec3 a (0.0);
+
+	a = glm::vec3(m_model*glm::vec4(a,1.0));*/
+
+
+
+
+	if (argc != 2) {
         cout << "Usage: [obj file]" << endl;
         return 0;
     }
@@ -23,6 +33,7 @@ int main(int argc, char **argv) {
     {
         objLoader loader(argv[1], mesh);
         mesh->buildBufPoss();
+		//mesh->setFirstTriColor();
     }
 
     frame = 0;
@@ -78,7 +89,7 @@ void runCuda() {
     dptr = NULL;
 
     cudaGLMapBufferObject((void **)&dptr, pbo);
-    rasterize(dptr);
+    rasterize(dptr,g_camera);
     cudaGLUnmapBufferObject(pbo);
 
     frame++;
@@ -92,6 +103,7 @@ void runCuda() {
 
 bool init(obj *mesh) {
     glfwSetErrorCallback(errorCallback);
+
 
     if (!glfwInit()) {
         return false;
@@ -106,6 +118,9 @@ bool init(obj *mesh) {
     }
     glfwMakeContextCurrent(window);
     glfwSetKeyCallback(window, keyCallback);
+	glfwSetMouseButtonCallback(window,mouseCallback);
+	glfwSetCursorPosCallback(window,cursorPosCallback);
+	glfwSetScrollCallback(window,scrollCallback);
 
     // Set up GL context
     glewExperimental = GL_TRUE;
@@ -119,6 +134,10 @@ bool init(obj *mesh) {
     initCuda();
     initPBO();
 
+	//init the camera
+	g_camera = new Camera();
+	g_camera->Reset(width, height);
+
     float cbo[] = {
         0.0, 1.0, 0.0,
         0.0, 0.0, 1.0,
@@ -273,4 +292,95 @@ void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods
     if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS) {
         glfwSetWindowShouldClose(window, GL_TRUE);
     }
+	else if (key == GLFW_KEY_UP && action == GLFW_PRESS) {
+
+		g_camera->KeyChangeScale(true);
+	}
+	else if (key == GLFW_KEY_DOWN && action == GLFW_PRESS) {
+
+		g_camera->KeyChangeScale(false);
+
+	}
+	else if(key == GLFW_KEY_W && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(2,true);
+	}
+	else if(key == GLFW_KEY_S && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(2,false);
+	}
+	else if(key == GLFW_KEY_A && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(1,true);
+	}
+	else if(key == GLFW_KEY_D && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(1,false);
+	}
+	else if(key == GLFW_KEY_X && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(3,false);
+	}
+	else if(key == GLFW_KEY_Z && action == GLFW_PRESS)
+	{
+		g_camera->KeyChangeTranslate(3,true);
+	}
+
+
+}
+
+void mouseCallback(GLFWwindow *window, int button, int action, int mods)
+{
+	if(button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS)
+	{
+		glfwGetCursorPos(window,&g_mouse_old_x,&g_mouse_old_y);		 
+	}
+	else if(button == GLFW_MOUSE_BUTTON_RIGHT && action == GLFW_PRESS)
+	{
+		glfwGetCursorPos(window,&g_mouse_old_x,&g_mouse_old_y);	
+	}
+	else if(button == GLFW_MOUSE_BUTTON_MIDDLE && action == GLFW_PRESS)
+	{
+		glfwGetCursorPos(window,&g_mouse_old_x,&g_mouse_old_y);	
+	}
+}
+
+void scrollCallback(GLFWwindow* window, double xoffset, double yoffset)
+{
+	 g_camera->MouseChangeDistance(1.0f,xoffset ,yoffset );
+}
+
+void cursorPosCallback(GLFWwindow *window, double xpos, double ypos)
+{
+	if(glfwGetMouseButton(window,GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS)
+	{
+		double dx, dy;
+		dx = (double)(xpos - g_mouse_old_x);
+		dy = (double)(ypos - g_mouse_old_y);
+		g_camera->MouseChangeHeadPitch(0.2f, dx, dy);
+
+		g_mouse_old_x = xpos;
+		g_mouse_old_y = ypos;
+
+	}
+	else if(glfwGetMouseButton(window,GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS)
+	{
+		double dx, dy;
+		dx = (double)(xpos - g_mouse_old_x);
+		dy = (double)(ypos - g_mouse_old_y);
+		g_camera->MouseChangeLookat(0.01f, dx, dy);
+
+		g_mouse_old_x = xpos;
+		g_mouse_old_y = ypos;
+	}
+	else if(glfwGetMouseButton(window,GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS)
+	{
+		double dx, dy;
+		dx = (double)(xpos - g_mouse_old_x);
+		dy = (double)(ypos - g_mouse_old_y);
+		g_camera->MouseChangeDistance(0.05f, dx, dy);
+
+		g_mouse_old_x = xpos;
+		g_mouse_old_y = ypos;
+	}
 }
diff --git a/src/main.hpp b/src/main.hpp
@@ -20,10 +20,12 @@
 #include <cuda_gl_interop.h>
 #include <cuda_runtime.h>
 #include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
 #include <util/glslUtility.hpp>
 #include <util/utilityCore.hpp>
 #include <util/objloader.hpp>
 #include "rasterize.h"
+#include <util/camera.h>
 
 using namespace std;
 
@@ -93,3 +95,20 @@ 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 mouseCallback(GLFWwindow *window, int button, int action, int mods);
+void scrollCallback(GLFWwindow* window, double xoffset, double yoffset);
+void cursorPosCallback(GLFWwindow *window, double xpos, double ypos);
+
+
+//------------------------------
+//-------Mouse Sate---------
+//------------------------------
+
+double g_mouse_old_x;
+double g_mouse_old_y;
+
+
+//------------------------------
+//-------Camera ---------
+//------------------------------
+Camera* g_camera;