CIS565-Fall-2022 · Li-Jia-Jun · Oct 2, 2022 · Oct 2, 2022 · Oct 6, 2022 · Oct 6, 2022
diff --git a/BvhPerformanceAnalysis.xlsx b/BvhPerformanceAnalysis.xlsx
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ set(headers
     src/preview.h
     src/utilities.h
     src/ImGui/imconfig.h
+    src/setting.h
 
 	src/ImGui/imgui.h
     src/ImGui/imconfig.h
@@ -83,7 +84,13 @@ set(headers
      src/ImGui/imgui_internal.h 
      src/ImGui/imstb_rectpack.h 
      src/ImGui/imstb_textedit.h 
-     src/ImGui/imstb_truetype.h 
+     src/ImGui/imstb_truetype.h
+
+     src/tiny_obj_loader.h
+     src/texture.h
+     src/stb_image/stb_image.h
+     src/stb_image/stb_image_resize.h
+     src/stb_image/stb_image_write.h
     )
 
 set(sources
@@ -112,10 +119,11 @@ source_group(Headers FILES ${headers})
 source_group(Sources FILES ${sources})
 
 #add_subdirectory(src/ImGui)
-#add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+add_subdirectory(stream_compaction)
+
 
 cuda_add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers})
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ${LIBRARIES}
-    #stream_compaction  # TODO: uncomment if using your stream compaction
+    stream_compaction
     )
diff --git a/README.md b/README.md
@@ -3,11 +3,145 @@ 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)
+Jiajun Li
 
-### (TODO: Your README)
+Linkedin: [link](https://www.linkedin.com/in/jiajun-li-5063a4217/)
+
+Tested on: Windows 10, i7-12700 @ 2.10GHz, 32GB, RTX3080 12GB
+
+CUDA Compute Capability: 8.6
+
+## **Overview**
+
+This is a CUDA based Path Tracer project. It differs from traditional CPU based Path Tracer in applying  parallism for each ray and thus can coverging results in a much faster manner. 
+
+![](img/Renders/obj4.png)
+
+![](img/Renders/ball_trophy3.png)
+
+
+
+## **Features**
+
+The following features have been implemented for this project:
+
+- Path Tracer Core Algorithm
+- Refrection
+- Metallic property control
+- Stochastic Anti-Aliasing
+- Obj Loading
+- Texture Mapping with base color and normal map
+- Bounding Volume Hierarchy to accelerate object rendering
+- Spherical Skybox using raycast method
+
+
+## **Path Tracer Core**
+
+The core to utilize CUDA is to perform the same actions for all rays at the same time so we can devide path trace procedures into different CUDA kernels:
+
+1. GenerateRayKernel: Shooting rays for each pixel from screen. 
+
+2. IntersectionKernel: Perform rays intersection tests.
+
+3. ShadeKernel: Accumulate ray color results along the way and add it to the final output.
+
+Two of the basic diffuse and specular properties are implemented in this project. For diffuse property, spawned ray direction is randomly picked in the hemisphere. For specular, the ray direction is generated by perfect reflection.
+
+![Diffuse](img/Renders/cornell.png)
+
+![Specular](img/Renders/cornell2.png)
+
+## **Refraction**
+
+Implemented using [Schlick's approximation](https://en.wikipedia.org/wiki/Schlick%27s_approximation#:~:text=In%203D%20computer%20graphics%2C%20Schlick's,(surface)%20between%20two%20media.). Since only one ray is traced for each pixel in one iteration, picking between reflection ray or refraction ray is achieved by comparing coefficients to a ramdon number. If the coefficent R for reflection is greater than the random number, then the program will trace reflection. Otherwise it will trace refraction ray.
+
+![Refraction ROI = 1.3](img/Renders/refract.png)
+
+### **Metallic and Specular Control**
+
+Metallic property is implemented by coloring the reflection ray with material color. The metallilc coefficient measures the probability of the reflection ray colored by material color. The same idea applies to controling the amount of specular property. 
+
+| Specular 0.2 | Specular 0.5 | Specular 1.0 |      
+| ---------------------------------| ----------------------------------|----------------------------------|
+| ![](img/Renders/specular02.png)   | ![](img/Renders/specular06.png)   |![](img/Renders/specular10.png) |
+
+| Metallic 0.0 | Metallic 0.3 | Metallic 1.0 |      
+| ---------------------------------| ----------------------------------|----------------------------------|
+| ![](img/Renders/metallic00.png)   | ![](img/Renders/metallic03.png)   |![](img/Renders/metallic10.png) |
+
+### **Anti-Aliasing**
+
+Anti-Aliasing is achieved by jittering the generated rays from camera so that each pixel can get more scene information from a larger scale.
+
+| No Anti-Aliasing                 | Anti-Aliasing                     |                 
+| ---------------------------------| ----------------------------------|
+| ![](img/Renders/anti-aliasing1.png)   | ![](img/Renders/anti-aliasing2.png)   |
+
+## **Obj Loading and Texture Mapping**
+
+Load obj files with [tiny_obj_loader](https://github.com/tinyobjloader/tinyobjloader). The loaded obj will be assembled into triangles for intersection and shading later.
+
+For textures, [stb_image](https://github.com/nothings/stb) are used to load base color textures and normal maps. Note that for normal maps, RGB values need to be converted into normal values first:
+
+    normal = rgb * 2.0 - 1.0 
+
+Another thing to be aware is that the read normal is in tangent space. A TBN matrix is then used to convert it to model space.
+
+![Warcraft - single obj no texture](img/Renders/obj1.png)
+
+![Arsenal - multi objs no texture](img/Renders/obj3.png)
+
+![Arsenal 2 - multi objs with textures and normal maps](img/Renders/obj4.png)
+
+## **Bounding Volume Hierarchy**
+
+This project mostly adapts the recursive Bounding Volume Hierarchy build method from [PBRT](https://www.pbr-book.org/3ed-2018/Primitives_and_Intersection_Acceleration/Bounding_Volume_Hierarchies#fragment-BVHAccelLocalDeclarations-1). The difference is that this program will construct a BVH for each obj insead of the whole scene. Algorithm can be described as the following:
+
+1. Construct a BVH tree structure by dividing and assigning triangles to BVH nodes by Surface Area Heuristic method.
+
+2. Convert the tree structure into a compact array by copying tree nodes into lienar BVH nodes.
+
+3. Once the first two steps are done in CPU side, pass the linar BVH nodes array to device before iteration begins.
+
+4. During intersection tests, the tests will only proceed when the rays hit the linear node bouding volume.
+
+By skipping the unecessary intersection tests with out-of-bound trianlges, this method makes a great improvement in rendering speed. Belows are the performance analysis of BVH vs. no BVH:
+
+![](img/bvh_analysis.png)
+
+
+### **Skybox**
+
+This project implements a spherical skybox using raycast method. Ray hits skybox when it has no intersection with any of the objects in scene. Ray direction will then be converted into 2D UV coordinate by angular displacement. Finally the project uses the same sample methods from obj texturing to sample skybox texure. Note that this requires the skybox texture be spherically mapped beforehand. 
+
+![skybox](img/Renders/skybox.gif)
+
+
+## **Future Improvements**
+
+- HDR texture support. Currently the program does not support HDR image.
+
+- G buffer. Currently the program renders objects in their loading orders and we need to manage their orders carefully for now.
+
+- More texture mapping such as roughness and specular texture.
+
+- More material properties. 
+
+## **Bloppers**
+
+Mistaken useage of n1, n2 in Schlick's approximation
+
+![](img/Bloopers/1.png)
+
+Forgotting to transform barycentric coordinate into normal coordinate in ray triangle intersection tests
+
+![](img/Bloopers/2.png)
+
+
+## **Additional Reference**
+
+Bary Position: https://www.scratchapixel.com/lessons/3d-basic-rendering/ray-tracing-rendering-a-triangle/barycentric-coordinates
+
+Normal Mapping: https://learnopengl.com/Advanced-Lighting/Normal-Mapping
 
-*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.
 
diff --git a/img/Bloopers/1.png b/img/Bloopers/1.png
diff --git a/img/Bloopers/2.png b/img/Bloopers/2.png
diff --git a/img/Bloopers/description.txt b/img/Bloopers/description.txt
@@ -0,0 +1,5 @@
+1:
+mistakenly use n1 n2 value for Schlick's approximation
+
+2.
+glm::RayTriangleIntersection gives back barycentric coordinate rather than normal coordinate
diff --git a/img/Renders/anti-aliasing1.png b/img/Renders/anti-aliasing1.png
diff --git a/img/Renders/anti-aliasing2.png b/img/Renders/anti-aliasing2.png
diff --git a/img/Renders/ball_trophy.png b/img/Renders/ball_trophy.png
diff --git a/img/Renders/ball_trophy2.png b/img/Renders/ball_trophy2.png
diff --git a/img/Renders/ball_trophy3.png b/img/Renders/ball_trophy3.png
diff --git a/img/Renders/cornell.png b/img/Renders/cornell.png
diff --git a/img/Renders/cornell2.png b/img/Renders/cornell2.png
diff --git a/img/Renders/metallic00.png b/img/Renders/metallic00.png
diff --git a/img/Renders/metallic03.png b/img/Renders/metallic03.png
diff --git a/img/Renders/metallic05.png b/img/Renders/metallic05.png
diff --git a/img/Renders/metallic10.png b/img/Renders/metallic10.png
diff --git a/img/Renders/obj1.png b/img/Renders/obj1.png
diff --git a/img/Renders/obj2.png b/img/Renders/obj2.png
diff --git a/img/Renders/obj3.png b/img/Renders/obj3.png
diff --git a/img/Renders/obj4.png b/img/Renders/obj4.png
diff --git a/img/Renders/refract.png b/img/Renders/refract.png
diff --git a/img/Renders/skybox.gif b/img/Renders/skybox.gif
diff --git a/img/Renders/specular02.png b/img/Renders/specular02.png
diff --git a/img/Renders/specular06.png b/img/Renders/specular06.png
diff --git a/img/Renders/specular10.png b/img/Renders/specular10.png
diff --git a/img/basketball_no_normal_map.png b/img/basketball_no_normal_map.png
diff --git a/img/basketball_normal_map.png b/img/basketball_normal_map.png
diff --git a/img/bvh_analysis.png b/img/bvh_analysis.png
diff --git a/img/crate_no_normal_map.png b/img/crate_no_normal_map.png
diff --git a/img/crate_normal_map.png b/img/crate_normal_map.png
diff --git a/img/table.png b/img/table.png
diff --git a/scenes/ball_trophy.txt b/scenes/ball_trophy.txt
@@ -0,0 +1,113 @@
+SKYBOX ../scenes/skybox.jpg
+
+// Emissive material (light)
+MATERIAL 0
+RGB         1 1 1
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   10
+
+
+// Wall mat
+MATERIAL 1
+RGB         .3 .3 .3
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+
+// Trophy Mat
+MATERIAL 2
+RGB         0.99 0.84 .0
+SPECEX      0
+SPECRGB     .98 .98 .98
+METALLIC	0.8
+REFL        0.8
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+
+// Basketball Mat
+MATERIAL 3
+RGB 		1 1 1
+TEXTURE		../scenes/objs/Basketball2/texture/BaseColor.png
+NORMALMAP	../scenes/objs/Basketball2/texture/Normal.png
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// Table Mat
+MATERIAL 4
+RGB 		1 1 1
+TEXTURE		../scenes/objs/Table2/BaseColor.tga
+NORMALMAP	../scenes/objs/Table2/Normal.tga
+SPECEX      0
+SPECRGB     0 0 0
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+
+
+// Camera
+CAMERA
+RES         800 800
+FOVY        30	//45
+ITERATIONS  10000
+DEPTH      	5
+FILE        cornell
+EYE         0 15 25
+LOOKAT      0 15 0
+UP          0 1 0
+
+
+
+
+// Ceiling light
+OBJECT 0
+cube
+material 0
+TRANS       0 50 0
+ROTAT       0 0 0
+SCALE       40 0.3 40
+
+
+// Table
+//OBJECT 1
+object
+../scenes/objs/Table2/table.obj
+material 4
+TRANS       0 -32 -8
+ROTAT       0 0 0
+SCALE       0.35 0.35 0.35
+
+// Object Basketball
+//OBJECT 2
+object
+../scenes/objs/Basketball2/model.obj
+material 3
+TRANS       -5 0 0
+ROTAT       -10 10 -15
+SCALE       8 8 8
+
+
+// Object Trophy
+//OBJECT 3
+object
+../scenes/objs/trophy2.obj
+material 2
+TRANS       10 1 -10
+ROTAT       0 0 0
+SCALE       55 55 55
+
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