CIS565-Fall-2016 · aksris · Oct 1, 2016 · Oct 2, 2016 · Oct 2, 2016 · Oct 4, 2016
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.vcxproj
 *.xcodeproj
 build
+build2015
 
 # Created by https://www.gitignore.io/api/linux,osx,sublimetext,windows,jetbrains,vim,emacs,cmake,c++,cuda,visualstudio,webstorm,eclipse,xcode
 

diff --git a/README.md b/README.md
@@ -1,13 +1,112 @@
-CUDA Path Tracer
-================
+CUDA Path tracer
+======================
 
-**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 3**
+**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 2**
 
-* (TODO) YOUR NAME HERE
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
+* Akshay Shah
+* Tested on: Windows 10, i7-5700HQ @ 2.70GHz 16GB, GTX 970M 6GB (Personal Computer)
 
-### (TODO: Your README)
+### GPU Path Tracer
 
-*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.
+CUDA Summary
+------------
 
+The below analysis and results have been performed on a scene with the cornell box that has all the material types and two light sources.
+
+![](renders/cornell.2016-10-10_03-15-15z.1024samp.png)
+
+![](img/cuda_summary.PNG)
+
+Most of the time was spent in the main path trace loop to check intersection after a ray was shot. `shadeMaterial` captures the next highest device time due to the computation of refraction and other complex materials types such as the Oren-Nayar microfacet and Blinn Microfacet Model. The `launch_closure_by_value` function is part of thrust's `remove_if` stream compaction. The amount of time that is spent in here(stream compaction) is well received in terms of total time saved.
+
+![](img/cuda_summary1.PNG)
+
+The above image indicates the total time spent in each device function with corresponding number of launches. To reduce the total time spent in `shadeMaterial`, separate BRDF function calls could be made to avoid branches inside `shadeMaterial` itself and let class definitions do their job.
+
+Analysis
+--------
+
+![](img/total_time.png)
+
+The above image shows a comparison of time taken in the `computeIntersection` function with different techniques
+- No caching first ray bounce
+- Caching first ray bounce
+- Sorting the rays and intersections by material type
+
+The reason for a longer time for sorting could be that, there are not enough materials in the scene (and the scene is also not large enough. Maybe a scene as large as at least 1000 objects) that the rays show a significant change by sorting them by material.
+
+![](img/streamcompact.png)
+
+The above image shows a comparison of time taken with and without stream compaction. There is a significant change when `thrust::remove_if` is used to weed out rays that have finished bouncing in the scene i.e., rays that have `remainingBounces` 0 will be removed from the pool of "threads".
+
+Output
+------
+
+Anti-Aliasing
+-------------
+The following image shows an example of stochastic anti-aliasing that was used in the path tracer to clean out the jaggies.
+
+![](img/StochasticAA.PNG)
+
+REFRACTION
+----------
+
+The refractive indices of the glass spheres are 1.5
+Each of them has also been approximated for glass using Schlick's method.
+
+![](renders/cornell.2016-10-10_03-19-06z.1490samp.png)
+
+DOF (Depth of Field)
+--------------------
+
+![](renders/cornell.2016-10-10_03-01-09z.1125samp.png)
+
+![](renders/cornell.2016-10-10_02-51-02z.1871samp.png)
+
+MATERIALS
+---------
+The following image shows a material comparison between two diffuse materials:
+- Lambertian diffuse
+- Oren-Nayar diffuse
+
+The Oren-Nayar diffuse material in the render below has a roughness value of 20
+
+![](renders/cornell.2016-10-10_02-27-37z.5000sampCopy.png)
+
+MIRROR
+------
+
+![](renders/cornell.2016-10-05_18-18-36z.1024samp.png)
+
+Blinn Microfacet
+----------------
+
+The following render displays the Blinn Microfacet model with an exponent of 10 in this particular example.
+![](renders/cornell.2016-10-10_03-55-56z.5000samp.png)
+
+
+Just things
+-----------
+A render of UFO looking saucers with refractive properties. >.<
+
+![](renders/cornell.2016-10-10_03-25-17z.1701samp.png)
+
+<br />
+<br />
+<br />
+
+##### BLOOPERS
+
+When trying to add Stratified sampling to sample diffuse hemispheres.
+
+![](renders/cornell.2016-10-06_18-53-26z.1024samp.png)
+
+When trying to add Halton sequences to sample diffuse hemispheres.
+
+![](renders/cornell.2016-10-06_16-00-42z.273samp.png)
+
+![](renders/cornell.2016-10-06_16-00-42z.1024samp.png)
+
+Trying to add refraction
+
+![](renders/cornell.2016-10-05_07-35-47z.1024samp.png)
diff --git a/img/StochasticAA.PNG b/img/StochasticAA.PNG
diff --git a/img/cuda_summary.PNG b/img/cuda_summary.PNG
diff --git a/img/cuda_summary1.PNG b/img/cuda_summary1.PNG
diff --git a/img/streamcompact.png b/img/streamcompact.png
diff --git a/img/total_time.png b/img/total_time.png
diff --git a/renders/cornell.2016-10-04_14-38-00z.1024samp.png b/renders/cornell.2016-10-04_14-38-00z.1024samp.png
diff --git a/renders/cornell.2016-10-04_14-38-00z.512samp.png b/renders/cornell.2016-10-04_14-38-00z.512samp.png
diff --git a/renders/cornell.2016-10-04_14-39-40z.1024samp.png b/renders/cornell.2016-10-04_14-39-40z.1024samp.png
diff --git a/renders/cornell.2016-10-04_14-39-40z.512samp.png b/renders/cornell.2016-10-04_14-39-40z.512samp.png
diff --git a/renders/cornell.2016-10-04_14-46-16z.1024samp.png b/renders/cornell.2016-10-04_14-46-16z.1024samp.png
diff --git a/renders/cornell.2016-10-04_14-46-16z.1536samp.png b/renders/cornell.2016-10-04_14-46-16z.1536samp.png
diff --git a/renders/cornell.2016-10-04_14-46-16z.512samp.png b/renders/cornell.2016-10-04_14-46-16z.512samp.png
diff --git a/renders/cornell.2016-10-04_15-40-22z.1samp.png b/renders/cornell.2016-10-04_15-40-22z.1samp.png
diff --git a/renders/cornell.2016-10-04_15-40-35z.3samp.png b/renders/cornell.2016-10-04_15-40-35z.3samp.png
diff --git a/renders/cornell.2016-10-04_18-08-15z.512samp.png b/renders/cornell.2016-10-04_18-08-15z.512samp.png
diff --git a/renders/cornell.2016-10-04_18-08-52z.512samp.png b/renders/cornell.2016-10-04_18-08-52z.512samp.png
diff --git a/renders/cornell.2016-10-04_18-10-56z.1024samp.png b/renders/cornell.2016-10-04_18-10-56z.1024samp.png
diff --git a/renders/cornell.2016-10-04_18-10-56z.1536samp.png b/renders/cornell.2016-10-04_18-10-56z.1536samp.png
diff --git a/renders/cornell.2016-10-04_18-10-56z.2048samp.png b/renders/cornell.2016-10-04_18-10-56z.2048samp.png
diff --git a/renders/cornell.2016-10-04_18-10-56z.512samp.png b/renders/cornell.2016-10-04_18-10-56z.512samp.png
diff --git a/renders/cornell.2016-10-04_18-21-53z.1024samp.png b/renders/cornell.2016-10-04_18-21-53z.1024samp.png
diff --git a/renders/cornell.2016-10-04_18-21-53z.512samp.png b/renders/cornell.2016-10-04_18-21-53z.512samp.png
diff --git a/renders/cornell.2016-10-04_18-27-24z.512samp.png b/renders/cornell.2016-10-04_18-27-24z.512samp.png
diff --git a/renders/cornell.2016-10-04_18-28-40z.1024samp.png b/renders/cornell.2016-10-04_18-28-40z.1024samp.png
diff --git a/renders/cornell.2016-10-04_18-28-40z.512samp.png b/renders/cornell.2016-10-04_18-28-40z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-04-04z.1024samp.png b/renders/cornell.2016-10-04_19-04-04z.1024samp.png
diff --git a/renders/cornell.2016-10-04_19-04-04z.512samp.png b/renders/cornell.2016-10-04_19-04-04z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-14-36z.1024samp.png b/renders/cornell.2016-10-04_19-14-36z.1024samp.png
diff --git a/renders/cornell.2016-10-04_19-14-36z.512samp.png b/renders/cornell.2016-10-04_19-14-36z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-27-36z.512samp.png b/renders/cornell.2016-10-04_19-27-36z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-30-09z.1024samp.png b/renders/cornell.2016-10-04_19-30-09z.1024samp.png
diff --git a/renders/cornell.2016-10-04_19-30-09z.512samp.png b/renders/cornell.2016-10-04_19-30-09z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-31-53z.1024samp.png b/renders/cornell.2016-10-04_19-31-53z.1024samp.png
diff --git a/renders/cornell.2016-10-04_19-31-53z.1536samp.png b/renders/cornell.2016-10-04_19-31-53z.1536samp.png
diff --git a/renders/cornell.2016-10-04_19-31-53z.512samp.png b/renders/cornell.2016-10-04_19-31-53z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-43-00z.11samp.png b/renders/cornell.2016-10-04_19-43-00z.11samp.png
diff --git a/renders/cornell.2016-10-04_19-44-20z.512samp.png b/renders/cornell.2016-10-04_19-44-20z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-51-57z.512samp.png b/renders/cornell.2016-10-04_19-51-57z.512samp.png
diff --git a/renders/cornell.2016-10-04_19-51-57z.680samp.png b/renders/cornell.2016-10-04_19-51-57z.680samp.png
diff --git a/renders/cornell.2016-10-04_20-16-53z.59samp.png b/renders/cornell.2016-10-04_20-16-53z.59samp.png
diff --git a/renders/cornell.2016-10-04_20-17-41z.512samp.png b/renders/cornell.2016-10-04_20-17-41z.512samp.png
diff --git a/renders/cornell.2016-10-04_20-18-29z.76samp.png b/renders/cornell.2016-10-04_20-18-29z.76samp.png
diff --git a/renders/cornell.2016-10-04_20-26-18z.512samp.png b/renders/cornell.2016-10-04_20-26-18z.512samp.png
diff --git a/renders/cornell.2016-10-04_20-31-24z.512samp.png b/renders/cornell.2016-10-04_20-31-24z.512samp.png
diff --git a/renders/cornell.2016-10-04_20-33-10z.1024samp.png b/renders/cornell.2016-10-04_20-33-10z.1024samp.png
diff --git a/renders/cornell.2016-10-04_20-33-10z.512samp.png b/renders/cornell.2016-10-04_20-33-10z.512samp.png
diff --git a/renders/cornell.2016-10-04_20-37-27z.1024samp.png b/renders/cornell.2016-10-04_20-37-27z.1024samp.png
diff --git a/renders/cornell.2016-10-04_20-37-27z.512samp.png b/renders/cornell.2016-10-04_20-37-27z.512samp.png
diff --git a/renders/cornell.2016-10-04_21-14-03z.49samp.png b/renders/cornell.2016-10-04_21-14-03z.49samp.png
diff --git a/renders/cornell.2016-10-04_21-21-56z.17samp.png b/renders/cornell.2016-10-04_21-21-56z.17samp.png
diff --git a/renders/cornell.2016-10-04_21-23-30z.73samp.png b/renders/cornell.2016-10-04_21-23-30z.73samp.png
diff --git a/renders/cornell.2016-10-05_00-23-42z.14samp.png b/renders/cornell.2016-10-05_00-23-42z.14samp.png
diff --git a/renders/cornell.2016-10-05_07-35-47z.1024samp.png b/renders/cornell.2016-10-05_07-35-47z.1024samp.png
diff --git a/renders/cornell.2016-10-05_07-35-47z.512samp.png b/renders/cornell.2016-10-05_07-35-47z.512samp.png
diff --git a/renders/cornell.2016-10-05_08-21-29z.1024samp.png b/renders/cornell.2016-10-05_08-21-29z.1024samp.png
diff --git a/renders/cornell.2016-10-05_08-21-29z.512samp.png b/renders/cornell.2016-10-05_08-21-29z.512samp.png
diff --git a/renders/cornell.2016-10-05_18-11-09z.512samp.png b/renders/cornell.2016-10-05_18-11-09z.512samp.png
diff --git a/renders/cornell.2016-10-05_18-15-50z.512samp.png b/renders/cornell.2016-10-05_18-15-50z.512samp.png
diff --git a/renders/cornell.2016-10-05_18-17-34z.512samp.png b/renders/cornell.2016-10-05_18-17-34z.512samp.png
diff --git a/renders/cornell.2016-10-05_18-18-36z.1024samp.png b/renders/cornell.2016-10-05_18-18-36z.1024samp.png
diff --git a/renders/cornell.2016-10-05_18-18-36z.512samp.png b/renders/cornell.2016-10-05_18-18-36z.512samp.png
diff --git a/renders/cornell.2016-10-05_22-28-18z.512samp.png b/renders/cornell.2016-10-05_22-28-18z.512samp.png
diff --git a/renders/cornell.2016-10-05_22-28-18z.619samp.png b/renders/cornell.2016-10-05_22-28-18z.619samp.png
diff --git a/renders/cornell.2016-10-06_15-23-53z.1024samp.png b/renders/cornell.2016-10-06_15-23-53z.1024samp.png
diff --git a/renders/cornell.2016-10-06_15-23-53z.512samp.png b/renders/cornell.2016-10-06_15-23-53z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-29-53z.512samp.png b/renders/cornell.2016-10-06_15-29-53z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-31-38z.1024samp.png b/renders/cornell.2016-10-06_15-31-38z.1024samp.png
diff --git a/renders/cornell.2016-10-06_15-31-38z.512samp.png b/renders/cornell.2016-10-06_15-31-38z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-33-06z.512samp.png b/renders/cornell.2016-10-06_15-33-06z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-33-59z.512samp.png b/renders/cornell.2016-10-06_15-33-59z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-36-10z.1024samp.png b/renders/cornell.2016-10-06_15-36-10z.1024samp.png
diff --git a/renders/cornell.2016-10-06_15-36-10z.512samp.png b/renders/cornell.2016-10-06_15-36-10z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-39-49z.275samp.png b/renders/cornell.2016-10-06_15-39-49z.275samp.png
diff --git a/renders/cornell.2016-10-06_15-40-38z.512samp.png b/renders/cornell.2016-10-06_15-40-38z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-41-51z.1024samp.png b/renders/cornell.2016-10-06_15-41-51z.1024samp.png
diff --git a/renders/cornell.2016-10-06_15-41-51z.1536samp.png b/renders/cornell.2016-10-06_15-41-51z.1536samp.png
diff --git a/renders/cornell.2016-10-06_15-41-51z.512samp.png b/renders/cornell.2016-10-06_15-41-51z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-51-49z.1024samp.png b/renders/cornell.2016-10-06_15-51-49z.1024samp.png
diff --git a/renders/cornell.2016-10-06_15-51-49z.512samp.png b/renders/cornell.2016-10-06_15-51-49z.512samp.png
diff --git a/renders/cornell.2016-10-06_15-54-47z.146samp.png b/renders/cornell.2016-10-06_15-54-47z.146samp.png
diff --git a/renders/cornell.2016-10-06_15-55-55z.103samp.png b/renders/cornell.2016-10-06_15-55-55z.103samp.png
diff --git a/renders/cornell.2016-10-06_16-00-42z.1024samp.png b/renders/cornell.2016-10-06_16-00-42z.1024samp.png
diff --git a/renders/cornell.2016-10-06_16-00-42z.273samp.png b/renders/cornell.2016-10-06_16-00-42z.273samp.png
diff --git a/renders/cornell.2016-10-06_16-00-42z.512samp.png b/renders/cornell.2016-10-06_16-00-42z.512samp.png
diff --git a/renders/cornell.2016-10-06_16-26-29z.512samp.png b/renders/cornell.2016-10-06_16-26-29z.512samp.png
diff --git a/renders/cornell.2016-10-06_16-29-38z.512samp.png b/renders/cornell.2016-10-06_16-29-38z.512samp.png
diff --git a/renders/cornell.2016-10-06_18-41-30z.1024samp.png b/renders/cornell.2016-10-06_18-41-30z.1024samp.png
diff --git a/renders/cornell.2016-10-06_18-41-30z.512samp.png b/renders/cornell.2016-10-06_18-41-30z.512samp.png
diff --git a/renders/cornell.2016-10-06_18-43-11z.186samp.png b/renders/cornell.2016-10-06_18-43-11z.186samp.png
diff --git a/renders/cornell.2016-10-06_18-43-21z.90samp.png b/renders/cornell.2016-10-06_18-43-21z.90samp.png
diff --git a/renders/cornell.2016-10-06_18-45-21z.512samp.png b/renders/cornell.2016-10-06_18-45-21z.512samp.png
diff --git a/renders/cornell.2016-10-06_18-46-31z.434samp.png b/renders/cornell.2016-10-06_18-46-31z.434samp.png
diff --git a/renders/cornell.2016-10-06_18-48-40z.1024samp.png b/renders/cornell.2016-10-06_18-48-40z.1024samp.png
diff --git a/renders/cornell.2016-10-06_18-48-40z.1033samp.png b/renders/cornell.2016-10-06_18-48-40z.1033samp.png
diff --git a/renders/cornell.2016-10-06_18-48-40z.512samp.png b/renders/cornell.2016-10-06_18-48-40z.512samp.png
diff --git a/renders/cornell.2016-10-06_18-53-26z.1024samp.png b/renders/cornell.2016-10-06_18-53-26z.1024samp.png
diff --git a/renders/cornell.2016-10-06_18-53-26z.512samp.png b/renders/cornell.2016-10-06_18-53-26z.512samp.png
diff --git a/renders/cornell.2016-10-10_02-17-23z.1389samp.png b/renders/cornell.2016-10-10_02-17-23z.1389samp.png
diff --git a/renders/cornell.2016-10-10_02-19-17z.1391samp.png b/renders/cornell.2016-10-10_02-19-17z.1391samp.png
diff --git a/renders/cornell.2016-10-10_02-22-22z.1386samp.png b/renders/cornell.2016-10-10_02-22-22z.1386samp.png
diff --git a/renders/cornell.2016-10-10_02-27-37z.5000samp.png b/renders/cornell.2016-10-10_02-27-37z.5000samp.png
diff --git a/renders/cornell.2016-10-10_02-27-37z.5000sampCopy.png b/renders/cornell.2016-10-10_02-27-37z.5000sampCopy.png
diff --git a/renders/cornell.2016-10-10_02-39-08z.5000samp.png b/renders/cornell.2016-10-10_02-39-08z.5000samp.png
diff --git a/renders/cornell.2016-10-10_02-51-02z.1871samp.png b/renders/cornell.2016-10-10_02-51-02z.1871samp.png
diff --git a/renders/cornell.2016-10-10_03-01-09z.1125samp.png b/renders/cornell.2016-10-10_03-01-09z.1125samp.png
diff --git a/renders/cornell.2016-10-10_03-05-09z.171samp.png b/renders/cornell.2016-10-10_03-05-09z.171samp.png
diff --git a/renders/cornell.2016-10-10_03-08-31z.708samp.png b/renders/cornell.2016-10-10_03-08-31z.708samp.png
diff --git a/renders/cornell.2016-10-10_03-09-50z.1702samp.png b/renders/cornell.2016-10-10_03-09-50z.1702samp.png
diff --git a/renders/cornell.2016-10-10_03-12-52z.1899samp.png b/renders/cornell.2016-10-10_03-12-52z.1899samp.png
diff --git a/renders/cornell.2016-10-10_03-15-15z.1024samp.png b/renders/cornell.2016-10-10_03-15-15z.1024samp.png
diff --git a/renders/cornell.2016-10-10_03-19-06z.1490samp.png b/renders/cornell.2016-10-10_03-19-06z.1490samp.png
diff --git a/renders/cornell.2016-10-10_03-22-14z.184samp.png b/renders/cornell.2016-10-10_03-22-14z.184samp.png
diff --git a/renders/cornell.2016-10-10_03-25-17z.1701samp.png b/renders/cornell.2016-10-10_03-25-17z.1701samp.png
diff --git a/renders/cornell.2016-10-10_03-55-56z.5000samp.png b/renders/cornell.2016-10-10_03-55-56z.5000samp.png
diff --git a/renders/custom.2016-10-05_18-36-41z.512samp.png b/renders/custom.2016-10-05_18-36-41z.512samp.png
diff --git a/renders/custom.2016-10-05_18-39-01z.512samp.png b/renders/custom.2016-10-05_18-39-01z.512samp.png
diff --git a/renders/custom.2016-10-10_02-48-09z.87samp.png b/renders/custom.2016-10-10_02-48-09z.87samp.png
diff --git a/renders/old/cornell.2016-10-01_18-47-20z.2126samp.png b/renders/old/cornell.2016-10-01_18-47-20z.2126samp.png
diff --git a/renders/old/cornell.2016-10-02_05-57-45z.1577samp.png b/renders/old/cornell.2016-10-02_05-57-45z.1577samp.png
diff --git a/renders/old/cornell.2016-10-02_06-12-16z.2296samp.png b/renders/old/cornell.2016-10-02_06-12-16z.2296samp.png
diff --git a/renders/old/cornell.2016-10-02_06-30-37z.20samp.png b/renders/old/cornell.2016-10-02_06-30-37z.20samp.png
diff --git a/renders/old/cornell.2016-10-02_14-55-15z.12samp.png b/renders/old/cornell.2016-10-02_14-55-15z.12samp.png
diff --git a/renders/old/cornell.2016-10-02_14-57-48z.11samp.png b/renders/old/cornell.2016-10-02_14-57-48z.11samp.png
diff --git a/renders/old/cornell.2016-10-02_15-05-07z.7samp.png b/renders/old/cornell.2016-10-02_15-05-07z.7samp.png
diff --git a/renders/old/cornell.2016-10-02_15-06-11z.9samp.png b/renders/old/cornell.2016-10-02_15-06-11z.9samp.png
diff --git a/renders/old/cornell.2016-10-02_15-11-30z.23samp.png b/renders/old/cornell.2016-10-02_15-11-30z.23samp.png
diff --git a/renders/old/cornell.2016-10-02_15-13-54z.3samp.png b/renders/old/cornell.2016-10-02_15-13-54z.3samp.png
diff --git a/renders/old/cornell.2016-10-02_15-17-17z.57samp.png b/renders/old/cornell.2016-10-02_15-17-17z.57samp.png
diff --git a/renders/old/cornell.2016-10-02_15-29-45z.28samp.png b/renders/old/cornell.2016-10-02_15-29-45z.28samp.png
diff --git a/renders/old/cornell.2016-10-02_15-35-13z.2012samp.png b/renders/old/cornell.2016-10-02_15-35-13z.2012samp.png
diff --git a/renders/old/cornell.2016-10-02_22-02-26z.2028samp.png b/renders/old/cornell.2016-10-02_22-02-26z.2028samp.png
diff --git a/renders/old/cornell.2016-10-02_23-18-02z.4430samp.png b/renders/old/cornell.2016-10-02_23-18-02z.4430samp.png
diff --git a/renders/old/sphere.2016-09-29_02-54-56z.54samp.png b/renders/old/sphere.2016-09-29_02-54-56z.54samp.png
diff --git a/renders/old/sphere.2016-09-29_02-59-19z.19samp.png b/renders/old/sphere.2016-09-29_02-59-19z.19samp.png
diff --git a/renders/old/sphere.2016-09-29_20-04-15z.63samp.png b/renders/old/sphere.2016-09-29_20-04-15z.63samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.128samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.128samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.192samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.192samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.256samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.256samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.320samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.320samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.384samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.384samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.448samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.448samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.512samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.512samp.png
diff --git a/renders/sampled/cornell.2016-10-04_14-29-47z.64samp.png b/renders/sampled/cornell.2016-10-04_14-29-47z.64samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.128samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.128samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.192samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.192samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.256samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.256samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.320samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.320samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.384samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.384samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.448samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.448samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.512samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.512samp.png
diff --git a/renders/unsampled/cornell.2016-10-04_14-31-25z.64samp.png b/renders/unsampled/cornell.2016-10-04_14-31-25z.64samp.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   10
 
 // Diffuse white
 MATERIAL 1
@@ -43,11 +43,52 @@ MATERIAL 4
 RGB         .98 .98 .98
 SPECEX      0
 SPECRGB     .98 .98 .98
+REFL        0
+REFR        1
+REFRIOR     2.5
+EMITTANCE   0
+
+// Specular white
+MATERIAL 5
+RGB         .98 .98 .98
+SPECEX      0
+SPECRGB     .98 .98 .98
 REFL        1
 REFR        0
 REFRIOR     0
 EMITTANCE   0
 
+// microfacet white
+MATERIAL 6
+RGB         .4 0 .98
+SPECEX      0
+SPECRGB     1 1 1
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+ROUGH		300
+
+// diffuse not white
+MATERIAL 7
+RGB         .4 0 .98
+SPECEX      0
+SPECRGB     .98 .98 .98
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
+// blinn phong?
+MATERIAL 8
+RGB         .4 0 .98
+SPECEX      10.2
+SPECRGB     .98 .98 .98
+REFL        0
+REFR        0
+REFRIOR     0
+EMITTANCE   0
+
 // Camera
 CAMERA
 RES         800 800
@@ -58,6 +99,8 @@ FILE        cornell
 EYE         0.0 5 10.5
 LOOKAT      0 5 0
 UP          0 1 0
+LENSRADIUS 0.2
+FOCALDIST 5
 
 
 // Ceiling light
@@ -111,7 +154,23 @@ SCALE       .01 10 10
 // Sphere
 OBJECT 6
 sphere
-material 4
-TRANS       -1 4 -1
+material 7
+TRANS       2 4 -1.5
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere
+OBJECT 7
+sphere
+material 8
+TRANS       -2 4 -1.5
+ROTAT       0 0 0
+SCALE       3 3 3
+
+// Sphere
+OBJECT 8
+sphere
+material 0
+TRANS       0 2 4
 ROTAT       0 0 0
 SCALE       3 3 3