Project 4 Rasterizer Done

src/main.cpp

@@ -2,7 +2,6 @@
 // Written by Yining Karl Li, Copyright (c) 2012 University of Pennsylvania
 
 #include "main.h"
-
 //-------------------------------
 //-------------MAIN--------------
 //-------------------------------
@@ -18,17 +17,40 @@ int main(int argc, char** argv){
       //renderScene = new scene(data);
       mesh = new obj();
       objLoader* loader = new objLoader(data, mesh);
+
       mesh->buildVBOs();
       delete loader;
       loadedScene = true;
     }
   }
 
   if(!loadedScene){
-    cout << "Usage: mesh=[obj file]" << endl;
+    cout << "Usage: mesh=[obj file]\n !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
     return 0;
   }
 
+  Mmodel = glm::mat4(1.0);
+  Mprojection = glm::perspective(fovy, float(width) / float(height), depth_near, depth_far);
+  Mview = glm::lookAt( Veye, Vcenter, Vup);
+
+ //   BMP img;
+	//char* filename = "texture0.bmp";
+	//img.ReadFromFile(filename);
+	//texture_width = img.TellWidth();
+	//texture_height = img.TellHeight();
+	//textureBMP = new glm::vec3[texture_width * texture_height];
+	//for(int j = 0; j<texture_height; j++)
+	//  {
+	//	  for(int i = 0; i<texture_width; i++)
+	//	  {
+	//		  float r = img(i,j)->Red/255.0f;
+	//		  float g = img(i,j)->Green/255.0f;
+	//		  float b = img(i,j)->Blue/255.0f;
+	//		  textureBMP[i+j*texture_height] = glm::vec3(r,g,b);
+	//	//	  printf("r %f, g %f, b%f",r,g,b);
+	//	  }
+	//  }
+
   frame = 0;
   seconds = time (NULL);
   fpstracker = 0;
@@ -93,14 +115,25 @@ void runCuda(){
   ibo = mesh->getIBO();
   ibosize = mesh->getIBOsize();
 
+  nbo = mesh->getNBO();
+  nbosize = mesh->getNBOsize();
+
+  /////ra
+  Mmodel = glm::rotate(Mmodel, (float)1.0f, glm::vec3(0,1,0));
+
+
   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, Veye, Mmodel, Mview, Mprojection, depth_near, depth_far, mode);
   cudaGLUnmapBufferObject(pbo);
 
   vbo = NULL;
   cbo = NULL;
   ibo = NULL;
 
+  ///////ra
+  nbo = NULL;
+
+
   frame++;
   fpstracker++;
 
@@ -281,4 +314,13 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
     if(key == GLFW_KEY_ESCAPE && action == GLFW_PRESS){
         glfwSetWindowShouldClose(window, GL_TRUE);
     }
+	if(key == GLFW_KEY_1 && action == GLFW_PRESS){
+		mode = 0;
+    }
+	if(key == GLFW_KEY_2 && action == GLFW_PRESS){
+		mode = 1;
+    }
+	if(key == GLFW_KEY_3 && action == GLFW_PRESS){
+		mode = 2;
+    }
 }

src/main.h

@@ -18,11 +18,12 @@
 #include <stdlib.h>
 #include <string>
 #include <time.h>
-
+#include <glm/gtc/matrix_transform.hpp>
 
 #include "rasterizeKernels.h"
 #include "utilities.h"
 
+
 using namespace std;
 
 //-------------------------------
@@ -50,6 +51,29 @@ int cbosize;
 int* ibo;
 int ibosize;
 
+float* nbo;
+int nbosize;
+
+// camera
+float fovy = 60.0f;
+float depth_near = 0.1f;
+float depth_far = 100.0f;
+
+
+//glm::vec3 Veye(0, 0.5, 2.8f);
+glm::vec3 Veye(0, 0.8, 1.0f);
+//glm::vec3 Vcenter(0, 1.0f, 0);
+glm::vec3 Vcenter(0, 0.3f, 0);
+glm::vec3 Vup(0, 1.0f, 0);
+
+
+glm::mat4 Mmodel;
+glm::mat4 Mprojection;
+glm::mat4 Mview;
+
+int mode = 2;
+
+
 //-------------------------------
 //----------CUDA STUFF-----------
 //-------------------------------
@@ -85,6 +109,8 @@ void initTextures();
 void initVAO();
 GLuint initShader();
 
+
+
 //-------------------------------
 //---------CLEANUP STUFF---------
 //-------------------------------