CIS565-Fall-2014 · dkotfis · Oct 26, 2014 · Oct 26, 2014 · Oct 26, 2014
diff --git a/README.md b/README.md
diff --git a/external/src/objUtil/obj.cpp b/external/src/objUtil/obj.cpp
@@ -18,7 +18,7 @@ obj::obj(){
 	defaultColor = glm::vec3(0,0,0);
 	boundingbox = new float[32];
 	maxminSet = false;
-	xmax=0; xmin=0; ymax=0; ymin=0; zmax=0; zmin=0; 
+	xmax=0; xmin=0; ymax=0; ymin=0; zmax=0; zmin=0;
 
 }
 
@@ -52,7 +52,7 @@ void obj::buildVBOs(){
 			for(int i=2; i<face.size(); i++){
 				glm::vec4 p1 = points[face[i-1]];
 				glm::vec4 p2 = points[face[i]];
-				VBOvec.push_back(p0[0]) ; VBOvec.push_back(p0[1]); VBOvec.push_back(p0[2]); //VBOvec.push_back(1.0f);
+				VBOvec.push_back(p0[0]); VBOvec.push_back(p0[1]); VBOvec.push_back(p0[2]); //VBOvec.push_back(1.0f);
 				VBOvec.push_back(p1[0]); VBOvec.push_back(p1[1]); VBOvec.push_back(p1[2]); //VBOvec.push_back(1.0f);
 				VBOvec.push_back(p2[0]); VBOvec.push_back(p2[1]); VBOvec.push_back(p2[2]); //VBOvec.push_back(1.0f);
 

diff --git a/objs/tri.obj b/objs/tri.obj
@@ -1,6 +1,6 @@
 v 0 0 0
 v 0.1 0 0
-v 0 0.1 0
+v 0.1 0.1 0
 
 vn 0 0 1
 

diff --git a/renders/Thumbs.db b/renders/Thumbs.db
diff --git a/renders/cow_diffuse_good_2.png b/renders/cow_diffuse_good_2.png
diff --git a/renders/cow_phong.png b/renders/cow_phong.png
diff --git a/renders/cow_phong_diffuse.png b/renders/cow_phong_diffuse.png
diff --git a/renders/cow_phong_diffuse2.png b/renders/cow_phong_diffuse2.png
diff --git a/renders/cow_phong_diffuse_fixed.png b/renders/cow_phong_diffuse_fixed.png
diff --git a/renders/cow_phong_diffuse_good.png b/renders/cow_phong_diffuse_good.png
diff --git a/renders/cow_phong_pretty.png b/renders/cow_phong_pretty.png
diff --git a/renders/cow_rasterize.png b/renders/cow_rasterize.png
diff --git a/renders/cow_video.wmv b/renders/cow_video.wmv
diff --git a/renders/diffuse_cube.png b/renders/diffuse_cube.png
diff --git a/renders/raster-triangle.png b/renders/raster-triangle.png
diff --git a/renders/tesselation_impact.png b/renders/tesselation_impact.png
diff --git a/src/main.cpp b/src/main.cpp
@@ -2,13 +2,16 @@
 // Written by Yining Karl Li, Copyright (c) 2012 University of Pennsylvania
 
 #include "main.h"
+#include "glm/gtc/matrix_transform.hpp"
 
 //-------------------------------
 //-------------MAIN--------------
 //-------------------------------
 
 int main(int argc, char** argv){
 
+
+  /*
   bool loadedScene = false;
   for(int i=1; i<argc; i++){
     string header; string data;
@@ -23,12 +26,44 @@ int main(int argc, char** argv){
       loadedScene = true;
     }
   }
+  */
+
+  // Initialize the model
+  bool loadedScene = false;
+  string data = std::string("C:\\\\Users\\Dave\\Documents\\Github\\Project4-Rasterizer\\objs\\cow.obj");
+  mesh = new obj();
+  objLoader* loader = new objLoader(data, mesh);
+  mesh->buildVBOs();
+  delete loader;
+  loadedScene = true;
 
   if(!loadedScene){
     cout << "Usage: mesh=[obj file]" << endl;
     return 0;
   }
 
+  // Initialize the camera
+  camera_distance = 3.0f;
+  camera_phi = PI/2.0f;
+  camera_theta = 3.0f*PI/2.0f;
+
+  // Initialize the MVP matrix
+  glm::mat4 model = glm::translate(glm::mat4(), glm::vec3(0.0f, 0.0f, 0.0f)) * glm::scale(glm::mat4(), glm::vec3(1.0f));
+  glm::vec3 eye(camera_distance*sin(camera_phi)*cos(camera_theta), camera_distance*cos(camera_phi), camera_distance*sin(camera_phi)*sin(camera_theta));
+  glm::vec3 origin(0.0f, 0.0f, 0.0f);
+  glm::vec3 up(0.0f, 1.0f, 0.0f);
+  glm::mat4 view = glm::lookAt(eye, origin, up);
+  glm::mat4 projection = glm::perspective(45.0f, (float)(width / height), 0.1f, 100.0f);
+  mvp = projection * view * model;
+
+  // Initialize the light source (undirected)
+  light.origin = glm::vec3(-15.0f, -15.0f, -15.0f);
+  light.color = glm::vec3(1.0f, 1.0f, 1.0f);
+  glm::vec4 light_temp = mvp*glm::vec4(light.origin, 1.0f);
+  light.origin.x = light_temp.x/light_temp.w;
+  light.origin.y = light_temp.y/light_temp.w;
+  light.origin.z = light_temp.z/light_temp.w;
+
   frame = 0;
   seconds = time (NULL);
   fpstracker = 0;
@@ -93,13 +128,26 @@ void runCuda(){
   ibo = mesh->getIBO();
   ibosize = mesh->getIBOsize();
 
+  nbo = mesh->getNBO();
+  nbosize = mesh->getNBOsize();
+
+  // Update the MVP matrix
+  glm::mat4 model = glm::translate(glm::mat4(), glm::vec3(0.0f, 0.0f, 0.0f)) * glm::scale(glm::mat4(), glm::vec3(1.0f));
+  glm::vec3 eye(camera_distance*sin(camera_phi)*cos(camera_theta), camera_distance*cos(camera_phi), camera_distance*sin(camera_phi)*sin(camera_theta));
+  glm::vec3 origin(0.0f, 0.0f, 0.0f);
+  glm::vec3 up(0.0f, 1.0f, 0.0f);
+  glm::mat4 view = glm::lookAt(eye, origin, up);
+  glm::mat4 projection = glm::perspective(45.0f, (float)(width / height), 0.1f, 100.0f);
+  mvp = projection * view * model;
+
   cudaGLMapBufferObject((void**)&dptr, pbo);
-  cudaRasterizeCore(dptr, glm::vec2(width, height), frame, vbo, vbosize, cbo, cbosize, ibo, ibosize);
+  cudaRasterizeCore(dptr, glm::vec2(width, height), frame, light, vbo, vbosize, cbo, cbosize, ibo, ibosize, nbo, nbosize, mvp);
   cudaGLUnmapBufferObject(pbo);
 
   vbo = NULL;
   cbo = NULL;
   ibo = NULL;
+  nbo = NULL;
 
   frame++;
   fpstracker++;
@@ -126,6 +174,9 @@ bool init(int argc, char* argv[]) {
   }
   glfwMakeContextCurrent(window);
   glfwSetKeyCallback(window, keyCallback);
+  glfwSetMouseButtonCallback(window, (GLFWmousebuttonfun)mouseButtonCallback);
+  glfwSetCursorPosCallback(window, (GLFWcursorposfun)mousePositionCallback);
+  glfwSetScrollCallback(window, (GLFWscrollfun)mouseScrollCallback);
 
   // Set up GL context
   glewExperimental = GL_TRUE;
@@ -281,4 +332,39 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
     if(key == GLFW_KEY_ESCAPE && action == GLFW_PRESS){
         glfwSetWindowShouldClose(window, GL_TRUE);
     }
+}
+
+void mouseButtonCallback(GLFWwindow* window, int button, int action) {
+
+  if (button == GLFW_MOUSE_BUTTON_LEFT) {
+    mouse_pressed = (action == GLFW_PRESS) ? true : false;
+    if (!mouse_pressed) {
+      x_last = -1;
+      y_last = -1;
+    }
+  }
+
+}
+
+void mousePositionCallback(GLFWwindow* window, double x, double y) {
+
+  if (mouse_pressed) {
+    if (x_last == -1) {
+      x_last = x;
+      y_last = y;
+      return;
+    }
+    camera_theta -= (x-x_last)*0.0005;
+    camera_phi += (y - y_last)*0.0005;
+    if (camera_phi <= 0.0005f) {
+      camera_phi = 0.0005f;
+    } else if (camera_phi >= PI-0.0005f) {
+      camera_phi = PI-0.0005f;
+    }
+  }
+
+}
+
+void mouseScrollCallback(GLFWwindow* window, double xoffset, double yoffset) {
+  camera_distance -= yoffset*0.1f;
 }
diff --git a/src/main.h b/src/main.h
@@ -21,6 +21,7 @@
 
 
 #include "rasterizeKernels.h"
+#include "sceneStructs.h"
 #include "utilities.h"
 
 using namespace std;
@@ -40,7 +41,13 @@ GLuint displayImage;
 uchar4 *dptr;
 
 GLFWwindow *window;
+bool mouse_pressed = false;
+double x_last = -1;
+double y_last = -1;
 
+//--------------------------------
+//-----------MODEL STUFF----------
+//--------------------------------
 obj* mesh;
 
 float* vbo;
@@ -49,6 +56,17 @@ float* cbo;
 int cbosize;
 int* ibo;
 int ibosize;
+float* nbo;
+int nbosize;
+
+//-------------------------------
+//----------CAMERA STUFF---------
+//-------------------------------
+glm::mat4 mvp;
+ray light;
+float camera_distance;
+float camera_phi;
+float camera_theta;
 
 //-------------------------------
 //----------CUDA STUFF-----------
@@ -99,5 +117,7 @@ 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 mouseButtonCallback(GLFWwindow* window, int button, int action);
+void mousePositionCallback(GLFWwindow* window, double x, double y);
+void mouseScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
 #endif