CIS565-Fall-2022 · meganr28 · Sep 26, 2022 · Sep 26, 2022 · Sep 28, 2022 · Sep 29, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,9 +71,11 @@ set(headers
     src/pathtrace.h
     src/scene.h
     src/sceneStructs.h
+    src/tiny_obj_loader.h
     src/preview.h
     src/utilities.h
     src/ImGui/imconfig.h
+    src/lbvh.h
 
 	src/ImGui/imgui.h
     src/ImGui/imconfig.h
@@ -95,6 +97,7 @@ set(sources
     src/scene.cpp
     src/preview.cpp
     src/utilities.cpp
+    src/lbvh.cu
 
     src/ImGui/imgui.cpp 
       src/ImGui/imgui_demo.cpp 
@@ -111,6 +114,7 @@ list(SORT sources)
 source_group(Headers FILES ${headers})
 source_group(Sources FILES ${sources})
 
+#add_subdirectory(src/libmorton)
 #add_subdirectory(src/ImGui)
 #add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
 

diff --git a/README.md b/README.md
diff --git a/img/bloopers/cornell.2022-09-22_diffuse_1_bounce.png b/img/bloopers/cornell.2022-09-22_diffuse_1_bounce.png
diff --git a/img/bloopers/cornell.2022-09-22_diffuse_2_bounces.png b/img/bloopers/cornell.2022-09-22_diffuse_2_bounces.png
diff --git a/img/bloopers/cornell.2022-09-22_diffuse_3_bounces.png b/img/bloopers/cornell.2022-09-22_diffuse_3_bounces.png
diff --git a/img/bloopers/cornell.2022-09-22_init_program.png b/img/bloopers/cornell.2022-09-22_init_program.png
diff --git a/img/bloopers/cornell.2022-09-23_diffuse_rngfix_2_bounces.png b/img/bloopers/cornell.2022-09-23_diffuse_rngfix_2_bounces.png
diff --git a/img/bloopers/cornell.2022-09-24_diffuse-5000samp-depth8.png b/img/bloopers/cornell.2022-09-24_diffuse-5000samp-depth8.png
diff --git a/img/bloopers/cornell.2022-09-24_diffuse_rngfix_3_bounces.png b/img/bloopers/cornell.2022-09-24_diffuse_rngfix_3_bounces.png
diff --git a/img/bloopers/cornell.2022-09-24_switch_diffuse_spec_probability.png b/img/bloopers/cornell.2022-09-24_switch_diffuse_spec_probability.png
diff --git a/img/bloopers/cornell.2022-10-06_04-26-16z.5000samp.png b/img/bloopers/cornell.2022-10-06_04-26-16z.5000samp.png
diff --git a/img/bloopers/cornell.2022-10-06_05-12-34z.5000samp.png b/img/bloopers/cornell.2022-10-06_05-12-34z.5000samp.png
diff --git a/img/cornell.2022-09-24_depth8_5000samp_nocompact.png b/img/cornell.2022-09-24_depth8_5000samp_nocompact.png
diff --git a/img/cornell.2022-09-24_depth8_5000samp_spec.png b/img/cornell.2022-09-24_depth8_5000samp_spec.png
diff --git a/img/cornell.2022-09-24_depth8_5000samp_withcompact.png b/img/cornell.2022-09-24_depth8_5000samp_withcompact.png
diff --git a/img/cornell.2022-09-25_depth8_5000samp_mat_nocache.png b/img/cornell.2022-09-25_depth8_5000samp_mat_nocache.png
diff --git a/img/cornell.2022-09-25_depth8_5000samples_nomat_nocache.png b/img/cornell.2022-09-25_depth8_5000samples_nomat_nocache.png
diff --git a/img/cornell.2022-09-27_depth8_5000samp_antialiasing.png b/img/cornell.2022-09-27_depth8_5000samp_antialiasing.png
diff --git a/img/cornell.2022-09-27_depth8_5000samp_dof.png b/img/cornell.2022-09-27_depth8_5000samp_dof.png
diff --git a/img/cornell.2022-09-27_depth8_5000samp_noantialiasing.png b/img/cornell.2022-09-27_depth8_5000samp_noantialiasing.png
diff --git a/img/cornell.2022-09-28_21-01-03z.5000samp.png b/img/cornell.2022-09-28_21-01-03z.5000samp.png
diff --git a/img/cornell.2022-10-09_13-47-52z.5000samp.png b/img/cornell.2022-10-09_13-47-52z.5000samp.png
diff --git a/img/cornell.2022-10-10_03-25-47z.5000samp.png b/img/cornell.2022-10-10_03-25-47z.5000samp.png
diff --git a/img/dragon_5000_lbvh.png b/img/dragon_5000_lbvh.png
diff --git a/img/final/acceleration_bunny.PNG b/img/final/acceleration_bunny.PNG
diff --git a/img/final/acceleration_dragon.PNG b/img/final/acceleration_dragon.PNG
diff --git a/img/final/acceleration_teapot.PNG b/img/final/acceleration_teapot.PNG
diff --git a/img/final/anti-aliasing-zoomed.PNG b/img/final/anti-aliasing-zoomed.PNG
diff --git a/img/final/anti-aliasing.PNG b/img/final/anti-aliasing.PNG
diff --git a/img/final/antialiased-zoomed.PNG b/img/final/antialiased-zoomed.PNG
diff --git a/img/final/diffuse.PNG b/img/final/diffuse.PNG
diff --git a/img/final/dof.PNG b/img/final/dof.PNG
diff --git a/img/final/gamma.PNG b/img/final/gamma.PNG
diff --git a/img/final/heatmap.png b/img/final/heatmap.png
diff --git a/img/final/imperfect_specular.PNG b/img/final/imperfect_specular.PNG
diff --git a/img/final/mesh_loading.PNG b/img/final/mesh_loading.PNG
diff --git a/img/final/no-anti-aliasing-zoomed.png b/img/final/no-anti-aliasing-zoomed.png
diff --git a/img/final/no-anti-aliasing.PNG b/img/final/no-anti-aliasing.PNG
diff --git a/img/final/noantialiased-zoomed.PNG b/img/final/noantialiased-zoomed.PNG
diff --git a/img/final/nogamma.PNG b/img/final/nogamma.PNG
diff --git a/img/final/perfect_specular.PNG b/img/final/perfect_specular.PNG
diff --git a/img/final/refractive.PNG b/img/final/refractive.PNG
diff --git a/img/final/stream_compact_closed.PNG b/img/final/stream_compact_closed.PNG
diff --git a/img/final/stream_compact_open - Copy.PNG b/img/final/stream_compact_open - Copy.PNG
diff --git a/img/final/stream_compact_open.PNG b/img/final/stream_compact_open.PNG
diff --git a/img/final/stream_compact_open_labels.PNG b/img/final/stream_compact_open_labels.PNG
diff --git a/img/final/violin.PNG b/img/final/violin.PNG
diff --git a/img/glass_ball.2022-10-09_17-19-17z.5000samp.png b/img/glass_ball.2022-10-09_17-19-17z.5000samp.png
diff --git a/img/graphs/acceleration_structures.png b/img/graphs/acceleration_structures.png
diff --git a/img/graphs/caching_bounces.png b/img/graphs/caching_bounces.png
diff --git a/img/graphs/caching_elapsed_time.png b/img/graphs/caching_elapsed_time.png
diff --git a/img/graphs/lbvh.png b/img/graphs/lbvh.png
diff --git a/img/graphs/material_sorting.png b/img/graphs/material_sorting.png
diff --git a/img/graphs/russian_roulette.png b/img/graphs/russian_roulette.png
diff --git a/img/graphs/stream_compact_kernels.png b/img/graphs/stream_compact_kernels.png
diff --git a/img/graphs/stream_compact_rays.png b/img/graphs/stream_compact_rays.png
diff --git a/img/graphs/table.png b/img/graphs/table.png
diff --git a/img/mesh.2022-10-10_00-39-44z.5000samp.png b/img/mesh.2022-10-10_00-39-44z.5000samp.png
diff --git a/img/performance_testing.2022-10-11_06-11-40z.10samp.png b/img/performance_testing.2022-10-11_06-11-40z.10samp.png
diff --git a/scenes/bunny-tree.txt b/scenes/bunny-tree.txt
@@ -0,0 +1,159 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   40
+
+// 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 aqua
+MATERIAL 3
+RGB         0.4 0.9 0.6
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse grey
+MATERIAL 4
+RGB         0.6 0.6 0.6
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Diffuse blue
+MATERIAL 5
+RGB         0.5 0.5 0.9
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Specular pink
+MATERIAL 6
+RGB         0 0 0
+SPECEX      0
+SPECRGB     0.9 0.6 0.9
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Transmissive orange
+MATERIAL 7
+RGB         0 0 0
+SPECEX      0
+SPECRGB     0.98 0.98 0.98
+REFL        1
+REFR        1
+REFRIOR     1.55
+EMITTANCE   0
+
+// Imperfect specular green
+MATERIAL 8
+RGB         0.6 1.0 0.5
+SPECEX      0
+SPECRGB     0.98 0.98 0.98
+REFL        1
+REFR        0
+REFRIOR     1.55
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        35
+ITERATIONS  3
+DEPTH       8
+FILE        performance_testing
+LENS_RADIUS 0.0
+FOCAL_DIST  29.5
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+
+
+// Ceiling light middle
+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       15 .01 10
+
+// Ceiling
+OBJECT 2
+cube
+material 2
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 20 10
+
+// Back wall
+OBJECT 3
+cube
+material 4
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 15
+
+// Left wall
+OBJECT 4
+cube
+material 3
+TRANS       -7 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       7 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Mesh
+OBJECT 6
+mesh dragon.obj
+material 8
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       1 1 1
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -6,7 +6,7 @@ SPECRGB     0 0 0
 REFL        0
 REFR        0
 REFRIOR     0
-EMITTANCE   5
+EMITTANCE   10
 
 // Diffuse white
 MATERIAL 1
@@ -40,9 +40,9 @@ EMITTANCE   0
 
 // Specular white
 MATERIAL 4
-RGB         .98 .98 .98
+RGB         0 0 0
 SPECEX      0
-SPECRGB     .98 .98 .98
+SPECRGB     0 .98 .98
 REFL        1
 REFR        0
 REFRIOR     0
@@ -51,11 +51,13 @@ EMITTANCE   0
 // Camera
 CAMERA
 RES         800 800
-FOVY        45
+FOVY        19.5
 ITERATIONS  5000
 DEPTH       8
 FILE        cornell
-EYE         0.0 5 10.5
+LENS_RADIUS 0.5
+FOCAL_DIST  29.5
+EYE         0.0 5 15.5
 LOOKAT      0 5 0
 UP          0 1 0
 

diff --git a/scenes/dragon.txt b/scenes/dragon.txt
@@ -0,0 +1,119 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   40
+
+// 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         0.13 0.13 0.13
+SPECEX      0
+SPECRGB     0.98 0.98 0.98
+REFL        1
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        35
+ITERATIONS  5000
+DEPTH       5
+FILE        mesh_cornell
+LENS_RADIUS 0.0
+FOCAL_DIST  29.5
+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       20 .01 10
+
+// Ceiling
+OBJECT 2
+cube
+material 2
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 20 10
+
+// Back wall
+OBJECT 3
+cube
+material 1
+TRANS       0 5 -5
+ROTAT       0 90 0
+SCALE       .01 10 20
+
+// Left wall
+OBJECT 4
+cube
+material 3
+TRANS       -10 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Right wall
+OBJECT 5
+cube
+material 3
+TRANS       10 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+// Mesh
+OBJECT 6
+mesh dragon.obj
+material 4
+TRANS       0 0 0
+ROTAT       0 0 0
+SCALE       1 1 1