CIS565-Fall-2015 · arizonat · Sep 17, 2015 · Sep 18, 2015 · Sep 18, 2015 · Sep 20, 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)  # TODO: uncomment if using your 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  # TODO: uncomment if using your stream compaction
     ${CORELIBS}
     )
 

diff --git a/README.md b/README.md
diff --git a/img/cornell.2015-09-30_00-35-22z.1773samp.png b/img/cornell.2015-09-30_00-35-22z.1773samp.png
diff --git a/img/cornell_alive_vs_depth.png b/img/cornell_alive_vs_depth.png
diff --git a/img/cornell_bounce.png b/img/cornell_bounce.png
diff --git a/img/cornell_dof.png b/img/cornell_dof.png
diff --git a/img/cornell_glass.png b/img/cornell_glass.png
diff --git a/img/cornell_initial_vs_time.png b/img/cornell_initial_vs_time.png
diff --git a/img/cornell_specular.png b/img/cornell_specular.png
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -6,13 +6,13 @@ SPECRGB     0 0 0
 REFL        0
 REFR        0
 REFRIOR     0
-EMITTANCE   5
+EMITTANCE   10
 
 // Diffuse white
 MATERIAL 1
 RGB         .98 .98 .98
 SPECEX      0
-SPECRGB     1 1 1
+SPECRGB     0.01 0.01 0.01
 REFL        0
 REFR        0
 REFRIOR     0
@@ -22,7 +22,7 @@ EMITTANCE   0
 MATERIAL 2
 RGB         .85 .35 .35
 SPECEX      0
-SPECRGB     1 1 1
+SPECRGB     0 0 0
 REFL        0
 REFR        0
 REFRIOR     0
@@ -32,6 +32,16 @@ EMITTANCE   0
 MATERIAL 3
 RGB         .35 .85 .35
 SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Mirror white
+MATERIAL 4
+RGB         .01 .01 .01
+SPECEX      0
 SPECRGB     1 1 1
 REFL        0
 REFR        0
@@ -45,6 +55,8 @@ FOVY        45
 ITERATIONS  5000
 DEPTH       8
 FILE        cornell
+FOCAL       11.5
+APERTURE    0.1
 EYE         0.0 5 10.5
 VIEW        0 0 -1
 UP          0 1 0
@@ -72,36 +84,44 @@ cube
 material 1
 TRANS       0 10 0
 ROTAT       0 0 90
-SCALE       .01 10 10
+SCALE       .1 10 10
 
 // Back wall
 OBJECT 3
 cube
 material 1
 TRANS       0 5 -5
 ROTAT       0 90 0
-SCALE       .01 10 10
+SCALE       .1 10 10
 
 // Left wall
 OBJECT 4
 cube
 material 2
 TRANS       -5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .1 10 10
 
 // Right wall
 OBJECT 5
 cube
 material 3
 TRANS       5 5 0
 ROTAT       0 0 0
-SCALE       .01 10 10
+SCALE       .1 10 10
 
 // Sphere
 OBJECT 6
 sphere
-material 1
-TRANS       -1 4 -1
+material 4
+TRANS       -1 2 -3
 ROTAT       0 0 0
 SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 1
+TRANS       0 5 1
+ROTAT       0 0 0
+SCALE       2 2 2
diff --git a/scenes/cornell_move.txt b/scenes/cornell_move.txt
@@ -0,0 +1,136 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   10
+
+// Diffuse white
+MATERIAL 1
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     0.01 0.01 0.01
+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
+
+// Mirror white
+MATERIAL 4
+RGB         .01 .01 .01
+SPECEX      0
+SPECRGB     1 1 1
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        cornell
+FOCAL       11.5
+APERTURE    0.5
+EYE         0.0 5 10.5
+VIEW        0 0 -1
+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       .1 10 10
+
+// Back wall
+OBJECT 3
+cube
+material 1
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .1 10 10
+
+// Left wall
+OBJECT 4
+cube
+material 2
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .1 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .1 10 10
+
+// Sphere background
+OBJECT 6
+sphere
+material 1
+TRANS       -1 2 -3
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere focused
+OBJECT 7
+sphere
+material 3
+TRANS       0 5 1
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// Sphere moving
+OBJECT 8
+sphere
+material 2
+TRANS       3 4 -3
+ROTAT       0 0 0
+SCALE       3 3 3
+MOVETO      3 1 -3
diff --git a/scenes/cornell_refraction.txt b/scenes/cornell_refraction.txt
@@ -0,0 +1,137 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   10
+
+// Diffuse white
+MATERIAL 1
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     0.01 0.01 0.01
+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
+
+// Mirror white
+MATERIAL 4
+RGB         .01 .01 .01
+SPECEX      0
+SPECRGB     1 1 1
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Glass
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     0.1 0.1 0.1
+REFL        0
+REFR        1
+REFRIOR     1.52
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        cornell
+FOCAL       11.5
+APERTURE    0.25
+EYE         0.0 5 10.5
+VIEW        0 0 -1
+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       .1 10 10
+
+// Back wall
+OBJECT 3
+cube
+material 1
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .1 10 10
+
+// Left wall
+OBJECT 4
+cube
+material 2
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .1 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .1 10 10
+
+// Sphere
+OBJECT 6
+sphere
+material 4
+TRANS       -1 2 -3
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 5
+TRANS       -3 3 0
+ROTAT       0 0 0
+SCALE       3 3 3