CIS565-Fall-2017 · MauKMu · Oct 1, 2017 · Oct 1, 2017 · Oct 1, 2017 · Oct 1, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,7 +72,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}

diff --git a/README.md b/README.md
diff --git a/img/cache-DL.png b/img/cache-DL.png
diff --git a/img/cache-noDL.png b/img/cache-noDL.png
diff --git a/img/closed.png b/img/closed.png
diff --git a/img/cornell-base.png b/img/cornell-base.png
diff --git a/img/graph-DL.png b/img/graph-DL.png
diff --git a/img/graph-base.png b/img/graph-base.png
diff --git a/img/graph-cache-depth.png b/img/graph-cache-depth.png
diff --git a/img/graph-closed-paths.png b/img/graph-closed-paths.png
diff --git a/img/graph-closed-runtime.png b/img/graph-closed-runtime.png
diff --git a/img/graph-mesh.png b/img/graph-mesh.png
diff --git a/img/graph-open-paths.png b/img/graph-open-paths.png
diff --git a/img/graph-open-runtime.png b/img/graph-open-runtime.png
diff --git a/img/graph-relative-cache-depth.png b/img/graph-relative-cache-depth.png
diff --git a/img/graph-shader-only.png b/img/graph-shader-only.png
diff --git a/img/noproc.png b/img/noproc.png
diff --git a/img/normals.png b/img/normals.png
diff --git a/img/open.png b/img/open.png
diff --git a/img/porygon-diff.png b/img/porygon-diff.png
diff --git a/img/porygon-diff2.png b/img/porygon-diff2.png
diff --git a/img/porygon-mix.png b/img/porygon-mix.png
diff --git a/img/porygon-refl.png b/img/porygon-refl.png
diff --git a/img/proc1.png b/img/proc1.png
diff --git a/img/proc2.png b/img/proc2.png
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -22,8 +22,8 @@ EMITTANCE   0
 MATERIAL 2
 RGB         .85 .35 .35
 SPECEX      0
-SPECRGB     0 0 0
-REFL        0
+SPECRGB     .9 .9 .9
+REFL        1
 REFR        0
 REFRIOR     0
 EMITTANCE   0
@@ -40,14 +40,34 @@ EMITTANCE   0
 
 // Specular white
 MATERIAL 4
-RGB         .98 .98 .98
+RGB         0 0 0
 SPECEX      0
 SPECRGB     .98 .98 .98
 REFL        1
 REFR        0
 REFRIOR     0
 EMITTANCE   0
 
+// Diffuse magenta
+MATERIAL 5
+RGB         .85 .15 .8
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse yellow
+MATERIAL 6
+RGB         .85 .8 .1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
 // Camera
 CAMERA
 RES         800 800
@@ -74,20 +94,20 @@ cube
 material 1
 TRANS       0 0 0
 ROTAT       0 0 0
-SCALE       10 .01 10
+SCALE       10 .01 30
 
 // Ceiling
 OBJECT 2
 cube
 material 1
 TRANS       0 10 0
 ROTAT       0 0 90
-SCALE       .01 10 10
+SCALE       .01 10 30
 
 // Back wall
 OBJECT 3
 cube
-material 1
+material 6
 TRANS       0 5 -5
 ROTAT       0 90 0
 SCALE       .01 10 10
@@ -98,15 +118,15 @@ cube
 material 2
 TRANS       -5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .01 10 30
 
 // Right wall
 OBJECT 5
 cube
 material 3
 TRANS       5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .01 10 30
 
 // Sphere
 OBJECT 6
@@ -115,3 +135,19 @@ material 4
 TRANS       -1 4 -1
 ROTAT       0 0 0
 SCALE       3 3 3
+
+// "Front" wall
+OBJECT 7
+cube
+material 5
+TRANS       0 5 11
+ROTAT       0 0 0
+SCALE       30 30 .01
+
+// Sphere
+OBJECT 8
+sphere
+material 6
+TRANS       1 2 3
+ROTAT       45 45 0
+SCALE       3 3 3
diff --git a/scenes/cornellClosed.txt b/scenes/cornellClosed.txt
@@ -0,0 +1,145 @@
+// 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
+RGB         .85 .35 .35
+SPECEX      0
+SPECRGB     .9 .9 .9
+REFL        1
+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         0 0 0
+SPECEX      0
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse magenta
+MATERIAL 5
+RGB         .85 .15 .8
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse yellow
+MATERIAL 6
+RGB         .85 .8 .1
+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        cornell
+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 3
+
+// Floor
+OBJECT 1
+cube
+material 1
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       10 .01 30
+
+// Ceiling
+OBJECT 2
+cube
+material 1
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 10 30
+
+// Back wall
+OBJECT 3
+cube
+material 6
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 10
+
+// Left wall
+OBJECT 4
+cube
+material 2
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 30
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 30
+
+// Sphere
+OBJECT 6
+sphere
+material 4
+TRANS       -1 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// "Front" wall
+OBJECT 7
+cube
+material 5
+TRANS       0 5 11
+ROTAT       0 0 0
+SCALE       30 30 .01
diff --git a/scenes/cornellDiffuse.txt b/scenes/cornellDiffuse.txt
@@ -0,0 +1,117 @@
+// 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
+RGB         .85 .35 .35
+SPECEX      0
+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      0
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        cornell
+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 3
+
+// Floor
+OBJECT 1
+cube
+material 1
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       10 .01 10
+
+// Ceiling
+OBJECT 2
+cube
+material 1
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 10 10
+
+// 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 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Sphere
+OBJECT 6
+sphere
+material 4
+TRANS       -1 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3