CIS565-Fall-2018 · risia · Sep 21, 2018 · Sep 25, 2018 · Sep 25, 2018 · Sep 25, 2018
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}
@@ -82,7 +82,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/DIFFUSE.2018-09-25_14-43-29z.313samp.png b/img/DIFFUSE.2018-09-25_14-43-29z.313samp.png
diff --git a/img/DOFwFBC.2018-09-30_21-37-10z.373samp.png b/img/DOFwFBC.2018-09-30_21-37-10z.373samp.png
diff --git a/img/REFLECT.2018-09-27_15-13-55z.163samp.png b/img/REFLECT.2018-09-27_15-13-55z.163samp.png
diff --git a/img/ReflectRefractTest684sample.png b/img/ReflectRefractTest684sample.png
diff --git a/img/SampleScene1.2018-09-30_22-56-15z.574samp.png b/img/SampleScene1.2018-09-30_22-56-15z.574samp.png
diff --git a/img/big_DOF.2018-09-30_02-33-09z.770samp.png b/img/big_DOF.2018-09-30_02-33-09z.770samp.png
diff --git a/img/closed_vs_open.PNG b/img/closed_vs_open.PNG
diff --git a/img/compaction.png b/img/compaction.png
diff --git a/img/cornell.2018-10-01_03-19-26z.279samp.png b/img/cornell.2018-10-01_03-19-26z.279samp.png
diff --git a/img/refraction.2018-09-27_22-44-44z.124samp.png b/img/refraction.2018-09-27_22-44-44z.124samp.png
diff --git a/img/refraction.2018-09-30_23-21-46z.501samp.png b/img/refraction.2018-09-30_23-21-46z.501samp.png
diff --git a/img/refraction.2018-09-30_23-40-39z.3700samp.png b/img/refraction.2018-09-30_23-40-39z.3700samp.png
diff --git a/img/subsurface.2018-09-30_21-51-35z.602samp.png b/img/subsurface.2018-09-30_21-51-35z.602samp.png
diff --git a/img/subsurface.2018-09-30_22-21-57z.96samp_len0.01.png b/img/subsurface.2018-09-30_22-21-57z.96samp_len0.01.png
diff --git a/img/subsurface.2018-09-30_22-23-11z.147samp_len0.1.png b/img/subsurface.2018-09-30_22-23-11z.147samp_len0.1.png
diff --git a/img/subsurface.2018-09-30_22-24-55z.128samp_len0.5.png b/img/subsurface.2018-09-30_22-24-55z.128samp_len0.5.png
diff --git a/img/subsurface.2018-09-30_22-26-31z.54samp_len0.05.png b/img/subsurface.2018-09-30_22-26-31z.54samp_len0.05.png
diff --git a/img/test.2018-09-29_02-12-24z.83samp.png b/img/test.2018-09-29_02-12-24z.83samp.png
diff --git a/img/test.2018-10-01_00-09-16z.339samp.png b/img/test.2018-10-01_00-09-16z.339samp.png
diff --git a/img/wFBC.PNG b/img/wFBC.PNG
diff --git a/img/wFBC1_2.PNG b/img/wFBC1_2.PNG
diff --git a/img/wFBC2.PNG b/img/wFBC2.PNG
diff --git a/img/wFBC2_2.PNG b/img/wFBC2_2.PNG
diff --git a/img/wMaterialSort2.PNG b/img/wMaterialSort2.PNG
diff --git a/img/woFBC.PNG b/img/woFBC.PNG
diff --git a/img/woFBC2.PNG b/img/woFBC2.PNG
diff --git a/img/woMaterialSort.PNG b/img/woMaterialSort.PNG
diff --git a/img/woMaterialSort2.PNG b/img/woMaterialSort2.PNG
diff --git a/scenes/SampleScene.txt b/scenes/SampleScene.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
+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
+
+// Perfect Refractive white
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     .98 .98 .98
+REFL        0
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Subsurface Blue
+MATERIAL 6
+RGB         .9 .9 .98
+SPECEX      0.02
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Reflective/Refractive Purple, Green spec
+MATERIAL 7
+RGB         .98 0 .98
+SPECEX      0.02
+SPECRGB     0 0.98 0
+REFL        1
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        SampleScene1
+EYE         0 5 10
+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
+
+// Reflective Sphere
+OBJECT 6
+sphere
+material 4
+TRANS       -3 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Refractive Sphere
+OBJECT 7
+sphere
+material 5
+TRANS       3 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Reflect/Refractive Sphere
+OBJECT 8
+sphere
+material 7
+TRANS       0 8 -2
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Reflect/Refractive Sphere
+OBJECT 9
+sphere
+material 6
+TRANS       0 2 0
+ROTAT       0 0 0
+SCALE       3 3 3
diff --git a/scenes/SampleSceneCubes.txt b/scenes/SampleSceneCubes.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
+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
+
+// Perfect Refractive white
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     .98 .98 .98
+REFL        0
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Subsurface Blue
+MATERIAL 6
+RGB         .9 .9 .98
+SPECEX      0.02
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Reflective/Refractive Purple, Green spec
+MATERIAL 7
+RGB         .98 0 .98
+SPECEX      0.02
+SPECRGB     0 0.98 0
+REFL        1
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        SampleScene1
+EYE         0 5 10
+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
+
+// Reflective
+OBJECT 6
+cube
+material 4
+TRANS       -3 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Refractive
+OBJECT 7
+cube
+material 5
+TRANS       3 5 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Reflect/Refractive
+OBJECT 8
+cube
+material 7
+TRANS       0 8 -2
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Subsurface Scatter
+OBJECT 9
+cube
+material 6
+TRANS       0 2 0
+ROTAT       0 0 0
+SCALE       3 3 3