CIS565-Fall-2022 · NicholasMoon · Sep 25, 2022 · Oct 10, 2022 · Oct 11, 2022 · Oct 11, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,7 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/tiny_obj_loader.h
     src/ImGui/imconfig.h
 
 	src/ImGui/imgui.h

diff --git a/README.md b/README.md
diff --git a/img/bloops/bad_diffuse0.PNG b/img/bloops/bad_diffuse0.PNG
diff --git a/img/bloops/bad_diffuse1.PNG b/img/bloops/bad_diffuse1.PNG
diff --git a/img/bloops/bad_shared_mem.PNG b/img/bloops/bad_shared_mem.PNG
diff --git a/img/bloops/bloop.PNG b/img/bloops/bloop.PNG
diff --git a/img/bloops/bloopmat.PNG b/img/bloops/bloopmat.PNG
diff --git a/img/bloops/bloopmat2.PNG b/img/bloops/bloopmat2.PNG
diff --git a/img/bloops/bloopy.PNG b/img/bloops/bloopy.PNG
diff --git a/img/bloops/blue.PNG b/img/bloops/blue.PNG
diff --git a/img/bloops/boopep.PNG b/img/bloops/boopep.PNG
diff --git a/img/bloops/dfg.PNG b/img/bloops/dfg.PNG
diff --git a/img/bloops/diffuse_almost_works.PNG b/img/bloops/diffuse_almost_works.PNG
diff --git a/img/bloops/diffuse_almost_works_still.PNG b/img/bloops/diffuse_almost_works_still.PNG
diff --git a/img/bloops/fresnel.PNG b/img/bloops/fresnel.PNG
diff --git a/img/bloops/io2.PNG b/img/bloops/io2.PNG
diff --git a/img/bloops/io3.PNG b/img/bloops/io3.PNG
diff --git a/img/bloops/lotsadragons.PNG b/img/bloops/lotsadragons.PNG
diff --git a/img/bloops/notquire.PNG b/img/bloops/notquire.PNG
diff --git a/img/bloops/oi.PNG b/img/bloops/oi.PNG
diff --git a/img/bloops/refractiondoesntwork.PNG b/img/bloops/refractiondoesntwork.PNG
diff --git a/img/bloops/thinlens.PNG b/img/bloops/thinlens.PNG
diff --git a/img/figures/LTE.png b/img/figures/LTE.png
diff --git a/img/figures/RRclosedruntime.png b/img/figures/RRclosedruntime.png
diff --git a/img/figures/RRopenruntime.png b/img/figures/RRopenruntime.png
diff --git a/img/figures/aa.png b/img/figures/aa.png
diff --git a/img/figures/aa_fig.PNG b/img/figures/aa_fig.PNG
diff --git a/img/figures/aadof.png b/img/figures/aadof.png
diff --git a/img/figures/bvhruntime.png b/img/figures/bvhruntime.png
diff --git a/img/figures/firstbounce.png b/img/figures/firstbounce.png
diff --git a/img/figures/matsort4.png b/img/figures/matsort4.png
diff --git a/img/figures/matsort8.png b/img/figures/matsort8.png
diff --git a/img/figures/no_aa.png b/img/figures/no_aa.png
diff --git a/img/figures/no_aa_fig.PNG b/img/figures/no_aa_fig.PNG
diff --git a/img/figures/streamcompactclosedruntime.png b/img/figures/streamcompactclosedruntime.png
diff --git a/img/figures/streamcompactopenruntime.png b/img/figures/streamcompactopenruntime.png
diff --git a/img/figures/streamcompactrays.png b/img/figures/streamcompactrays.png
diff --git a/img/figures/streamcompactraysopen.png b/img/figures/streamcompactraysopen.png
diff --git a/img/renders/bsdf_weight.PNG b/img/renders/bsdf_weight.PNG
diff --git a/img/renders/cornell_561.PNG b/img/renders/cornell_561.PNG
diff --git a/img/renders/depth_1.PNG b/img/renders/depth_1.PNG
diff --git a/img/renders/depth_2.PNG b/img/renders/depth_2.PNG
diff --git a/img/renders/depth_3.PNG b/img/renders/depth_3.PNG
diff --git a/img/renders/depth_4.PNG b/img/renders/depth_4.PNG
diff --git a/img/renders/depth_5.PNG b/img/renders/depth_5.PNG
diff --git a/img/renders/depth_8.PNG b/img/renders/depth_8.PNG
diff --git a/img/renders/depth_of_field.PNG b/img/renders/depth_of_field.PNG
diff --git a/img/renders/diffuse.PNG b/img/renders/diffuse.PNG
diff --git a/img/renders/dragon.PNG b/img/renders/dragon.PNG
diff --git a/img/renders/dragons.PNG b/img/renders/dragons.PNG
diff --git a/img/renders/dragons2.PNG b/img/renders/dragons2.PNG
diff --git a/img/renders/dragons2_clipped.png b/img/renders/dragons2_clipped.png
diff --git a/img/renders/hdr_no_gamma.PNG b/img/renders/hdr_no_gamma.PNG
diff --git a/img/renders/iter_1.PNG b/img/renders/iter_1.PNG
diff --git a/img/renders/iter_10.PNG b/img/renders/iter_10.PNG
diff --git a/img/renders/iter_100.PNG b/img/renders/iter_100.PNG
diff --git a/img/renders/iter_100_bsdf_mis.PNG b/img/renders/iter_100_bsdf_mis.PNG
diff --git a/img/renders/iter_100_light_mis.PNG b/img/renders/iter_100_light_mis.PNG
diff --git a/img/renders/iter_100_mis.PNG b/img/renders/iter_100_mis.PNG
diff --git a/img/renders/iter_5.PNG b/img/renders/iter_5.PNG
diff --git a/img/renders/iter_50.PNG b/img/renders/iter_50.PNG
diff --git a/img/renders/light_weight.PNG b/img/renders/light_weight.PNG
diff --git a/img/renders/no_aa.PNG b/img/renders/no_aa.PNG
diff --git a/img/renders/no_hdr_gamma.PNG b/img/renders/no_hdr_gamma.PNG
diff --git a/img/renders/no_hdr_no_gamma.PNG b/img/renders/no_hdr_no_gamma.PNG
diff --git a/img/renders/objs.PNG b/img/renders/objs.PNG
diff --git a/img/renders/objs_clipped.png b/img/renders/objs_clipped.png
diff --git a/img/renders/plastic.PNG b/img/renders/plastic.PNG
diff --git a/img/renders/spec_brdf.PNG b/img/renders/spec_brdf.PNG
diff --git a/img/renders/spec_btdf.PNG b/img/renders/spec_btdf.PNG
diff --git a/img/renders/spec_glass.PNG b/img/renders/spec_glass.PNG
diff --git a/img/renders/spec_plastic.PNG b/img/renders/spec_plastic.PNG
diff --git a/img/renders/teapot.PNG b/img/renders/teapot.PNG
diff --git a/img/renders/teapot_clipped.png b/img/renders/teapot_clipped.png
diff --git a/img/renders/teapots.PNG b/img/renders/teapots.PNG
diff --git a/img/renders/two_bunnies.PNG b/img/renders/two_bunnies.PNG
diff --git a/img/renders/wireframe.PNG b/img/renders/wireframe.PNG
diff --git a/scenes/BSDFs.txt b/scenes/BSDFs.txt
@@ -0,0 +1,182 @@
+// Emissive material (light)
+MATERIAL 		0
+R_COLOR        	20 30 40
+T_COLOR     	0 0 0
+DIFFUSE_BRDF
+IOR    			0
+EMITTANCE   	1
+
+// Diffuse white
+MATERIAL 1
+R_COLOR         0.24 0.25 0.42
+T_COLOR     	0 0 0
+DIFFUSE_BRDF	
+IOR    			0
+EMITTANCE   	0
+
+// Diffuse red
+MATERIAL 2
+R_COLOR         0.14 0.12 0.1
+T_COLOR     	0 0 0
+DIFFUSE_BRDF
+IOR    			0
+EMITTANCE   	0
+
+// Diffuse green
+MATERIAL 3
+R_COLOR        	0.9 0.3 0.1
+T_COLOR     	0 0 0
+DIFFUSE_BRDF
+IOR    			0
+EMITTANCE   	0
+
+// Specular white
+MATERIAL 4
+R_COLOR         0.72 0.71 0.75
+T_COLOR     	0.35 0.95 0.95
+DIFFUSE_BRDF
+IOR    			1.8
+EMITTANCE   	0
+
+// Specular white
+MATERIAL 5
+R_COLOR         0.72 0.71 0.75
+T_COLOR     	0.95 0.95 0.95
+SPEC_BRDF
+IOR    			1.55
+EMITTANCE   	0
+
+// Camera
+CAMERA
+RES         1920 1080
+FOVY        19.5
+ITERATIONS  100
+DEPTH       8
+FILE        cornell
+FOCAL_DISTANCE	14
+LENS_RADIUS		0.0
+EYE         0.0 -4.5 14
+LOOKAT      0 0 0
+UP          0 1 0
+
+
+// Ceiling light
+OBJECT 0
+squareplane
+material 0
+TRANS       0 5.45 0
+ROTAT       90 0 0
+SCALE       3 3 1
+
+// Floor
+OBJECT 1
+squareplane
+material 1
+TRANS       0 -2.5 0
+ROTAT       270 0 0
+SCALE       20 10 10
+
+// Ceiling
+OBJECT 2
+squareplane
+material 1
+TRANS       0 7.5 0
+ROTAT       90 0 0
+SCALE       20 10 10
+
+// Back wall
+OBJECT 3
+squareplane
+material 2
+TRANS       0 2.5 -5
+ROTAT       0 0 0
+SCALE       20 10 10
+
+// Left wall
+OBJECT 4
+squareplane
+material 2
+TRANS       -10 2.5 0
+ROTAT       0 90 0
+SCALE       10 10 10
+
+// Right wall
+OBJECT 5
+squareplane
+material 2
+TRANS       10 2.5 0
+ROTAT       0 270 0
+SCALE       10 10 10
+
+// front wall
+OBJECT 6
+squareplane
+material 2
+TRANS       0 2.5 5
+ROTAT       180 0 0
+SCALE       20 10 10
+
+// OBJTEST
+OBJECT 7
+mesh
+../scenes/BSDFs/coney.obj
+material 4
+TRANS       0 2 0
+ROTAT       0 0 0
+SCALE       6 6 6
+
+// OBJTEST
+OBJECT 8
+cube
+material 3
+TRANS       6 -1 -3
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// OBJTEST
+OBJECT 9
+cube
+material 3
+TRANS       -6 -1 -3
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// OBJTEST
+OBJECT 10
+cube
+material 3
+TRANS       6 -1.5 -0.25
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// OBJTEST
+OBJECT 11
+cube
+material 3
+TRANS       -6 -1.5 -0.25
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// OBJTEST
+OBJECT 12
+cube
+material 3
+TRANS       6 -2.0 1.5
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// OBJTEST
+OBJECT 13
+cube
+material 3
+TRANS       -6 -2.0 1.5
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// OBJTEST
+OBJECT 14
+cube
+material 3
+TRANS       0 0 -5
+ROTAT       0 0 0
+SCALE       7 5 0.5
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -1,16 +1,16 @@
 // Emissive material (light)
 MATERIAL 0
-RGB         1 1 1
+RGB         40 40 40
 SPECEX      0
 SPECRGB     0 0 0
 REFL        0
 REFR        0
 REFRIOR     0
-EMITTANCE   5
+EMITTANCE   1
 
 // Diffuse white
 MATERIAL 1
-RGB         .98 .98 .98
+RGB         0.85 0.81 0.78
 SPECEX      0
 SPECRGB     0 0 0
 REFL        0
@@ -20,7 +20,7 @@ EMITTANCE   0
 
 // Diffuse red
 MATERIAL 2
-RGB         .85 .35 .35
+RGB         0.63 0.065 0.05
 SPECEX      0
 SPECRGB     0 0 0
 REFL        0
@@ -30,7 +30,7 @@ EMITTANCE   0
 
 // Diffuse green
 MATERIAL 3
-RGB         .35 .85 .35
+RGB         0.14 0.45 0.091
 SPECEX      0
 SPECRGB     0 0 0
 REFL        0
@@ -40,77 +40,101 @@ EMITTANCE   0
 
 // Specular white
 MATERIAL 4
-RGB         .98 .98 .98
+RGB         0.85 0.81 0.78
 SPECEX      0
-SPECRGB     .98 .98 .98
-REFL        1
+SPECRGB     0 0 0
+REFL        0
 REFR        0
 REFRIOR     0
 EMITTANCE   0
 
 // Camera
 CAMERA
-RES         800 800
-FOVY        45
+RES         1024 1024
+FOVY        19.5
 ITERATIONS  5000
-DEPTH       8
+DEPTH       5
 FILE        cornell
-EYE         0.0 5 10.5
-LOOKAT      0 5 0
+EYE         0.0 2.5 18
+LOOKAT      0 2.5 0
 UP          0 1 0
 
 
 // Ceiling light
 OBJECT 0
-cube
+squareplane
 material 0
-TRANS       0 10 0
-ROTAT       0 0 0
-SCALE       3 .3 3
+TRANS       0 7.45 0
+ROTAT       90 0 0
+SCALE       3 3 1
 
 // Floor
 OBJECT 1
-cube
+squareplane
 material 1
-TRANS       0 0 0
-ROTAT       0 0 0
-SCALE       10 .01 10
+TRANS       0 -2.5 0
+ROTAT       270 0 0
+SCALE       10 10 10
 
 // Ceiling
 OBJECT 2
-cube
+squareplane
 material 1
-TRANS       0 10 0
-ROTAT       0 0 90
-SCALE       .01 10 10
+TRANS       0 7.5 0
+ROTAT       90 0 0
+SCALE       10 10 10
 
 // Back wall
 OBJECT 3
-cube
+squareplane
 material 1
-TRANS       0 5 -5
-ROTAT       0 90 0
-SCALE       .01 10 10
+TRANS       0 2.5 -5
+ROTAT       0 0 0
+SCALE       10 10 10
 
 // Left wall
 OBJECT 4
-cube
+squareplane
 material 2
-TRANS       -5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
+TRANS       -5 2.5 0
+ROTAT       0 90 0
+SCALE       10 10 10
 
 // Right wall
 OBJECT 5
-cube
+squareplane
 material 3
-TRANS       5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
+TRANS       5 2.5 0
+ROTAT       0 270 0
+SCALE       10 10 10
 
-// Sphere
+// front wall
 OBJECT 6
-sphere
+squareplane
+material 1
+TRANS       0 2.5 5
+ROTAT       180 0 0
+SCALE       10 10 10
+
+// long cube
+OBJECT 7
+cube
+material 4
+TRANS       -2 0 -3
+ROTAT       0 27.5 0
+SCALE       3 6 3
+
+// short cube
+OBJECT 8
+cube
+material 4
+TRANS       2 -1 -0.75
+ROTAT       0 -17.5 0
+SCALE       3 3 3
+
+
+// OBJTEST
+OBJ_OBJECT 9 ../scenes/bunny.obj
 material 4
 TRANS       -1 4 -1
 ROTAT       0 0 0