CIS565-Fall-2015 · StoneBird · Sep 21, 2015 · Sep 21, 2015 · Sep 22, 2015 · Sep 22, 2015
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(CUDA_PROPAGATE_HOST_FLAGS OFF)
 endif()
 
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+include_directories(.)
+add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
 add_subdirectory(src)
 
 cuda_add_executable(${CMAKE_PROJECT_NAME}
@@ -77,7 +78,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  # TODO: uncomment if using your stream compaction
     ${CORELIBS}
     )
 

diff --git a/README.md b/README.md
diff --git a/img/REFERENCE_cornell.5000samp.png b/img/REFERENCE_cornell.5000samp.png
diff --git a/img/aliased.png b/img/aliased.png
diff --git a/img/antialiased.png b/img/antialiased.png
diff --git a/img/antialiasing_comparison.png b/img/antialiasing_comparison.png
diff --git a/img/baseline.png b/img/baseline.png
diff --git a/img/closed_scene.png b/img/closed_scene.png
diff --git a/img/comparison.png b/img/comparison.png
diff --git a/img/comparison_new.png b/img/comparison_new.png
diff --git a/img/depth_of_field.png b/img/depth_of_field.png
diff --git a/img/diff_spec.png b/img/diff_spec.png
diff --git a/img/diffuse_check.png b/img/diffuse_check.png
diff --git a/img/dof_comparison.png b/img/dof_comparison.png
diff --git a/img/hit_normal.png b/img/hit_normal.png
diff --git a/img/ior_comparision.png b/img/ior_comparision.png
diff --git a/img/open_comparison.png b/img/open_comparison.png
diff --git a/img/optimized.png b/img/optimized.png
diff --git a/img/optimized_new.png b/img/optimized_new.png
diff --git a/img/ray_count.png b/img/ray_count.png
diff --git a/img/raycast_debug.png b/img/raycast_debug.png
diff --git a/img/raycasting.png b/img/raycasting.png
diff --git a/img/refract_diamond.png b/img/refract_diamond.png
diff --git a/img/refract_ice.png b/img/refract_ice.png
diff --git a/img/scan_occupacy.png b/img/scan_occupacy.png
diff --git a/img/REFERENCE_sphere.5000samp.png → img/simple_sphere.png b/img/REFERENCE_sphere.5000samp.png → img/simple_sphere.png
diff --git a/img/specs.png b/img/specs.png
diff --git a/img/sss_check.png b/img/sss_check.png
diff --git a/img/sss_comparison.png b/img/sss_comparison.png
diff --git a/img/sss_distance_cube.png b/img/sss_distance_cube.png
diff --git a/img/sss_distance_sphere.png b/img/sss_distance_sphere.png
diff --git a/img/sss_fun.png b/img/sss_fun.png
diff --git a/img/sss_refl_comparison.png b/img/sss_refl_comparison.png
diff --git a/img/sss_reflection.png b/img/sss_reflection.png
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -104,4 +104,4 @@ sphere
 material 1
 TRANS       -1 4 -1
 ROTAT       0 0 0
-SCALE       3 3 3
+SCALE       3 3 3
diff --git a/scenes/cornell1.txt b/scenes/cornell1.txt
@@ -0,0 +1,206 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   1.5
+
+// Diffuse white
+MATERIAL 1
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     1 1 1
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse red
+MATERIAL 2
+RGB         .85 .35 .35
+SPECEX      30
+SPECRGB     1 1 1
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse green
+MATERIAL 3
+RGB         .35 .85 .35
+SPECEX      1000
+SPECRGB     1 1 1
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Emissive material (light)
+MATERIAL 4
+RGB         1 1 0
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   1
+
+// Glossy material
+MATERIAL 5
+RGB         .35 .35 .85
+SPECEX      5
+SPECRGB     .8 .8 .8
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Glossy material
+MATERIAL 6
+RGB         .35 .85 .35
+SPECEX      0
+SPECRGB     .8 .8 .8
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Mirror white
+MATERIAL 7
+RGB         .98 .98 .98
+SPECEX      100
+SPECRGB     1 1 1
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Refraction
+MATERIAL 8
+RGB         .847 .949 .9529
+SPECEX      1000
+SPECRGB     1 1 1
+REFL        0
+REFR        1
+REFRIOR     1.309
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        cornell
+EYE         0.0 5 14
+VIEW        0 0 -1
+UP          0 1 0
+DOF       9
+
+
+// Ceiling light
+OBJECT 0
+cube
+material 0
+TRANS       0 10 0
+ROTAT       0 0 0
+SCALE       3 .3 3
+
+// Floor
+OBJECT 1
+cube
+material 1
+TRANS       0 -0.5 0
+ROTAT       0 0 0
+SCALE       10 1 10
+
+// Ceiling
+OBJECT 2
+cube
+material 1
+TRANS       0 10.5 0
+ROTAT       0 0 90
+SCALE       1 10 10
+
+// Back wall
+OBJECT 3
+cube
+material 1
+TRANS       0 5 -5.5
+ROTAT       0 90 0
+SCALE       1 10 10
+
+// Left wall
+OBJECT 4
+cube
+material 2
+TRANS       -5.5 5 0
+ROTAT       0 0 0
+SCALE       1 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5.5 5 0
+ROTAT       0 0 0
+SCALE       1 10 10
+
+// Sphere
+OBJECT 6
+sphere
+material 7
+TRANS       -3 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Back light
+OBJECT 7
+cube
+material 4
+TRANS       0 5 -5
+ROTAT       0 0 0
+SCALE       1 7 .3
+
+// Sphere
+OBJECT 8
+sphere
+material 5
+TRANS       3 6 -2
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Cube
+OBJECT 9
+cube
+material 8
+TRANS       -2 1 2
+ROTAT       45 45 0
+SCALE       1 1 1
+
+// Sphere
+OBJECT 10
+sphere
+material 7
+TRANS       2 3 5
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// Sphere
+OBJECT 11
+sphere
+material 8
+TRANS       0.5 5 5
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// Sphere
+OBJECT 12
+sphere
+material 8
+TRANS       0 1 0
+ROTAT       0 0 0
+SCALE       1 1 1