diff --git a/32b_ao.jpg b/32b_ao.jpg
new file mode 100644
index 0000000..6b9289b
Binary files /dev/null and b/32b_ao.jpg differ
diff --git a/32b_ao_smooth.jpg b/32b_ao_smooth.jpg
new file mode 100644
index 0000000..a03f445
Binary files /dev/null and b/32b_ao_smooth.jpg differ
diff --git a/32b_ao_unsmooth.jpg b/32b_ao_unsmooth.jpg
new file mode 100644
index 0000000..4123055
Binary files /dev/null and b/32b_ao_unsmooth.jpg differ
diff --git a/32b_color.jpg b/32b_color.jpg
new file mode 100644
index 0000000..d1edfeb
Binary files /dev/null and b/32b_color.jpg differ
diff --git a/32b_depth.jpg b/32b_depth.jpg
new file mode 100644
index 0000000..8ee9b65
Binary files /dev/null and b/32b_depth.jpg differ
diff --git a/32b_mv_effect.jpg b/32b_mv_effect.jpg
new file mode 100644
index 0000000..cca4a99
Binary files /dev/null and b/32b_mv_effect.jpg differ
diff --git a/32b_normal.jpg b/32b_normal.jpg
new file mode 100644
index 0000000..267607b
Binary files /dev/null and b/32b_normal.jpg differ
diff --git a/32b_shading_ao_mb.jpg b/32b_shading_ao_mb.jpg
new file mode 100644
index 0000000..18411c8
Binary files /dev/null and b/32b_shading_ao_mb.jpg differ
diff --git a/32b_toon.jpg b/32b_toon.jpg
new file mode 100644
index 0000000..4efafb3
Binary files /dev/null and b/32b_toon.jpg differ
diff --git a/8b_ao.jpg b/8b_ao.jpg
new file mode 100644
index 0000000..594bc37
Binary files /dev/null and b/8b_ao.jpg differ
diff --git a/8b_depth.jpg b/8b_depth.jpg
new file mode 100644
index 0000000..02e2bfe
Binary files /dev/null and b/8b_depth.jpg differ
diff --git a/8b_normal.jpg b/8b_normal.jpg
new file mode 100644
index 0000000..ebf3b2c
Binary files /dev/null and b/8b_normal.jpg differ
diff --git a/8b_shading_ao_mb.jpg b/8b_shading_ao_mb.jpg
new file mode 100644
index 0000000..8f395e8
Binary files /dev/null and b/8b_shading_ao_mb.jpg differ
diff --git a/8b_toon.jpg b/8b_toon.jpg
new file mode 100644
index 0000000..abb49bd
Binary files /dev/null and b/8b_toon.jpg differ
diff --git a/README.md b/README.md
index 919af39..71925e4 100644
--- a/README.md
+++ b/README.md
@@ -1,144 +1,106 @@
-------------------------------------------------------------------------------
-CIS565: Project 6: Deferred Shader
--------------------------------------------------------------------------------
-Fall 2013
--------------------------------------------------------------------------------
-Due Friday 11/15/2013
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-NOTE:
--------------------------------------------------------------------------------
-This project requires any graphics card with support for a modern OpenGL
-pipeline. Any AMD, NVIDIA, or Intel card from the past few years should work
-fine, and every machine in the SIG Lab and Moore 100 is capable of running
-this project.
-
--------------------------------------------------------------------------------
-INTRODUCTION:
--------------------------------------------------------------------------------
-In this project, you will get introduced to the basics of deferred shading. You will write GLSL and OpenGL code to perform various tasks in a deferred lighting pipeline such as creating and writing to a G-Buffer.
+Deferred Renderer
+-------------------------------------------------------------------------------
+
+Deferred shading is a mulit-pass rendering approach. The scene primitives are usually rendered once per frame (or per material), and the information needed for shading (position, normal, depth, albedo, etc.) are output to multiple render targets, a
+group of image buffers that have the same size as the output screen.
+Then in the subequent passes, a screen-sized quad is rendered and shading is performed using information provided by the buffers obtained from the primitive-rendering pass.
+Unlike traditional forward rendering approach, which has to render the same primitives multiple times when multiple lights are present,
+deferred shading can reuse the shading information without rendering the scene over and over again.
+Thus the shading complexity is decoupled from scene complexity.
+
+This project implements deferred renderer using OpenGL's Framebuffer Objects; it demonstrates the following effects:
+* Diffuse material shading
+* Toon shading with silhouette
+* Scren space ambient occlusion (SSAO)
+* Motion blur
+
+by using the following buffers generated in the primitive-rendering pass:
+* Depth
+* Surface normal
+* Albedo
+* Velocity field
+
+Mutiple post-processing passes are performed:
+* SSAO calculation
+* SSAO smoothing
+* Motion blurring
+* Toon shading silhouette (using Sobel filter on both depth and normal)
+
+Keyboard usage
+--------------------------------------------------------------------------------
+* 1: show depth
+* 2: show screen space normal
+* 3: show albedo
+* 4: show screen space position
+* 5: show light influence (press 'x' to toggle scissor)
+* 6: show Toon shading
+* 0: show diffuse shading (plus SSAO)
+* mouse to look around
+* W,S,A,D to move
+
+
+Rendering result
+---------------------------------------------------------------------------------
+Diffuse shading+SSAO:
+
+
+
+Motion blur effect:
+
+
+Toon Shading:
+
+
+Depth buffer:
+
+
+Normal buffer:
+
+
+Ambient Occlusion before smoothing:
+
+
+Ambient ccclusion after smoothing:
+
+
+
+Performance Evaluation:
+----------------------------------------------------------------------------------
+Three kinds of render targets layouts were tested:
+
+
+* 4 X RGBA32F floating point textures + 32bit depth buffer:
+
+ 
+
+* 2 X RGBA32F floating point textures + 32bit depth buffer:
+ (Positions are reconstructed on the fly from detph values)
+
+ 
+
+* 2 X RGBA8 UCHAR textures + 32bit depth buffer:
+ (Positions are reconstructed on the fly from detph values)
+
+ 
+
+
+
+The following chart shows how size and precision of render targets affect performance:
+
+
+
+The chart shows how FPS changes when rendering using different amounts of render targets and precision.
+The tests were run on a nVidia GTX660M laptop.
+
+Although 8-bit precision textures yields better performance, error arises when using them for shading.
+
+The following images are the rendering results using 8-bit depth textures.
+
+
+
+
--------------------------------------------------------------------------------
-CONTENTS:
--------------------------------------------------------------------------------
-The Project6 root directory contains the following subdirectories:
-
-* base/
- * PROJ_WIN/ contains the vs2010 project files
- * PROJ_NIX/ contains makefile for building (tested on ubuntu 12.04 LTS)
- * res/ contains resources including shader source and obj files
- * src/ contains the c++ code for the project along with SOIL and tiny_obj_loader
-* shared32/ contains freeglut, glm, and glew.
--------------------------------------------------------------------------------
-REQUIREMENTS:
--------------------------------------------------------------------------------
-In this project, you are given code for:
-* Loading .obj files
-* Rendering to a minimal G buffer:
- * Depth
- * Normal
- * Color
- * Eye space position
-* Rendering simple ambient and directional lighting to texture
-* Example post process shader to add a vignette
-
-You are required to implement:
-* Either of the following effects
- * Bloom (feel free to use [GPU Gems](http://http.developer.nvidia.com/GPUGems/gpugems_ch21.html) as a rough guide)
- * "Toon" Shading (with basic silhouetting)
-* Point light sources
-* An additional G buffer slot and some effect showing it off
-
-**NOTE**: Implementing separable convolution will require another link in your pipeline and will count as an extra feature if you do performance analysis with a standard one-pass 2D convolution. The overhead of rendering and reading from a texture _may_ offset the extra computations for smaller 2D kernels.
-
-You must implement two of the following extras:
-* The effect you did not choose above
-* Screen space ambient occlusion
-* Compare performance to a normal forward renderer with
- * No optimizations
- * Coarse sort geometry front-to-back for early-z
- * Z-prepass for early-z
-* Optimize g-buffer format, e.g., pack things together, quantize, reconstruct z from normal x and y (because it is normalized), etc.
- * Must be accompanied with a performance analysis to count
-* Additional lighting and pre/post processing effects! (email first please, if they are good you may add multiple).
--------------------------------------------------------------------------------
-README
--------------------------------------------------------------------------------
-All students must replace or augment the contents of this Readme.md in a clear
-manner with the following:
-
-* A brief description of the project and the specific features you implemented.
-* At least one screenshot of your project running.
-* A 30 second or longer video of your project running. To create the video you
- can use http://www.microsoft.com/expression/products/Encoder4_Overview.aspx
-* A performance evaluation (described in detail below).
-
--------------------------------------------------------------------------------
-PERFORMANCE EVALUATION
--------------------------------------------------------------------------------
-The performance evaluation is where you will investigate how to make your
-program more efficient using the skills you've learned in class. You must have
-performed at least one experiment on your code to investigate the positive or
-negative effects on performance.
-
-We encourage you to get creative with your tweaks. Consider places in your code
-that could be considered bottlenecks and try to improve them.
-
-Each student should provide no more than a one page summary of their
-optimizations along with tables and or graphs to visually explain any
-performance differences.
-
--------------------------------------------------------------------------------
-THIRD PARTY CODE POLICY
--------------------------------------------------------------------------------
-* Use of any third-party code must be approved by asking on the Google groups.
- If it is approved, all students are welcome to use it. Generally, we approve
- use of third-party code that is not a core part of the project. For example,
- for the ray tracer, we would approve using a third-party library for loading
- models, but would not approve copying and pasting a CUDA function for doing
- refraction.
-* Third-party code must be credited in README.md.
-* Using third-party code without its approval, including using another
- student's code, is an academic integrity violation, and will result in you
- receiving an F for the semester.
-
--------------------------------------------------------------------------------
-SELF-GRADING
--------------------------------------------------------------------------------
-* On the submission date, email your grade, on a scale of 0 to 100, to Liam,
- liamboone@gmail.com, with a one paragraph explanation. Be concise and
- realistic. Recall that we reserve 30 points as a sanity check to adjust your
- grade. Your actual grade will be (0.7 * your grade) + (0.3 * our grade). We
- hope to only use this in extreme cases when your grade does not realistically
- reflect your work - it is either too high or too low. In most cases, we plan
- to give you the exact grade you suggest.
-* Projects are not weighted evenly, e.g., Project 0 doesn't count as much as
- the path tracer. We will determine the weighting at the end of the semester
- based on the size of each project.
-
-
----
-SUBMISSION
----
-As with the previous projects, you should fork this project and work inside of
-your fork. Upon completion, commit your finished project back to your fork, and
-make a pull request to the master repository. You should include a README.md
-file in the root directory detailing the following
-
-* A brief description of the project and specific features you implemented
-* At least one screenshot of your project running.
-* A link to a video of your project running.
-* Instructions for building and running your project if they differ from the
- base code.
-* A performance writeup as detailed above.
-* A list of all third-party code used.
-* This Readme file edited as described above in the README section.
-
----
-ACKNOWLEDGEMENTS
----
-This project makes use of [tinyobjloader](http://syoyo.github.io/tinyobjloader/) and [SOIL](http://lonesock.net/soil.html)
diff --git a/base/PROJ_WIN/P6/P6.sln b/base/PROJ_WIN/P6/P6.sln
index f1e2d5f..c09d8c8 100644
--- a/base/PROJ_WIN/P6/P6.sln
+++ b/base/PROJ_WIN/P6/P6.sln
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "P6", "P6\P6.vcxproj", "{5706DFE4-FA46-448C-8A11-12E132B9BC59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\..\src\SOIL\SOIL.vcxproj", "{25544C77-3B78-405F-A15D-1231D05969F3}"
@@ -23,4 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(Performance) = preSolution
+ HasPerformanceSessions = true
+ EndGlobalSection
EndGlobal
diff --git a/base/PROJ_WIN/P6/P6/P6.vcxproj b/base/PROJ_WIN/P6/P6/P6.vcxproj
index 2d1749c..eff4dab 100644
--- a/base/PROJ_WIN/P6/P6/P6.vcxproj
+++ b/base/PROJ_WIN/P6/P6/P6.vcxproj
@@ -19,12 +19,14 @@
ApplicationtrueUnicode
+ v110ApplicationfalsetrueUnicode
+ v110
@@ -44,13 +46,13 @@
Level3Disabled
- ..\..\..\src\SOIL;..\..\..\src\tiny_obj_loader;..\..\..\..\shared32\freeglut\include;..\..\..\..\shared32\glew\include;..\..\..\..\shared32\glm;%(AdditionalIncludeDirectories)
+ ..\..\..\..\shared32\freeglut\include;..\..\..\..\shared32\glew\include;..\..\..\src\SOIL;..\..\..\src\tiny_obj_loader;..\..\..\..\shared32\glm;%(AdditionalIncludeDirectories)WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)true
- ..\..\..\..\shared32\glew\lib;..\..\..\..\shared32\freeglut\lib;%(AdditionalLibraryDirectories)
- freeglut.lib;glew32.lib;%(AdditionalDependencies)
+ ..\..\..\..\shared32\freeglut\lib;..\..\..\..\shared32\glew\lib;..\Debug;%(AdditionalLibraryDirectories)
+ freeglut.lib;SOIL.lib;glew32.lib;%(AdditionalDependencies)Console
@@ -60,14 +62,14 @@
MaxSpeedtruetrue
- ..\..\..\src\SOIL;..\..\..\src\tiny_obj_loader;..\..\..\..\shared32\freeglut\include;..\..\..\..\shared32\glew\include;..\..\..\..\shared32\glm;%(AdditionalIncludeDirectories)
+ ..\..\..\..\shared32\freeglut\include;..\..\..\src\SOIL;..\..\..\src\tiny_obj_loader;..\..\..\..\shared32\glew\include;..\..\..\..\shared32\glm;%(AdditionalIncludeDirectories)truetruetrue
- ..\..\..\..\shared32\glew\lib;..\..\..\..\shared32\freeglut\lib;%(AdditionalLibraryDirectories)
- freeglut.lib;glew32.lib;%(AdditionalDependencies)
+ ..\..\..\..\shared32\freeglut\lib;..\..\..\..\shared32\glew\lib;..\Release;%(AdditionalLibraryDirectories)
+ freeglut.lib;SOIL.lib;glew32.lib;%(AdditionalDependencies)Console
@@ -85,9 +87,14 @@
+
+
+
+
+
diff --git a/base/PROJ_WIN/P6/P6/P6.vcxproj.filters b/base/PROJ_WIN/P6/P6/P6.vcxproj.filters
index 8fd6655..e440760 100644
--- a/base/PROJ_WIN/P6/P6/P6.vcxproj.filters
+++ b/base/PROJ_WIN/P6/P6/P6.vcxproj.filters
@@ -67,5 +67,20 @@
Resource Files
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+