CIS565-Fall-2016 · michaelwillett · Oct 8, 2016 · Oct 8, 2016 · Oct 8, 2016 · Oct 8, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 endif()
 
 include_directories(.)
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
 add_subdirectory(src)
 
 cuda_add_executable(${CMAKE_PROJECT_NAME}
@@ -78,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/AA_compare.PNG b/img/AA_compare.PNG
diff --git a/img/all_effects.png b/img/all_effects.png
diff --git a/img/all_on.png b/img/all_on.png
diff --git a/img/antialiasing.png b/img/antialiasing.png
diff --git a/img/bad_random_sampling.png b/img/bad_random_sampling.png
diff --git a/img/bad_rng.png b/img/bad_rng.png
diff --git a/img/depth-8_perfect_spec.png b/img/depth-8_perfect_spec.png
diff --git a/img/direct.png b/img/direct.png
diff --git a/img/direct_lighting.png b/img/direct_lighting.png
diff --git a/img/direct_lighting_grayscale.png b/img/direct_lighting_grayscale.png
diff --git a/img/fresnel_working.png b/img/fresnel_working.png
diff --git a/img/imperfect_specular.png b/img/imperfect_specular.png
diff --git a/img/no_fresnel.png b/img/no_fresnel.png
diff --git a/img/single_bounce_direct_lighting.png b/img/single_bounce_direct_lighting.png
diff --git a/img/working_refraction.png b/img/working_refraction.png
diff --git a/scenes/all_demo.txt b/scenes/all_demo.txt
@@ -0,0 +1,171 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   5
+
+// Diffuse white
+MATERIAL 1
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse red
+MATERIAL 2
+SPECEX      0
+RGB         .85 .35 .35
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse green
+MATERIAL 3
+RGB         .35 .85 .35
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Specular white
+MATERIAL 4
+RGB         .98 .98 .98
+SPECEX      5
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Specular black
+MATERIAL 5
+RGB         0 0 0
+SPECEX      100
+SPECRGB     .3 .3 .3
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Refractive blue
+MATERIAL 6
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        1
+REFRIOR     1.6
+EMITTANCE   0
+
+// Mirror
+MATERIAL 7
+RGB         0 0 0
+SPECEX      1000
+SPECRGB     1 1 1
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  10000
+DEPTH       8
+FILE        cornell2
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+
+
+// Ceiling light
+OBJECT 0
+cube
+material 0
+TRANS       0 10 0
+ROTAT       0 0 0
+SCALE       3 .3 6
+
+// Floor
+OBJECT 1
+cube
+material 1
+TRANS       0 0 5
+ROTAT       0 0 0
+SCALE       10 .01 20
+
+// Ceiling
+OBJECT 2
+cube
+material 1
+TRANS       0 10 5
+ROTAT       0 0 90
+SCALE       .01 10 20
+
+// Back wall
+OBJECT 3
+cube
+material 1
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 10
+
+// Left wall
+OBJECT 4
+cube
+material 2
+TRANS       -5 5 5
+ROTAT       0 0 0
+SCALE       .01 10 20
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5 5 5
+ROTAT       0 0 0
+SCALE       .01 10 20
+
+// Sphere
+OBJECT 6
+sphere
+material 4
+TRANS       -2 2 0
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 6
+TRANS       2 2 0
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Water
+OBJECT 8
+sphere
+material 5
+TRANS       2 6 -2
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// mirror sphere
+OBJECT 9
+sphere
+material 7
+TRANS       -2 6 -2
+ROTAT       0 0 0
+SCALE       3 3 3
diff --git a/scenes/dl.txt b/scenes/dl.txt
@@ -0,0 +1,83 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   3
+
+// Diffuse white
+MATERIAL 1
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse green
+MATERIAL 2
+RGB         .35 .85 .35
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse Gray
+MATERIAL 3
+RGB         .5 .5 .5
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        direct_lighting
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+
+
+// light
+OBJECT 0
+sphere
+material 0
+TRANS       10 10 0
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// Floor
+OBJECT 1
+cube
+material 3
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       30 .01 30
+
+// Left wall
+OBJECT 2
+cube
+material 2
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 30
+
+// Sphere
+OBJECT 3
+sphere
+material 1
+TRANS       0 4 0
+ROTAT       0 0 0
+SCALE       3 3 3