Raytracer Assignment

.directory

@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2013,10,11,0,43,45
+Version=3

.gitignore

@@ -0,0 +1,5 @@
+PROJ1_NIX/565raytracer
+*.o
+cscope.out
+*.swp
+tags

PERFORMANCE_COMPARISON.txt

@@ -0,0 +1,15 @@
+For my performance comparison experiment, I tweaked the tile size. Here are my results:
+
+Tile Size 1: 0.6 fps
+Tile Size 2: 0.6 fps
+Tile Size 3: 8.55 fps
+Tile Size 8: 19.96 fps
+Tile Size 16: 19.96 fps
+
+See the graph on performance_experiment.png.
+
+It makes sense that performance rises as we increase the tile size and assign more threads
+to each block. However, as the tile size gets larger, we see the performance plateau, probably
+because the GPU isn't capable of running that many threads at the same time (we run out
+of registers). A tile size of 32 or above doesn't work at all!
+

PROJ1_MAC/makefile

@@ -23,4 +23,4 @@ clean:
 	rm bin/565raytracer
 	rm *.o
 
-.PHONY : bin/565raytracer
+.PHONY : bin/565raytracer

PROJ1_NIX/makefile

@@ -1,15 +1,18 @@
 #All cuda paths are for v5.0+
 
-NVCC     = nvcc -m64
-CC       = gcc -m64
+NVCC     = nvcc -m64 -arch sm_21
+CC       = gcc -m64 
 CPPC     = g++ -m64
 
 CUDA_FLAGS = -I/usr/local/cuda/samples/common/inc -I/usr/local/cuda/include
 
-LFLAGS = -lglut -lGL -lGLEW 
+LFLAGS = -lglut -lGL -lGLEW
 
 all: 565raytracer
 
+#raytraceHelpers.o: ../src/raytraceHelpers.cu
+	#$(NVCC) $(CUDA_FLAGS) -c ../src/raytraceHelpers.cu
+
 raytraceKernel.o: ../src/raytraceKernel.cu
 	$(NVCC) $(CUDA_FLAGS) -c ../src/raytraceKernel.cu
 
@@ -34,7 +37,7 @@ stb_image_write.o: ../src/stb_image/stb_image_write.c
 main.o: ../src/main.cpp
 	$(CPPC) $(CUDA_FLAGS) ../src/main.cpp -c
 
-565raytracer: main.o raytraceKernel.o glslUtility.o utilities.o image.o scene.o stb_image_write.o stb_image.o
+565raytracer: main.o raytraceKernel.o glslUtility.o utilities.o image.o scene.o stb_image_write.o stb_image.o 
 	$(NVCC) $(LFLAGS) main.o raytraceKernel.o glslUtility.o utilities.o image.o scene.o stb_image_write.o stb_image.o -o 565raytracer
 
 clean:

PROJ1_NIX/sampleScene.txt

@@ -0,0 +1,221 @@
+MATERIAL 0 //white diffuse
+RGB 0.9 0.9 0.9
+SPECEX 1
+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 1
+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 1
+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 100
+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 0.9 0.9 0.9
+SPECEX 100
+SPECRGB 1 1 1
+REFL 0
+REFR 0
+REFRIOR 2
+SCATTER 0
+ABSCOEFF 0 0 0
+RSCTCOEFF 0
+EMITTANCE 0
+
+MATERIAL 5 //moving
+RGB 0.15 0.09 0.48
+SPECEX 1
+SPECRGB 1 1 1
+REFL 0
+REFR 1
+REFRIOR 2.2
+SCATTER 0
+ABSCOEFF 2 2 2
+RSCTCOEFF 13
+EMITTANCE 0
+
+MATERIAL 6 //green glossy
+RGB .15 .48 .09
+SPECEX 100
+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 1
+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 1
+SPECRGB 0 0 0
+REFL 0
+REFR 0
+REFRIOR 0
+SCATTER 0
+ABSCOEFF 0 0 0
+RSCTCOEFF 0
+EMITTANCE 2
+
+MATERIAL 9 				//mirror
+RGB         .43 .43 .47      
+SPECEX      100
+SPECRGB     1 1 1       
+REFL        1       
+REFR        0        
+REFRIOR     2       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 10 //moving
+RGB 0.15 0.09 0.48
+SPECEX 1
+SPECRGB 1 1 1
+REFL 0
+REFR 1
+REFRIOR 2.2
+SCATTER 0
+ABSCOEFF 2 2 2
+RSCTCOEFF 13
+EMITTANCE 0
+
+CAMERA
+RES 800 800
+FOVY 45
+ITERATIONS 5000
+FILE test.bmp
+frame 0
+EYE 0 4.5 4.9
+VIEW 0 0 -1
+UP 0 1 0
+
+OBJECT 0
+cube
+material 0
+frame 0
+TRANS 0 0 0
+ROTAT 0 0 90
+SCALE .01 10 10
+
+OBJECT 1
+cube
+material 0
+frame 0
+TRANS 0 5 -5
+ROTAT 0 90 0
+SCALE .01 10 10
+
+OBJECT 2
+cube
+material 0
+frame 0
+TRANS 0 10 0
+ROTAT 0 0 90
+SCALE .01 10 10
+
+OBJECT 3
+cube
+material 1
+frame 0
+TRANS -5 5 0
+ROTAT 0 0 0
+SCALE .01 10 10
+
+OBJECT 4
+cube
+material 2
+frame 0
+TRANS 5 5 0
+ROTAT 0 0 0
+SCALE .01 10 10
+
+OBJECT 5
+sphere
+material 9
+frame 0
+TRANS 0 2 0
+ROTAT 0 180 0
+SCALE 3 3 3
+
+OBJECT 6
+sphere
+material 0
+frame 0
+TRANS 2 5 2
+ROTAT 0 180 0
+SCALE 2.5 2.5 2.5
+
+OBJECT 7
+sphere
+material 0
+frame 0
+TRANS 0 5 -2
+ROTAT 0 180 0
+SCALE 3 3 3
+
+OBJECT 8
+cube
+material 8
+frame 0
+TRANS 0 10 0
+ROTAT 0 0 90
+SCALE .3 10 10
+
+OBJECT 9
+cube
+material 0
+frame 0
+TRANS 0 5 5
+ROTAT 0 -90 0
+SCALE .01 10 10

scenes/sampleScene.txt → PROJ1_NIX/sphereScene.txt

@@ -1,3 +1,5 @@
+scene
+
 MATERIAL 0				//white diffuse
 RGB         1 1 1       
 SPECEX      0      
@@ -117,74 +119,25 @@ VIEW        0 0 -1
 UP          0 1 0
 
 OBJECT 0
-cube
-material 0
-frame 0
-TRANS       0 0 0
-ROTAT       0 0 90
-SCALE       .01 10 10 
-
-OBJECT 1
-cube
-material 0
-frame 0
-TRANS       0 5 -5
-ROTAT       0 90 0
-SCALE       .01 10 10 
-
-OBJECT 2
-cube
-material 0
-frame 0
-TRANS       0 10 0
-ROTAT       0 0 90
-SCALE       .01 10 10
-
-OBJECT 3
-cube
-material 1
-frame 0
-TRANS       -5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
-
-OBJECT 4
-cube
-material 2
-frame 0
-TRANS       5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
-
-OBJECT 5
 sphere
 material 4
 frame 0
 TRANS       0 2 0
 ROTAT       0 180 0
 SCALE       3 3 3
 
-OBJECT 6
+OBJECT 1
 sphere
 material 3
 frame 0
 TRANS       2 5 2
 ROTAT       0 180 0
 SCALE       2.5 2.5 2.5
 
-OBJECT 7
+OBJECT 2
 sphere
 material 6
 frame 0
 TRANS       -2 5 -2
 ROTAT       0 180 0
 SCALE       3 3 3
-
-
-OBJECT 8
-cube
-material 8 
-frame 0
-TRANS       0 10 0
-ROTAT       0 0 90
-SCALE       .3 3 3