CIS565-Fall-2020 · WeiyuDu · Sep 30, 2020 · Sep 30, 2020 · Oct 7, 2020 · Oct 8, 2020
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
     )
 
 set(sources

diff --git a/README.md b/README.md
@@ -3,11 +3,65 @@ 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)
+* Weiyu Du
+* Tested on: CETS Virtual Lab
 
-### (TODO: Your README)
+### Part 2
+### Refraction
+Refraction rendering with Frensel effects using Schlick's approximation
 
-*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.
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/refract.png" width=300/>
 
+### Depth of Field
+From left to right: focus on foreground, focus on background
+
+<nobr><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/dof_close.png" width=300/>
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/dof_far.png" width=300/></nobr>
+
+### Stochastic Sampled Antialiasing
+From left to right: rendering with antialiasing, rendering without antialiasing. Please zoom in to see the difference on the edge of the sphere. The left has a smooth edge while the one on the right is more rigged.
+
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/antialiasing.png" width=300/><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/ref_antialiasing.png" width=300/>
+
+### Arbitrary OBJ Mesh Loader
+
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/wahoo.png" width=300/>
+Performance comparison regarding bounding volume interseciton culling (measured in time per iteration):
+
+| OBJ file | bounding volume intersection culling | naive implementation |
+| ---      | ---                                  | ---                  |
+| Sphere   | 98.122 | 129.479 |
+| Wahoo    | 1068.55 | 1453.84 |
+| Stanford Bunny | 11970.6 | 22964.9 |
+
+We observe that such optimization reduces the run time per iteration consistenly across different obj files, specifically, the more vertices an obj file has, we observe more significant improvement using bounding volume intersection culling.
+
+### Stratified Sampling
+
+1) Comparison of stratified sampling (10x10 grid, left) and uniform random sampling (right) at 5000 iterations
+
+<nobr><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/strat_5000.png" width=300/><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/ref_5000.png" width=300/></nobr>
+
+2) Comparison of stratified sampling (10x10 grid, left) and uniform random sampling (right) at 100 iterations
+
+<nobr><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/strat_100iter_10x10.png" width=300/><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/ref_100iter_10x10.png" width=300/></nobr>
+
+### Motion Blur
+1) Defined motion in scene file
+
+<nobr><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/defined_motion1.png" width=300/><img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/defined_motion2.png" width=300/></nobr>
+
+2) User input camera motion (user drag the camera while rendering)
+
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/master/img/real_time_motion.png" width=300/>
+
+### Part 1
+### Render Result
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/mid-project-submission/img/render_res.png" width=300/>
+
+### Analysis
+1) Plot of elapsed time per iteration versus max ray depth (timed when sorting_material set to true)
+<img src="https://github.com/WeiyuDu/Project3-CUDA-Path-Tracer/blob/mid-project-submission/img/hw3_plot.png"/>
+
+- We expected that sorting the rays/path segments by material should improve the performance, because this will make the threads more likely to finish at around the same time, reducing waiting time for threads in the same warp. However, in reality we found that rendering without sorting is actually significantly faster. This may because that there isn't a variety of different materials in the scene. Since we're sorting the entire set of rays, this operation takes much more time than it saves.
+- From the plot above we see that increasing max ray depth results in longer run time per iteration. Rendering using first bounce cache is consistently faster than rendering without cache, though not by a large margin. This is expected as we save time by avoiding the initial intersection computation.
diff --git a/img/antialiasing.png b/img/antialiasing.png
diff --git a/img/defined_motion1.png b/img/defined_motion1.png
diff --git a/img/defined_motion2.png b/img/defined_motion2.png
diff --git a/img/dof_close.png b/img/dof_close.png
diff --git a/img/dof_far.png b/img/dof_far.png
diff --git a/img/real_time_motion.png b/img/real_time_motion.png
diff --git a/img/ref_100iter_10x10.png b/img/ref_100iter_10x10.png
diff --git a/img/ref_5000.png b/img/ref_5000.png
diff --git a/img/ref_antialiasing.png b/img/ref_antialiasing.png
diff --git a/img/refract.png b/img/refract.png
diff --git a/img/strat_100iter_10x10.png b/img/strat_100iter_10x10.png
diff --git a/img/strat_5000.png b/img/strat_5000.png
diff --git a/img/wahoo.png b/img/wahoo.png
diff --git a/scenes/cornell.txt b/scenes/cornell.txt
@@ -10,7 +10,7 @@ EMITTANCE   5
 
 // Diffuse white
 MATERIAL 1
-RGB         .98 .98 .98
+RGB         .98 0.98 0.98
 SPECEX      0
 SPECRGB     0 0 0
 REFL        0
@@ -48,6 +48,36 @@ REFR        0
 REFRIOR     0
 EMITTANCE   0
 
+// Glass
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     1.5
+EMITTANCE   0
+
+// Glass
+MATERIAL 6
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Glass
+MATERIAL 7
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     2.5
+EMITTANCE   0
+
 // Camera
 CAMERA
 RES         800 800
@@ -111,7 +141,39 @@ SCALE       .01 10 10
 // Sphere
 OBJECT 6
 sphere
-material 4
-TRANS       -1 4 -1
+material 5
+TRANS       -3 4 -1
 ROTAT       0 0 0
 SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 5
+TRANS       0 4 -1
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// Sphere
+OBJECT 8
+sphere
+material 5
+TRANS       3 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Cube
+OBJECT 9
+cube
+material 2
+TRANS       3 4 -1
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// Cube
+OBJECT 10
+cube
+material 3
+TRANS       -3 4 -1
+ROTAT       0 0 0
+SCALE       1 1 1
diff --git a/scenes/cornell_move.txt b/scenes/cornell_move.txt
@@ -0,0 +1,179 @@
+// 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 0.98 0.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
+
+// Glass
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     1.5
+EMITTANCE   0
+
+// Glass
+MATERIAL 6
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     2
+EMITTANCE   0
+
+// Glass
+MATERIAL 7
+RGB         .98 .98 .98
+SPECEX      0.2
+SPECRGB     .98 .98 .98
+REFL        1
+REFR        1
+REFRIOR     2.5
+EMITTANCE   0
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        45
+ITERATIONS  5000
+DEPTH       8
+FILE        cornell
+EYE         0.0 5 10.5
+LOOKAT      0 5 0
+UP          0 1 0
+//MOVE        -0.15 0 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
+
+// Sphere
+OBJECT 6
+sphere
+material 5
+TRANS       -3 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 5
+TRANS       0 4 -1
+ROTAT       0 0 0
+SCALE       2 2 2
+
+// Sphere
+OBJECT 8
+sphere
+material 5
+TRANS       3 4 -1
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Cube
+OBJECT 9
+cube
+material 2
+TRANS       3 4 -1
+ROTAT       0 0 0
+SCALE       1 1 1
+
+// Cube
+OBJECT 10
+cube
+material 3
+TRANS       -3 4 -1
+ROTAT       0 0 0
+SCALE       1 1 1