CIS565-Fall-2014 · drerucha · Oct 1, 2014 · Oct 3, 2014 · Oct 3, 2014 · Oct 3, 2014
diff --git a/README.md b/README.md
diff --git a/data/readme_pics/aa_with.jpg b/data/readme_pics/aa_with.jpg
diff --git a/data/readme_pics/aa_without.jpg b/data/readme_pics/aa_without.jpg
diff --git a/data/readme_pics/chart_block_size_comparison.jpg b/data/readme_pics/chart_block_size_comparison.jpg
diff --git a/data/readme_pics/chart_stream_compaction_performance.jpg b/data/readme_pics/chart_stream_compaction_performance.jpg
diff --git a/data/readme_pics/fresnel_refractions.jpg b/data/readme_pics/fresnel_refractions.jpg
diff --git a/data/readme_pics/fun_01.jpg b/data/readme_pics/fun_01.jpg
diff --git a/data/readme_pics/fun_02.jpg b/data/readme_pics/fun_02.jpg
diff --git a/data/readme_pics/texture_mapping.jpg b/data/readme_pics/texture_mapping.jpg
diff --git a/data/readme_pics/texture_mapping_02.jpg b/data/readme_pics/texture_mapping_02.jpg
diff --git a/data/scenes/sampleScene_02.txt b/data/scenes/sampleScene_02.txt
@@ -0,0 +1,225 @@
+MATERIAL 0				//white diffuse
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 1 				//red diffuse
+RGB         .63 .06 .04       
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 2 				//green diffuse
+RGB         .15 .48 .09      
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 3 				//red glossy
+RGB         .63 .06 .04      
+SPECEX      0      
+SPECRGB     1 1 1       
+REFL        0       
+REFR        0        
+REFRIOR     2       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 4 				//white glossy
+RGB         1 1 1     
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     2      
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 5 				//glass
+RGB         0 0 0    
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        1        
+REFRIOR     2.2       
+SCATTER     0        
+ABSCOEFF    .02 5.1 5.7      
+RSCTCOEFF   13
+EMITTANCE   0
+
+MATERIAL 6 				//green glossy
+RGB         .15 .48 .09      
+SPECEX      0      
+SPECRGB     1 1 1     
+REFL        0       
+REFR        0        
+REFRIOR     2.6       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 7				//light
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   1
+
+MATERIAL 8				//light
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   15
+
+TEXTURE 0
+FILE world_map_256x128.bmp
+
+TEXTURE 1
+FILE stripes_256x128.bmp
+
+TEXTURE 2
+FILE black_and_white_tiles_256x256.bmp
+
+CAMERA
+RES         800 800
+FOVY        25
+ITERATIONS  5000
+FILE        test.bmp
+frame 0
+EYE         0 4.5 12
+VIEW        0 0 -1
+UP          0 1 0
+
+OBJECT 0
+cube
+material 0
+texture 2
+frame 0
+TRANS       0 0 0
+ROTAT       0 0 90
+SCALE       .01 10 10
+
+OBJECT 1
+cube
+material 0
+texture 1
+frame 0
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 10
+
+OBJECT 2
+cube
+material 0
+texture -1
+frame 0
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 10 10
+
+OBJECT 3
+cube
+material 1
+texture -1
+frame 0
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+OBJECT 4
+cube
+material 2
+texture -1
+frame 0
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+OBJECT 5
+sphere
+material 5
+texture -1
+frame 0
+TRANS       0 2 0
+ROTAT       0 90 0
+SCALE       3 3 3
+
+OBJECT 6
+sphere
+material 3
+texture -1
+frame 0
+TRANS       2 5 2
+ROTAT       0 0 0
+SCALE       2.5 2.5 2.5
+
+OBJECT 7
+sphere
+material 3
+texture 0
+frame 0
+TRANS       -2 5 -2
+ROTAT       0 180 0
+SCALE       3 3 3
+
+OBJECT 8
+cube
+material 8
+texture -1
+frame 0
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .3 3 3
+
+//OBJECT 9
+//sphere
+//material 8
+//texture -1
+//frame 0
+//TRANS       2 2 16
+//ROTAT       0 180 0
+//SCALE       1 1 1
+
+//OBJECT 10
+//cube
+//material 0
+//texture -1
+//frame 0
+//TRANS       0 5 5
+//ROTAT       0 90 0
+//SCALE       .01 10 10
diff --git a/data/textures/black_and_white_tiles.jpg b/data/textures/black_and_white_tiles.jpg
diff --git a/data/textures/black_and_white_tiles_256x256.bmp b/data/textures/black_and_white_tiles_256x256.bmp
diff --git a/data/textures/stripes.jpg b/data/textures/stripes.jpg
diff --git a/data/textures/stripes_256x128.bmp b/data/textures/stripes_256x128.bmp
diff --git a/data/textures/world_map_1024x512.bmp b/data/textures/world_map_1024x512.bmp
diff --git a/data/textures/world_map_128x64.bmp b/data/textures/world_map_128x64.bmp
diff --git a/data/textures/world_map_256x128.bmp b/data/textures/world_map_256x128.bmp
diff --git a/renders/bmp/2014-10-02_01_starting_point.bmp b/renders/bmp/2014-10-02_01_starting_point.bmp
diff --git a/renders/bmp/2014-10-03_01_ray_direction_test.bmp b/renders/bmp/2014-10-03_01_ray_direction_test.bmp
diff --git a/renders/bmp/2014-10-03_02_sphere_intersection_test_01.bmp b/renders/bmp/2014-10-03_02_sphere_intersection_test_01.bmp
diff --git a/renders/bmp/2014-10-03_03_sphere_intersection_test_02.bmp b/renders/bmp/2014-10-03_03_sphere_intersection_test_02.bmp
diff --git a/renders/bmp/2014-10-03_04_add_material_references.bmp b/renders/bmp/2014-10-03_04_add_material_references.bmp
diff --git a/renders/bmp/2014-10-03_05_box_intersections.bmp b/renders/bmp/2014-10-03_05_box_intersections.bmp
diff --git a/renders/bmp/2014-10-03_06_incorrect_intersection_normals.bmp b/renders/bmp/2014-10-03_06_incorrect_intersection_normals.bmp
diff --git a/renders/bmp/2014-10-03_07_fixed_intersection_normals.bmp b/renders/bmp/2014-10-03_07_fixed_intersection_normals.bmp
diff --git a/renders/bmp/2014-10-05_01_first_image.bmp b/renders/bmp/2014-10-05_01_first_image.bmp
diff --git a/renders/bmp/2014-10-05_02_second_image.bmp b/renders/bmp/2014-10-05_02_second_image.bmp
diff --git a/renders/bmp/2014-10-05_03_perfect_specular.bmp b/renders/bmp/2014-10-05_03_perfect_specular.bmp
diff --git a/renders/bmp/2014-10-09_01_first_refraction_attempt.bmp b/renders/bmp/2014-10-09_01_first_refraction_attempt.bmp
diff --git a/renders/bmp/2014-10-09_02_second_refraction_attempt.bmp b/renders/bmp/2014-10-09_02_second_refraction_attempt.bmp
diff --git a/renders/bmp/2014-10-09_03_diffuse_with_aa.bmp b/renders/bmp/2014-10-09_03_diffuse_with_aa.bmp
diff --git a/renders/bmp/2014-10-09_04_glass_with_aa.bmp b/renders/bmp/2014-10-09_04_glass_with_aa.bmp
diff --git a/renders/bmp/2014-10-11_01_texture_mapping_01.bmp b/renders/bmp/2014-10-11_01_texture_mapping_01.bmp
diff --git a/renders/bmp/2014-10-11_02_texture_mapping_02.bmp b/renders/bmp/2014-10-11_02_texture_mapping_02.bmp
diff --git a/renders/bmp/2014-10-11_03_texture_mapping_03.bmp b/renders/bmp/2014-10-11_03_texture_mapping_03.bmp
diff --git a/renders/bmp/2014-10-12_01_texture_mapping.bmp b/renders/bmp/2014-10-12_01_texture_mapping.bmp
diff --git a/renders/bmp/2014-10-12_02_cube_map_test.bmp b/renders/bmp/2014-10-12_02_cube_map_test.bmp
diff --git a/renders/bmp/5000_iterations_bounded_random_number_generation.bmp b/renders/bmp/5000_iterations_bounded_random_number_generation.bmp
diff --git a/renders/bmp/5000_iterations_bounded_random_number_generation_02.bmp b/renders/bmp/5000_iterations_bounded_random_number_generation_02.bmp
diff --git a/renders/bmp/5000_iterations_unbounded_random_number_generation.bmp b/renders/bmp/5000_iterations_unbounded_random_number_generation.bmp
diff --git a/renders/bmp/random_numbers_mod_10.bmp b/renders/bmp/random_numbers_mod_10.bmp
diff --git a/renders/bmp/random_numbers_mod_100.bmp b/renders/bmp/random_numbers_mod_100.bmp
diff --git a/renders/bmp/random_numbers_mod_1000.bmp b/renders/bmp/random_numbers_mod_1000.bmp
diff --git a/renders/bmp/random_numbers_mod_10000.bmp b/renders/bmp/random_numbers_mod_10000.bmp
diff --git a/renders/bmp/random_numbers_mod_100000.bmp b/renders/bmp/random_numbers_mod_100000.bmp
diff --git a/renders/bmp/random_numbers_mod_1000000.bmp b/renders/bmp/random_numbers_mod_1000000.bmp
diff --git a/renders/jpg/2014-10-02_01_starting_point.jpg b/renders/jpg/2014-10-02_01_starting_point.jpg
diff --git a/renders/jpg/2014-10-03_01_ray_direction_test.jpg b/renders/jpg/2014-10-03_01_ray_direction_test.jpg
diff --git a/renders/jpg/2014-10-03_02_sphere_intersection_test_01.jpg b/renders/jpg/2014-10-03_02_sphere_intersection_test_01.jpg
diff --git a/renders/jpg/2014-10-03_03_sphere_intersection_test_02.jpg b/renders/jpg/2014-10-03_03_sphere_intersection_test_02.jpg
diff --git a/renders/jpg/2014-10-03_04_add_material_references.jpg b/renders/jpg/2014-10-03_04_add_material_references.jpg
diff --git a/renders/jpg/2014-10-03_05_box_intersections.jpg b/renders/jpg/2014-10-03_05_box_intersections.jpg
diff --git a/renders/jpg/2014-10-03_06_incorrect_intersection_normals.jpg b/renders/jpg/2014-10-03_06_incorrect_intersection_normals.jpg
diff --git a/renders/jpg/2014-10-03_07_fixed_intersection_normals.jpg b/renders/jpg/2014-10-03_07_fixed_intersection_normals.jpg
diff --git a/renders/jpg/2014-10-05_01_first_image.jpg b/renders/jpg/2014-10-05_01_first_image.jpg
diff --git a/renders/jpg/2014-10-05_02_second_image.jpg b/renders/jpg/2014-10-05_02_second_image.jpg
diff --git a/renders/jpg/2014-10-05_03_perfect_specular.jpg b/renders/jpg/2014-10-05_03_perfect_specular.jpg
diff --git a/renders/jpg/2014-10-09_01_first_refraction_attempt.jpg b/renders/jpg/2014-10-09_01_first_refraction_attempt.jpg
diff --git a/renders/jpg/2014-10-11_01_texture_mapping_01.jpg b/renders/jpg/2014-10-11_01_texture_mapping_01.jpg
diff --git a/renders/jpg/2014-10-12_01_texture_mapping.jpg b/renders/jpg/2014-10-12_01_texture_mapping.jpg
diff --git a/renders/jpg/2014-10-12_02_cube_map_test.jpg b/renders/jpg/2014-10-12_02_cube_map_test.jpg
diff --git a/src/SimpleTimer.cpp b/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;
+}
diff --git a/src/SimpleTimer.h b/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
diff --git a/src/image.cpp b/src/image.cpp
@@ -12,10 +12,12 @@
 image::image(int x, int y){
     xSize = x;
     ySize = y;
+
     redChannel   = new float[x*y];
     greenChannel = new float[x*y];
     blueChannel  = new float[x*y];
     alphaChannel = new float[x*y];
+
     for(int i=0; i<(x*y); i++){
         redChannel[i]   = 0;
         greenChannel[i] = 0;

diff --git a/src/image.h b/src/image.h
@@ -7,6 +7,7 @@
 #define Raytracer_image_h
 
 #include "glm/glm.hpp"
+//#include <cuda.h>
 
 using namespace std;
 
@@ -26,13 +27,12 @@ class image{
     int ySize;
     gammaSettings gamma;
 public:
-    image(int x, int y);
+    image(int x=0, int y=0);
     ~image();
 
     //------------------------
     //-------GETTERS----------
     //------------------------
-    glm::vec3 readPixelRGB(int x, int y);
     glm::vec4 readPixelRGBA(int x, int y);
     float readPixelR(int x, int y);
     float readPixelG(int x, int y);
@@ -44,8 +44,11 @@ class image{
     float* getAlphaChannel();
     glm::vec3* getRGBChannels();
     glm::vec4* getRGBAChannels();
-    glm::vec2 getDimensions();
     gammaSettings getGammaSettings();
+
+	glm::vec3 readPixelRGB(int x, int y);
+	glm::vec2 getDimensions();
+
 
     //------------------------
     //-------SETTERS----------