Pull request for Rasterizer project.

src/ObjCore/obj.cpp

@@ -56,23 +56,23 @@ 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(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);
+				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);
 
 				if(genNormals==false){
 					vector<int> facenormal = facenormals[k];
-					NBOvec.push_back(normals[facenormal[0]][0]); NBOvec.push_back(normals[facenormal[0]][1]); NBOvec.push_back(normals[facenormal[0]][2]); //NBOvec.push_back(0.0f);
-					NBOvec.push_back(normals[facenormal[i-1]][0]); NBOvec.push_back(normals[facenormal[i-1]][1]); NBOvec.push_back(normals[facenormal[i-1]][2]); //NBOvec.push_back(0.0f);
-					NBOvec.push_back(normals[facenormal[i]][0]); NBOvec.push_back(normals[facenormal[i]][1]); NBOvec.push_back(normals[facenormal[i]][2]); //NBOvec.push_back(0.0f);
+					NBOvec.push_back(normals[facenormal[0]][0]); NBOvec.push_back(normals[facenormal[0]][1]); NBOvec.push_back(normals[facenormal[0]][2]); NBOvec.push_back(0.0f);
+					NBOvec.push_back(normals[facenormal[i-1]][0]); NBOvec.push_back(normals[facenormal[i-1]][1]); NBOvec.push_back(normals[facenormal[i-1]][2]); NBOvec.push_back(0.0f);
+					NBOvec.push_back(normals[facenormal[i]][0]); NBOvec.push_back(normals[facenormal[i]][1]); NBOvec.push_back(normals[facenormal[i]][2]); NBOvec.push_back(0.0f);
 				}else{
 
 					glm::vec3 a = glm::vec3(p1[0], p1[1], p1[2]) - glm::vec3(p0[0], p0[1], p0[2]);
 					glm::vec3 b = glm::vec3(p2[0], p2[1], p2[2]) - glm::vec3(p0[0], p0[1], p0[2]);
 					glm::vec3 n = glm::normalize(glm::cross(a,b));
-					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); //NBOvec.push_back(0.0f);
-					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); //NBOvec.push_back(0.0f);
-					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); //NBOvec.push_back(0.0f);
+					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); NBOvec.push_back(0.0f);
+					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); NBOvec.push_back(0.0f);
+					NBOvec.push_back(n[0]); NBOvec.push_back(n[1]); NBOvec.push_back(n[2]); NBOvec.push_back(0.0f);
 				}
 
 				IBOvec.push_back(index+0); IBOvec.push_back(index+1); IBOvec.push_back(index+2);
@@ -88,14 +88,30 @@ void obj::buildVBOs(){
 	vbosize = (int)VBOvec.size();
 	nbosize = (int)NBOvec.size();
 	ibosize = (int)IBOvec.size();
-	for(int i=0; i<VBOvec.size(); i++){
-		vbo[i] = VBOvec[i];
+
+	int vertStep = vbosize / 4;
+	int normStep = nbosize / 4;
+	int indxStep = ibosize / 3;
+
+	// Reorder vbo so that it is more amenable to coalesced global memory accesses.
+	for(int i=0; i<vertStep; i++){
+		vbo[i] = VBOvec[i*4];
+		vbo[i+vertStep] = VBOvec[(i*4)+1];
+		vbo[i+(2*vertStep)] = VBOvec[(i*4)+2];
+		vbo[i+(3*vertStep)] = VBOvec[(i*4)+3];
 	}
-	for(int i=0; i<NBOvec.size(); i++){
-		nbo[i] = NBOvec[i];
+	// Reorder nbo so that it is more amenable to coalesced global memory accesses.
+	for(int i=0; i<normStep; i++){
+		nbo[i] = NBOvec[i*4];
+		nbo[i+normStep] = NBOvec[(i*4)+1];
+		nbo[i+(2*normStep)] = NBOvec[(i*4)+2];
+		nbo[i+(3*normStep)] = NBOvec[(i*4)+3];
 	}
-	for(int i=0; i<IBOvec.size(); i++){
-		ibo[i] = IBOvec[i];
+	// Reorder ibo so that it is more amenable to coalesced global memory accesses.
+	for(int i=0; i<indxStep; i++){
+		ibo[i] = IBOvec[i*3];
+		ibo[i+indxStep] = IBOvec[(i*3)+1];
+		ibo[i+(2*indxStep)] = IBOvec[(i*3)+2];
 	}
 	setColor(glm::vec3(.4,.4,.4));
 }

src/main.cpp

@@ -2,7 +2,21 @@
 // Written by Yining Karl Li, Copyright (c) 2012 University of Pennsylvania
 
 #include "main.h"
+#include "glm/gtc/matrix_transform.hpp"
 
+bool first = true;
+int oldX = 0, oldY = 0, dx = 0, dy = 0;	
+bool leftMButtonDown = false;
+
+float camRadius = 5.0f;
+float scrollSpeed = 0.25f;
+bool outline = false, camControl = false;
+
+cbuffer constantBuffer;
+glm::mat4	cameraTransform;
+glm::vec3	currentLookAt =  glm::vec3 (0,0,1);
+float u = 0.5;
+float v = 0;
 //-------------------------------
 //-------------MAIN--------------
 //-------------------------------
@@ -21,18 +35,42 @@ int main(int argc, char** argv){
       mesh->buildVBOs();
       delete loader;
       loadedScene = true;
+    }
+	else if (strcmp(header.c_str(), "radius")==0)
+	{
+      camRadius = strtod (data.c_str(), NULL);
+    }
+	else if (strcmp(header.c_str(), "scrollspeed")==0)
+	{
+      scrollSpeed = strtod (data.c_str(), NULL);
+    }
+	else if (strcmp(header.c_str(), "outline")==0)
+	{
+		if (strcmp(data.c_str(), "true")==0)
+			outline = true;
+    }
+	else if (strcmp(header.c_str(), "cameraControl")==0)
+	{
+		if (strcmp(data.c_str(), "true")==0)
+			camControl = true;
     }
   }
 
   if(!loadedScene){
     cout << "Usage: mesh=[obj file]" << endl;
+	std::cin.get ();
     return 0;
   }
 
   frame = 0;
   seconds = time (NULL);
   fpstracker = 0;
 
+  constantBuffer.model = glm::rotate (glm::mat4 (1.0f), 180.0f, glm::vec3 (1,0,0));
+  constantBuffer.projection = glm::perspective (60.0f, (float)(width/height), 0.1f, 100.0f);
+  constantBuffer.modelIT = glm::transpose(glm::inverse (constantBuffer.model));
+  constantBuffer.lightPos = glm::vec4 (0, 10, -10, 1);
+
   // Launch CUDA/GL
   #ifdef __APPLE__
   // Needed in OSX to force use of OpenGL3.2 
@@ -71,6 +109,8 @@ int main(int argc, char** argv){
   #else
     glutDisplayFunc(display);
     glutKeyboardFunc(keyboard);
+	glutMouseFunc (onButtonPress);
+	glutMotionFunc (onMouseMove);
 
     glutMainLoop();
   #endif
@@ -82,25 +122,60 @@ int main(int argc, char** argv){
 //---------RUNTIME STUFF---------
 //-------------------------------
 
-void runCuda(){
+void runCuda(bool &isFirstTime){
   // Map OpenGL buffer object for writing from CUDA on a single GPU
   // No data is moved (Win & Linux). When mapped to CUDA, OpenGL should not use this buffer
   dptr=NULL;
 
   vbo = mesh->getVBO();
   vbosize = mesh->getVBOsize();
 
-  float newcbo[] = {0.0, 1.0, 0.0, 
-                    0.0, 0.0, 1.0, 
-                    1.0, 0.0, 0.0};
+  float newcbo[] = {0.35, 0.35, 0.35, 
+                    0.4, 0.4, 0.4, 
+                    0.3, 0.3, 0.3};
   cbo = newcbo;
   cbosize = 9;
 
   ibo = mesh->getIBO();
   ibosize = mesh->getIBOsize();
 
+  nbo = mesh->getNBO ();
+  nbosize = mesh->getNBOsize ();
+
+  // Change u and v with respect to change in Y and X respectively.
+  u = u + (float)dy / (float)(height/scrollSpeed);
+  v = v - (float)dx / (float)(width/scrollSpeed);
+
+  // Make sure u and v stay within [0,1]
+  if (u < 0)
+	  u = - u;
+  else if (u > 1)
+	  u = 1 - (u - 1);
+
+  if (v < 0)
+	  v = 1 + v;
+  else if (v > 1)
+	  v = v - 1;
+
+  glm::vec4 camOrigin = glm::vec4 (camRadius*sin (PI*u)*sin (2.0f*PI*v), 
+								   camRadius*cos (PI*u), 
+								   -camRadius*sin (PI*u)*cos (2.0f*PI*v), 1.0);
+
+  glm::vec4 center = glm::vec4 (0,0,0,0);
+  glm::vec4 up = glm::vec4 (0,1,0,0);
+
+  if (camControl)
+	  constantBuffer.view = glm::lookAt (glm::vec3 (camOrigin.x, camOrigin.y, camOrigin.z), 
+									 glm::vec3 (center.x, center.y, center.z), 
+									 glm::vec3 (up.x, up.y, up.z));	
+  else
+	  constantBuffer.view = glm::lookAt (glm::vec3 (0.0f, 0.0f, -1.0f),
+		  								glm::vec3 (0.0f,0.0f,1.0f), 
+										glm::vec3 (0.0f,1.0f,0.0f));
+
   cudaGLMapBufferObject((void**)&dptr, pbo);
-  cudaRasterizeCore(dptr, glm::vec2(width, height), frame, vbo, vbosize, cbo, cbosize, ibo, ibosize);
+  cudaRasterizeCore(dptr, glm::vec2(width, height), frame, vbo, vbosize, cbo, cbosize, ibo, ibosize, 
+					nbo, nbosize, isFirstTime, constantBuffer);
   cudaGLUnmapBufferObject(pbo);
 
   vbo = NULL;
@@ -148,7 +223,7 @@ void runCuda(){
 #else
 
   void display(){
-    runCuda();
+    runCuda(first);
 	time_t seconds2 = time (NULL);
 
     if(seconds2-seconds >= 1){
@@ -183,9 +258,41 @@ void runCuda(){
        case(27):
          shut_down(1);    
          break;
+	   case 'o':
+	   case 'O':
+		   outline = !outline;
+		   break;
     }
   }
 
+  void onButtonPress (int button, int state, int x, int y)
+  {
+	  if ((button == GLUT_LEFT_BUTTON) && (state == GLUT_DOWN))
+	  {
+		  oldX = x;	oldY = y;
+		  leftMButtonDown = true;
+	  }
+	  else
+	  {
+		  leftMButtonDown = false;
+		  dx = 0;
+		  dy = 0;
+	  }
+  }
+
+  void onMouseMove (int x, int y)
+  {
+	  if (leftMButtonDown)
+	  {
+		  dx = -(x - oldX);
+		  dy = -(y - oldY);
+	  }
+	  else
+	  {
+		  dx = 0;
+		  dy = 0;
+	  }
+  }
 #endif
 
 //-------------------------------
@@ -256,7 +363,7 @@ void initCuda(){
   // Clean up on program exit
   atexit(cleanupCuda);
 
-  runCuda();
+  runCuda(first);
 }
 
 void initTextures(){

src/main.h

@@ -59,6 +59,8 @@ float* cbo;
 int cbosize;
 int* ibo;
 int ibosize;
+float *nbo;
+int nbosize;
 
 //-------------------------------
 //----------CUDA STUFF-----------
@@ -76,13 +78,15 @@ int main(int argc, char** argv);
 //---------RUNTIME STUFF---------
 //-------------------------------
 
-void runCuda();
+void runCuda(bool &isFirstTime);
 
 #ifdef __APPLE__
 	void display();
 #else
 	void display();
 	void keyboard(unsigned char key, int x, int y);
+	void onButtonPress (int button, int state, int x, int y);
+	void onMouseMove (int x, int y);
 #endif
 
 //-------------------------------