CIS565-Fall-2018 · Zichuanyun · Sep 28, 2018 · Oct 1, 2018 · Oct 1, 2018 · Oct 2, 2018
diff --git a/.gitignore b/.gitignore
@@ -189,7 +189,6 @@ install_manifest.txt
 *.slo
 *.lo
 *.o
-*.obj
 
 # Precompiled Headers
 *.gch
@@ -276,7 +275,6 @@ artifacts/
 *_i.h
 *.ilk
 *.meta
-*.obj
 *.pch
 *.pdb
 *.pgc

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,7 @@ endif()
 
 include_directories(.)
 #add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+add_subdirectory(tiny_obj_loader)
 add_subdirectory(src)
 
 cuda_add_executable(${CMAKE_PROJECT_NAME}
@@ -82,6 +83,7 @@ cuda_add_executable(${CMAKE_PROJECT_NAME}
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
     src
+	tiny_obj_loader
     #stream_compaction  # TODO: uncomment if using your stream compaction
     ${CORELIBS}
     )

diff --git a/README.md b/README.md
@@ -1,13 +1,55 @@
-CUDA Path Tracer
-================
+# 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)
+* Zichuan Yu
+  * [LinkedIn](https://www.linkedin.com/in/zichuan-yu/), [Behance](https://www.behance.net/zainyu717ebcc)
+* Tested on: Windows 10.0.17134 Build 17134, i7-4710 @ 2.50GHz 16GB, GTX 980m 4096MB GDDR5
 
-### (TODO: Your README)
+<p align="middle">
+  <img src="img/cover1.png" width="432" />
+  <img src="img/cover2.png" width="432" /> 
+</p>
 
-*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.
+## Features
 
+- Diffuse and perfectly specular shading kernel
+- Path termination with stream compaction
+- Sort by material
+- Caching first bounce
+- Refraction with fresnel term
+- Stochastic sampled antialiasing
+- OBJ file loading
+
+## Feature Demo
+
+### Antialiasing
+
+![AA](img/AA_compare.jpg)
+
+### Refraction with Fresnel
+
+![refraction](img/refraction.png)
+
+### OBJ Loading
+
+![obj_loading](img/obj_loading.png)
+
+## Analysis
+
+### Cache First Bounce
+
+![cache_first_bounce](img/cache_first_bounce.png)
+
+### Sort by Material Analysis
+
+![material_sort](img/material_sort.png)
+
+### Stream Compaction Analysis
+
+![stream_compaction](img/stream_compaction.png)
+
+## Credits
+
+- Android Model Credit: https://free3d.com/3d-model/android-44714.html
+- tiny_obj_loader Credit: https://github.com/syoyo/tinyobjloader
diff --git a/img/AA.png b/img/AA.png
diff --git a/img/AA_compare.jpg b/img/AA_compare.jpg
diff --git a/img/cache_first_bounce.png b/img/cache_first_bounce.png
diff --git a/img/cover1.png b/img/cover1.png
diff --git a/img/cover2.png b/img/cover2.png
diff --git a/img/material_sort.png b/img/material_sort.png
diff --git a/img/nonAA.png b/img/nonAA.png
diff --git a/img/obj_loading.png b/img/obj_loading.png
diff --git a/img/refraction.png b/img/refraction.png
diff --git a/img/stream_compaction.png b/img/stream_compaction.png
diff --git a/mesh/android.mtl b/mesh/android.mtl
@@ -0,0 +1,22 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 21.10.2014 16:39:03
+
+newmtl wire_061135006
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.239216 0.529412 0.023529
+	Kd 0.239216 0.529412 0.023529
+	Ks 0.350000 0.350000 0.350000
+
+newmtl wire_255255255
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 1.000000 1.000000 1.000000
+	Kd 1.000000 1.000000 1.000000
+	Ks 0.350000 0.350000 0.350000
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,7 +189,6 @@ install_manifest.txt @@
     *.slo
     *.lo
     *.o
-    *.obj
     # Precompiled Headers
     *.gch
@@ Expand Down Expand Up / @@ -276,7 +275,6 @@ artifacts/ @@
     *_i.h
     *.ilk
     *.meta
-    *.obj
     *.pch
     *.pdb
     *.pgc
@@ Expand Down @@