CIS565-Fall-2022 · Furinner · Oct 27, 2022 · Oct 29, 2022 · Oct 30, 2022 · Nov 1, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,8 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/sample.h
+    src/bsdf.h
     src/ImGui/imconfig.h
 
 	src/ImGui/imgui.h

diff --git a/README.md b/README.md
@@ -3,11 +3,32 @@ CUDA Path Tracer
 
 **University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 3**
 
-* (TODO) YOUR NAME HERE
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
-
-### (TODO: Your README)
-
-*DO NOT* leave the README to the last minute! It is a crucial part of the
-project, and we will not be able to grade you without a good README.
-
+* XiaoyuDu  
+* Tested on: Windows 10, i9-11900KF @ 3.50GHz, RTX 3080 (Personal PC)
+
+### Description  
+This project built a GPU-based path tracer.
+
+### Feature  
+* I implemented all the features for part 1.  
+Below is a comparison between sorting rays by material type and not. Sorting material by type can shrink the branch condition in each warp, thus increase the overall efficiency. However, I actually find out that sorting by materials make each iterations much slower. My guess is that there are still not so many material types contained in the scene, thus not creating enough branch conditions. Below is a graph that compare the time(in ms) each iteration took with different depth and with sorting by materials ID or not.  
+![](./image/1.png)  
+Below is a comparison between caching intersections of the first bounce or not.  The graph records the time(in ms) to complete each iteration with different depth.  
+![](./image/2.png)  
+Here is an example image rendered with naive method, with depth of 5 and iterations of 5000.  
+![](./image/render_result/cornell_test2_naive_emittance20_depth_5_iterations_5000.png)  
+
+Feature for part 2.  
+* Direct Lighting & MIS sampling  
+Below is a image shown for direct light integrator. We can't see any glass on the color since we are trying to sample ray from the light source.  
+![](./image/MIS_compare/veach_direct_depth8_iterations1000.png)  
+Here in comparison, we used MIS, now we can see the light been reflected.  
+![](./image/MIS_compare/veach_mis_depth8_iterations1000.png)  
+* Full Light Integrator  
+In full light integrator, we sample MIS for each ray bounces around the scene to try to get the light information as much as possible. Thus, it can converge much faster than the naive integrator. Below is a scene rendered with naive integrator in 100 iterations.  
+![](./image/full_compare/cornell_test2_naive_emittance20_depth8_iterations100.png)  
+Below is the same scene rendered with full light integrator in 100 iterations. We can see that the image converge much faster than the naive integrator. Although each iterations now takes about 3 more times than the naive integrator, it still converge way more faster than the naive integrator.  
+![](./image/full_compare/cornell_test2_full_emittance20_depth8_iterations100.png)  
+* obj Mesh loading  
+I also implemented a mesh loading function to load a obj file.  
+![](./image/rabbit_depth8_iterations100.png)
diff --git a/image/1.png b/image/1.png
diff --git a/image/2.png b/image/2.png
diff --git a/image/MIS_compare/veach_direct_depth8_iterations1000.png b/image/MIS_compare/veach_direct_depth8_iterations1000.png
diff --git a/image/MIS_compare/veach_mis_depth8_iterations1000.png b/image/MIS_compare/veach_mis_depth8_iterations1000.png
diff --git a/image/full_compare/cornell_test2_full_emittance20_depth8_iterations100.png b/image/full_compare/cornell_test2_full_emittance20_depth8_iterations100.png
diff --git a/image/full_compare/cornell_test2_naive_emittance20_depth8_iterations100.png b/image/full_compare/cornell_test2_naive_emittance20_depth8_iterations100.png
diff --git a/image/rabbit_depth8_iterations100.png b/image/rabbit_depth8_iterations100.png
diff --git a/image/render_result/blooper1.png b/image/render_result/blooper1.png
diff --git a/image/render_result/cornell_test2_naive_emittance20_depth_5_iterations_5000.png b/image/render_result/cornell_test2_naive_emittance20_depth_5_iterations_5000.png
diff --git a/image/render_result/naive8Depth5000iter.png b/image/render_result/naive8Depth5000iter.png
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   40
 
 // Diffuse white
 MATERIAL 1

diff --git a/scenes/cornell_test.txt b/scenes/cornell_test.txt
@@ -0,0 +1,125 @@
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   20
+
+// 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       5
+FILE        cornell
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+
+
+// Ceiling light
+OBJECT 0
+square_plane
+material 0
+TRANS       0 9.99 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
+
+// Long Cube
+OBJECT 6
+cube
+material 1
+TRANS       -2 2.5 -2
+ROTAT       0 27.5 0
+SCALE        3 5 3
+
+// Short Cube
+OBJECT 7
+cube
+material 1
+TRANS       2 1.4 -0.75
+ROTAT       0 -17.5 0
+SCALE        3 3 3
diff --git a/scenes/cornell_test2.txt b/scenes/cornell_test2.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   20
+
+// 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 purple
+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  100
+DEPTH       8
+FILE        cornell
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+
+
+// Ceiling light
+OBJECT 0
+square_plane
+material 0
+TRANS       0 9.99 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