Completed project 4.

objs/tri.obj

@@ -1,7 +1,10 @@
+# Geometric vertices.
 v 0 0 0
 v 0.1 0 0
 v 0 0.1 0
 
+# Vertex normals.
 vn 0 0 1
 
+# Face with vertex normals.
 f 1//1 2//1 3//1

src/SimpleTimer.cpp

@@ -0,0 +1,44 @@
+#include "SimpleTimer.h"
+
+
+SimpleTimer::SimpleTimer()
+{
+}
+
+
+SimpleTimer::~SimpleTimer()
+{
+}
+
+
+void SimpleTimer::start()
+{
+	start_time = GetTimeMs64();
+}
+
+
+float SimpleTimer::stop()
+{
+	__int64 end_time = GetTimeMs64();
+	return ( float )( end_time - start_time );
+}
+
+
+__int64 SimpleTimer::GetTimeMs64()
+{
+	/* Windows */
+	FILETIME ft;
+	LARGE_INTEGER li;
+
+	/* Get the amount of 100 nano seconds intervals elapsed since January 1, 1601 (UTC) and copy it
+	* to a LARGE_INTEGER structure. */
+	GetSystemTimeAsFileTime(&ft);
+	li.LowPart = ft.dwLowDateTime;
+	li.HighPart = ft.dwHighDateTime;
+
+	__int64 ret = li.QuadPart;
+	ret -= 116444736000000000LL; /* Convert from file time to UNIX epoch time. */
+	ret /= 10000; /* From 100 nano seconds (10^-7) to 1 millisecond (10^-3) intervals */
+
+	return ret;
+}

src/SimpleTimer.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#ifndef _SIMPLE_TIMER
+#define _SIMPLE_TIMER
+
+#include <Windows.h>
+
+class SimpleTimer
+{
+public:
+	SimpleTimer( void );
+	~SimpleTimer( void );
+
+	void start( void );
+	float stop( void );
+
+private:
+	__int64 GetTimeMs64( void );
+
+	__int64 start_time;
+};
+
+#endif

src/main.cpp

@@ -7,39 +7,48 @@
 //-------------MAIN--------------
 //-------------------------------
 
-int main(int argc, char** argv){
-
-  bool loadedScene = false;
-  for(int i=1; i<argc; i++){
-    string header; string data;
-    istringstream liness(argv[i]);
-    getline(liness, header, '='); getline(liness, data, '=');
-    if(strcmp(header.c_str(), "mesh")==0){
-      //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;
-    return 0;
-  }
-
-  frame = 0;
-  seconds = time (NULL);
-  fpstracker = 0;
-
-  // Launch CUDA/GL
-  if (init(argc, argv)) {
-    // GLFW main loop
-    mainLoop();
-  }
-
-  return 0;
+int main( int argc, char **argv )
+{
+	bool loadedScene = false;
+	for(int i=1; i<argc; i++){
+	string header; string data;
+	istringstream liness(argv[i]);
+	getline(liness, header, '='); getline(liness, data, '=');
+	if(strcmp(header.c_str(), "mesh")==0){
+		//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;
+	return 0;
+	}
+
+	frame = 0;
+	seconds = time (NULL);
+	fpstracker = 0;
+
+	// Hardcoded camera definition.
+	camera.position = glm::vec3( 0.0f, 0.0f, 4.0f );
+	camera.target = glm::vec3( 0.0f, 0.0f, 0.0f );
+	camera.up = glm::vec3( 0.0f, -1.0f, 0.0f );
+	camera.fov_y = 25.0f;
+	camera.resolution = glm::vec2( width, height );
+	camera.near_clip = 0.01f;
+	camera.far_clip = 1000.0f;
+
+	// Launch CUDA/GL
+	if (init(argc, argv)) {
+		// GLFW main loop
+		mainLoop();
+	}
+
+	return 0;
 }
 
 void mainLoop() {
@@ -87,14 +96,24 @@ void runCuda(){
   float newcbo[] = {0.0, 1.0, 0.0, 
                     0.0, 0.0, 1.0, 
                     1.0, 0.0, 0.0};
+
   cbo = newcbo;
   cbosize = 9;
 
   ibo = mesh->getIBO();
   ibosize = mesh->getIBOsize();
 
+  nbo = mesh->getNBO();
+  nbosize = mesh->getNBOsize();
+
   cudaGLMapBufferObject((void**)&dptr, pbo);
-  cudaRasterizeCore(dptr, glm::vec2(width, height), frame, vbo, vbosize, cbo, cbosize, ibo, ibosize);
+  cudaRasterizeCore( dptr,
+					 frame,
+					 vbo, vbosize,
+					 cbo, cbosize,
+					 ibo, ibosize,
+					 nbo, nbosize,
+					 camera );
   cudaGLUnmapBufferObject(pbo);
 
   vbo = NULL;

src/main.h

@@ -19,15 +19,22 @@
 #include <string>
 #include <time.h>
 
-
 #include "rasterizeKernels.h"
 #include "utilities.h"
+#include "sceneStructs.h"
 
 using namespace std;
 
+//-------------------------------
+//----------CAMERA STUFF---------
+//-------------------------------
+
+simpleCamera camera;
+
 //-------------------------------
 //------------GL STUFF-----------
 //-------------------------------
+
 int frame;
 int fpstracker;
 double seconds;
@@ -43,13 +50,16 @@ GLFWwindow *window;
 
 obj* mesh;
 
-float* vbo;
+float *vbo;
 int vbosize;
-float* cbo;
+float *cbo;
 int cbosize;
-int* ibo;
+int *ibo;
 int ibosize;
 
+float *nbo;
+int nbosize;
+
 //-------------------------------
 //----------CUDA STUFF-----------
 //-------------------------------