CIS565-Fall-2015 · bcrusco · Sep 17, 2015 · Sep 17, 2015 · Sep 19, 2015 · Sep 19, 2015
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(CUDA_PROPAGATE_HOST_FLAGS OFF)
 endif()
 
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+add_subdirectory(stream_compaction)
 add_subdirectory(src)
 
 cuda_add_executable(${CMAKE_PROJECT_NAME}
@@ -77,7 +77,7 @@ cuda_add_executable(${CMAKE_PROJECT_NAME}
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
     src
-    #stream_compaction  # TODO: uncomment if using your stream compaction
+    stream_compaction
     ${CORELIBS}
     )
 

diff --git a/Closed Scene Analysis.txt b/Closed Scene Analysis.txt
@@ -0,0 +1,21 @@
+Closed Scene Analysis
+
+Stream compaction:
+Depth 0: Trace took 4.87280ms and 476986 out of 640000 rays remain.
+Depth 1: Trace took 3.80563ms and 403006 out of 640000 rays remain.
+Depth 2: Trace took 3.32486ms and 348860 out of 640000 rays remain.
+Depth 3: Trace took 2.91789ms and 305059 out of 640000 rays remain.
+Depth 4: Trace took 2.58755ms and 268097 out of 640000 rays remain.
+Depth 5: Trace took 2.29322ms and 236968 out of 640000 rays remain.
+Depth 6: Trace took 2.05750ms and 209244 out of 640000 rays remain.
+Depth 7: Trace took 1.83795ms and 185030 out of 640000 rays remain.
+
+No stream compaction:
+Depth 0: Trace took 5.03702ms and 640000 out of 640000 rays remain.
+Depth 1: Trace took 3.98282ms and 640000 out of 640000 rays remain.
+Depth 2: Trace took 3.67200ms and 640000 out of 640000 rays remain.
+Depth 3: Trace took 3.43274ms and 640000 out of 640000 rays remain.
+Depth 4: Trace took 3.20074ms and 640000 out of 640000 rays remain.
+Depth 5: Trace took 2.99098ms and 640000 out of 640000 rays remain.
+Depth 6: Trace took 2.82339ms and 640000 out of 640000 rays remain.
+Depth 7: Trace took 2.65965ms and 640000 out of 640000 rays remain.
diff --git a/Open Scene Analysis.txt b/Open Scene Analysis.txt
@@ -0,0 +1,21 @@
+Open Scene Analysis
+
+Stream compaction:
+Depth 0: Trace took 4.58256ms and 447407 out of 640000 rays remain.
+Depth 1: Trace took 3.39939ms and 258788 out of 640000 rays remain.
+Depth 2: Trace took 2.05389ms and 184010 out of 640000 rays remain.
+Depth 3: Trace took 1.51395ms and 138638 out of 640000 rays remain.
+Depth 4: Trace took 1.16778ms and 109147 out of 640000 rays remain.
+Depth 5: Trace took 0.98333ms and 87256 out of 640000 rays remain.
+Depth 6: Trace took 0.83344ms and 70458 out of 640000 rays remain.
+Depth 7: Trace took 0.66774ms and 56732 out of 640000 rays remain.
+
+No stream compaction:
+Depth 0: Trace took 4.66154ms and 640000 out of 640000 rays remain.
+Depth 1: Trace took 3.53600ms and 640000 out of 640000 rays remain.
+Depth 2: Trace took 2.62701ms and 640000 out of 640000 rays remain.
+Depth 3: Trace took 2.29034ms and 640000 out of 640000 rays remain.
+Depth 4: Trace took 2.06243ms and 640000 out of 640000 rays remain.
+Depth 5: Trace took 1.90163ms and 640000 out of 640000 rays remain.
+Depth 6: Trace took 1.77546ms and 640000 out of 640000 rays remain.
+Depth 7: Trace took 1.66707ms and 640000 out of 640000 rays remain.
diff --git a/README.md b/README.md
diff --git a/img/AA comparison.psd b/img/AA comparison.psd
diff --git a/img/Project 3 Analysis 1.png b/img/Project 3 Analysis 1.png
diff --git a/img/Project 3 Analysis 2.png b/img/Project 3 Analysis 2.png
diff --git a/img/Project 3 Analysis 3.png b/img/Project 3 Analysis 3.png
diff --git a/img/Project 3 Analysis 4.png b/img/Project 3 Analysis 4.png
diff --git a/img/REFERENCE_cornell.5000samp.png b/img/REFERENCE_cornell.5000samp.png
diff --git a/img/REFERENCE_sphere.5000samp.png b/img/REFERENCE_sphere.5000samp.png
diff --git a/img/cornell_blur.2015-09-27_01-51-43z.5000samp.png b/img/cornell_blur.2015-09-27_01-51-43z.5000samp.png
diff --git a/img/cornell_blur.2015-10-02_15-48-32z.20000samp.png b/img/cornell_blur.2015-10-02_15-48-32z.20000samp.png
diff --git a/img/cornell_diffuse.2015-09-27_02-29-25z.5000samp.png b/img/cornell_diffuse.2015-09-27_02-29-25z.5000samp.png
diff --git a/img/cornell_dof.2015-09-27_01-18-07z.5000_annotatedsamp.png b/img/cornell_dof.2015-09-27_01-18-07z.5000_annotatedsamp.png
diff --git a/img/cornell_dof.2015-09-27_01-18-07z.5000samp.png b/img/cornell_dof.2015-09-27_01-18-07z.5000samp.png
diff --git a/img/cornell_glass.2015-10-02_15-13-50z.20000samp.png b/img/cornell_glass.2015-10-02_15-13-50z.20000samp.png
diff --git a/img/cornell_glass_10k.png b/img/cornell_glass_10k.png
diff --git a/img/cornell_main_20k.png b/img/cornell_main_20k.png
diff --git a/img/cornell_mirror.2015-09-27_00-58-26z.5000samp.png b/img/cornell_mirror.2015-09-27_00-58-26z.5000samp.png
diff --git a/img/cornell_mirror.2015-09-27_00-58-26z.5000samp_annotated.png b/img/cornell_mirror.2015-09-27_00-58-26z.5000samp_annotated.png
diff --git a/img/cornell_noaa.2015-09-27_02-02-48z.5000samp.png b/img/cornell_noaa.2015-09-27_02-02-48z.5000samp.png
diff --git a/img/cornell_np_spec.2015-09-26_23-41-17z.5000samp.png b/img/cornell_np_spec.2015-09-26_23-41-17z.5000samp.png
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -6,10 +6,7 @@ SPECRGB     0 0 0
 REFL        0
 REFR        0
 REFRIOR     0
-SCATTER     0
-ABSCOEFF    0 0 0
-RSCTCOEFF   0
-EMITTANCE   5
+EMITTANCE   1
 
 // Diffuse white
 MATERIAL 1
@@ -19,9 +16,6 @@ SPECRGB     1 1 1
 REFL        0
 REFR        0
 REFRIOR     0
-SCATTER     0
-ABSCOEFF    0 0 0
-RSCTCOEFF   0
 EMITTANCE   0
 
 // Diffuse red
@@ -32,9 +26,6 @@ SPECRGB     1 1 1
 REFL        0
 REFR        0
 REFRIOR     0
-SCATTER     0
-ABSCOEFF    0 0 0
-RSCTCOEFF   0
 EMITTANCE   0
 
 // Diffuse green
@@ -45,83 +36,251 @@ SPECRGB     1 1 1
 REFL        0
 REFR        0
 REFRIOR     0
-SCATTER     0
-ABSCOEFF    0 0 0
-RSCTCOEFF   0
+EMITTANCE   0
+
+// spec green
+MATERIAL 4
+RGB         0 1 0
+SPECEX      .01
+SPECRGB     .2 .2 .2
+REFL        1
+REFR        0
+REFRIOR     1.5
+EMITTANCE   0
+
+// glass
+MATERIAL 5
+RGB         .25 .85 .35
+SPECEX      1
+SPECRGB     1 1 1
+REFL        0
+REFR        1
+REFRIOR     2.2
+EMITTANCE   0
+
+// spec blue
+MATERIAL 6
+RGB         .11 .56 1
+SPECEX      .01
+SPECRGB     .1 .1 .1
+REFL        1
+REFR        0
+REFRIOR     1.5
+EMITTANCE   0
+
+// Perfect mirror
+MATERIAL 7
+RGB         1 1 1
+SPECEX      0
+SPECRGB     1 1 1
+REFL        1
+REFR        0
+REFRIOR     1.5
+EMITTANCE   0
+
+// spec red
+MATERIAL 8
+RGB         1 .18 .18
+SPECEX      .01
+SPECRGB     .1 .1 .1
+REFL        1
+REFR        0
+REFRIOR     1.5
 EMITTANCE   0
 
 // Camera
 CAMERA
 RES         800 800
 FOVY        45
-ITERATIONS  5000
+ITERATIONS  20000
 DEPTH       8
-FILE        cornell
-frame 0
+FILE        cornell_mirror
 EYE         0.0 5 10.5
 VIEW        0 0 -1
 UP          0 1 0
-
+BLUR        0 // Is blur active
+DOF         0 // Is DOF active
+FD          9.5 // Focal distance
+AR          0.2 // Aperture radius
 
 // Ceiling light
 OBJECT 0
 cube
 material 0
+BLUR        0
 frame 0
 TRANS       0 10 0
 ROTAT       0 0 0
-SCALE       3 .3 3
+SCALE       10 .2 30
+frame 1
+TRANS       0 10 0
+ROTAT       0 0 0
+SCALE       10 .2 30
 
 // Floor
 OBJECT 1
 cube
 material 1
+BLUR        0
 frame 0
 TRANS       0 0 0
 ROTAT       0 0 0
-SCALE       10 .01 10
+SCALE       10 .01 30
+frame 1
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       10 .01 30
 
 // Ceiling
 OBJECT 2
 cube
 material 1
+BLUR        0
 frame 0
 TRANS       0 10 0
 ROTAT       0 0 90
-SCALE       .01 10 10
+SCALE       .01 10 30
+frame 1
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 10 30
 
 // Back wall
 OBJECT 3
 cube
 material 1
+BLUR        0
 frame 0
 TRANS       0 5 -5
 ROTAT       0 90 0
 SCALE       .01 10 10
+frame 1
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 10
 
 // Left wall
 OBJECT 4
 cube
 material 2
+BLUR        0
 frame 0
 TRANS       -5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .01 10 30
+frame 1
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 30
 
 // Right wall
 OBJECT 5
 cube
 material 3
+BLUR        0
 frame 0
 TRANS       5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .01 10 30
+frame 1
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 30
 
 // Sphere
 OBJECT 6
 sphere
-material 1
+material 4
+BLUR        0
+frame 0
+TRANS       -2 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+frame 1
+TRANS       -2 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Glass box
+OBJECT 7
+cube
+material 5
+BLUR        0
+frame 0
+TRANS       2 1 -1
+ROTAT       0 45 0
+SCALE       3 3 3
+frame 1
+TRANS       2 1 -1
+ROTAT       0 45 0
+SCALE       3 3 3
+
+// sphere
+OBJECT 8
+sphere
+material 6
+BLUR        0
+frame 0
+TRANS       2 3.5 -1
+ROTAT       0 0 0
+SCALE       2 2 2
+frame 1
+TRANS       2 3.5 -1
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// Perfect Mirror box
+OBJECT 9
+cube
+material 7
+BLUR        0
 frame 0
-TRANS       -1 4 -1
+TRANS       -3 1 0
+ROTAT       0 60 0
+SCALE       2 2 2
+frame 1
+TRANS       -3 1 0
+ROTAT       0 60 0
+SCALE       2 2 2
+
+// non perfect red sphere
+OBJECT 10
+sphere
+material 8
+BLUR        0
+frame 0
+TRANS       2.5 6.5 -2.8
+ROTAT       0 0 0
+SCALE       3 3 3
+frame 1
+TRANS       2.5 6.5 -2.8
 ROTAT       0 0 0
 SCALE       3 3 3
+
+// glass ball
+OBJECT 11
+sphere
+material 5
+BLUR        0
+frame 0
+TRANS       3.8 .7 .9
+ROTAT       0 0 0
+SCALE       1.5 1.5 1.5
+frame 1
+TRANS       3.8 .7 .9
+ROTAT       0 0 0
+SCALE       1.5 1.5 1.5
+
+// front wall
+OBJECT 12
+cube
+material 1
+BLUR        0
+frame 0
+TRANS       0 5 15
+ROTAT       0 90 0
+SCALE       .01 10 10
+frame 1
+TRANS       0 5 15
+ROTAT       0 90 0
+SCALE       .01 10 10