Update for pipeline

README.md

@@ -79,20 +79,15 @@ REQUIREMENTS:
 
 In this project, you are given code for:
 * Loading .obj file
-* Forward shading pipeline
-
-NOTE : The full deferred pipeline will be released on Friday.  If you set up
-your deferred pipeline for extra credit, please submit a pull request by Friday.
-If it is partially done, we will give partial extra credit.
-
-The baseline OpenGL shaders for the rest of the pipeline have been provided to give you
-a sense of what will be neede in subsequent passes.
+* Deferred shading pipeline
+* GBuffer pass
 
 You are required to implement:
 * Either of the following effects
   * Bloom
   * "Toon" Shading (with basic silhouetting)
-* Screen Space Ambient Occlusion 
+* Screen Space Ambient Occlusion
+* Diffuse and Blinn-Phong shading
 
 **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.
 

assets/deferred/colorPass.frag

@@ -0,0 +1,7 @@
+precision highp float;
+
+uniform sampler2D u_sampler;
+
+void main(void){
+	gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}

assets/deferred/colorPass.vert

@@ -0,0 +1,9 @@
+precision highp float;
+
+attribute vec3 a_pos;
+
+uniform mat4 u_mvp;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+}

assets/deferred/diagnostic.frag

@@ -0,0 +1,40 @@
+precision highp float;
+
+#define DISPLAY_POS 1
+#define DISPLAY_NORMAL 2
+#define DISPLAY_COLOR 3
+#define DISPLAY_DEPTH 4
+
+uniform sampler2D u_positionTex;
+uniform sampler2D u_normalTex;
+uniform sampler2D u_colorTex;
+uniform sampler2D u_depthTex;
+
+uniform float u_zFar;
+uniform float u_zNear;
+uniform int u_displayType;
+
+varying vec2 v_texcoord;
+
+float linearizeDepth( float exp_depth, float near, float far ){
+	return ( 2.0 * near ) / ( far + near - exp_depth * ( far - near ) );
+}
+
+void main()
+{
+	vec3 normal = texture2D( u_normalTex, v_texcoord ).xyz;
+	vec3 position = texture2D( u_positionTex, v_texcoord ).xyz;
+	vec4 color = texture2D( u_colorTex, v_texcoord );
+	float depth = texture2D( u_depthTex, v_texcoord ).x;
+
+	depth = linearizeDepth( depth, u_zNear, u_zFar );
+
+  if( u_displayType == DISPLAY_DEPTH )
+	    gl_FragColor = vec4( depth, depth, depth, 1 );
+	else if( u_displayType == DISPLAY_COLOR )
+	    gl_FragColor = color;
+	else if( u_displayType == DISPLAY_NORMAL )
+	    gl_FragColor = vec4( normal, 1 );
+	else
+	    gl_FragColor = vec4( position, 1 );
+}

assets/deferred/diffuse.frag

@@ -0,0 +1,23 @@
+precision highp float;
+
+uniform sampler2D u_positionTex;
+uniform sampler2D u_normalTex;
+uniform sampler2D u_colorTex;
+uniform sampler2D u_depthTex;
+
+uniform float u_zFar;
+uniform float u_zNear;
+uniform int u_displayType;
+
+varying vec2 v_texcoord;
+
+float linearizeDepth( float exp_depth, float near, float far ){
+	return ( 2.0 * near ) / ( far + near - exp_depth * ( far - near ) );
+}
+
+void main()
+{
+  // Write a diffuse shader and a Blinn-Phong shader
+  // NOTE : You may need to add your own normals to fulfill the second's requirements
+  gl_FragColor = vec4(texture2D(u_colorTex, v_texcoord).rgb, 1.0);
+}

assets/deferred/normPass.frag

@@ -0,0 +1,7 @@
+precision highp float;
+
+varying vec3 v_normal;
+
+void main(void){
+	gl_FragColor = vec4(v_normal, 1.0);
+}

assets/deferred/normPass.vert

@@ -0,0 +1,15 @@
+precision highp float;
+
+attribute vec3 a_pos;
+attribute vec3 a_normal;
+
+uniform mat4 u_mvp;
+uniform mat4 u_normalMat;
+
+varying vec3 v_normal;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+
+	v_normal = vec3( u_normalMat * vec4(a_normal, 0.0) );
+}

assets/deferred/pass.frag

@@ -0,0 +1,16 @@
+#extension GL_EXT_draw_buffers: require
+precision highp float;
+
+uniform sampler2D u_sampler;
+
+varying vec4 v_pos;
+varying vec3 v_normal;
+varying vec2 v_texcoord;
+varying float v_depth;
+
+void main(void){
+	gl_FragData[0] = v_pos;
+	gl_FragData[1] = vec4( normalize(v_normal), 1.0 );
+	gl_FragData[2] = vec4( 1.0, 0.0, 0.0, 1.0 );
+	gl_FragData[3] = vec4( v_depth, 0, 0, 0 );
+}

assets/deferred/pass.vert

@@ -0,0 +1,26 @@
+precision highp float;
+
+attribute vec3 a_pos;
+attribute vec3 a_normal;
+attribute vec2 a_texcoord;
+
+uniform mat4 u_projection;
+uniform mat4 u_modelview;
+uniform mat4 u_mvp;
+uniform mat4 u_normalMat;
+
+varying vec4 v_pos;
+varying vec3 v_normal;
+varying vec2 v_texcoord;
+varying float v_depth;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+
+	v_pos = u_modelview * vec4( a_pos, 1.0 );
+	v_normal = vec3( u_normalMat * vec4(a_normal,0.0) );
+
+	v_texcoord = a_texcoord;
+
+	v_depth = ( gl_Position.z / gl_Position.w + 1.0 ) / 2.0;
+}

assets/deferred/posPass.frag

@@ -0,0 +1,8 @@
+precision highp float;
+
+varying vec4 v_pos;
+varying float v_depth;
+
+void main(void){
+	gl_FragColor = v_pos;
+}

assets/deferred/posPass.vert

@@ -0,0 +1,15 @@
+precision highp float;
+
+attribute vec3 a_pos;
+
+uniform mat4 u_modelview;
+uniform mat4 u_mvp;
+
+varying vec4 v_pos;
+varying float v_depth;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+  v_pos = u_modelview * vec4( a_pos, 1.0 );
+  v_depth = ( gl_Position.z / gl_Position.w + 1.0 )  / 2.0;
+}

assets/deferred/post.frag

@@ -0,0 +1,17 @@
+precision highp float;
+
+uniform sampler2D u_shadeTex;
+
+varying vec2 v_texcoord;
+
+float linearizeDepth( float exp_depth, float near, float far ){
+	return ( 2.0 * near ) / ( far + near - exp_depth * ( far - near ) );
+}
+
+void main()
+{
+  // Currently acts as a pass filter that immmediately renders the shaded texture
+  // Fill in post-processing as necessary HERE
+  // NOTE : You may choose to use a key-controlled switch system to display one feature at a time
+  gl_FragColor = vec4(texture2D( u_shadeTex, v_texcoord).rgb, 1.0); 
+}

assets/deferred/quad.vert

@@ -0,0 +1,11 @@
+precision highp float;
+
+attribute vec3 a_pos;
+attribute vec2 a_texcoord;
+
+varying vec2 v_texcoord;
+
+void main(void){
+    v_texcoord = a_texcoord;
+    gl_Position = vec4( a_pos, 1.0 );
+}

assets/forward.frag

@@ -0,0 +1,12 @@
+precision highp float;
+
+varying vec3 fs_normal;
+
+void main (void) {
+  // Using directional light
+  vec3 dirLight = vec3(0.5, 0.5, 0.5);
+
+  gl_FragColor = vec4(vec3(dot(dirLight, fs_normal)), 1.0);
+
+  //gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}

assets/forward.vert

@@ -0,0 +1,14 @@
+precision highp float;
+
+uniform mat4 u_persp;
+uniform mat4 u_modelView;
+
+attribute vec3 v_position;
+attribute vec3 v_normal;
+
+varying vec3 fs_normal;
+
+void main (void) {
+  fs_normal = v_normal;
+  gl_Position = u_persp * u_modelView * vec4(v_position, 1.0);
+}

assets/pass.frag

@@ -0,0 +1,10 @@
+precision highp float;
+
+uniform sampler2D u_texture;
+
+varying vec2 fs_texcoord;
+
+void main(void) {
+  float color = texture2D(u_texture, fs_texcoord).x;
+  gl_FragColor = vec4(color, 0.0, 0.0, 1.0);
+}

assets/pass.vert

@@ -0,0 +1,11 @@
+precision highp float;
+
+attribute vec3 v_position;
+attribute vec2 v_texcoord;
+
+varying vec2 fs_texcoord;
+
+void main (void) {
+  fs_texcoord = v_texcoord;
+  gl_Position = vec4(v_position, 1.0); 
+}

assets/shader/deferred/colorPass.frag

@@ -0,0 +1,7 @@
+precision highp float;
+
+uniform sampler2D u_sampler;
+
+void main(void){
+	gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}

assets/shader/deferred/colorPass.vert

@@ -0,0 +1,9 @@
+precision highp float;
+
+attribute vec3 a_pos;
+
+uniform mat4 u_mvp;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+}

assets/shader/deferred/diffuse.frag

@@ -1,4 +1,3 @@
-#extension GL_EXT_draw_buffers: require
 precision highp float;
 
 uniform sampler2D u_positionTex;
@@ -20,5 +19,5 @@ void main()
 {
   // Write a diffuse shader and a Blinn-Phong shader
   // NOTE : You may need to add your own normals to fulfill the second's requirements
-  gl_FragData[0] = vec4(texture2D(u_colorTex, v_texcoord).rgb, 1.0);
+  gl_FragColor = vec4(texture2D(u_colorTex, v_texcoord).rgb, 1.0);
 }

assets/shader/deferred/normPass.frag

@@ -0,0 +1,7 @@
+precision highp float;
+
+varying vec3 v_normal;
+
+void main(void){
+	gl_FragColor = vec4(v_normal, 1.0);
+}

assets/shader/deferred/normPass.vert

@@ -0,0 +1,15 @@
+precision highp float;
+
+attribute vec3 a_pos;
+attribute vec3 a_normal;
+
+uniform mat4 u_mvp;
+uniform mat4 u_normalMat;
+
+varying vec3 v_normal;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+
+	v_normal = vec3( u_normalMat * vec4(a_normal, 0.0) );
+}

assets/shader/deferred/posPass.frag

@@ -0,0 +1,8 @@
+precision highp float;
+
+varying vec4 v_pos;
+varying float v_depth;
+
+void main(void){
+	gl_FragColor = v_pos;
+}

assets/shader/deferred/posPass.vert

@@ -0,0 +1,15 @@
+precision highp float;
+
+attribute vec3 a_pos;
+
+uniform mat4 u_modelview;
+uniform mat4 u_mvp;
+
+varying vec4 v_pos;
+varying float v_depth;
+
+void main(void){
+	gl_Position = u_mvp * vec4( a_pos, 1.0 );
+  v_pos = u_modelview * vec4( a_pos, 1.0 );
+  v_depth = ( gl_Position.z / gl_Position.w + 1.0 )  / 2.0;
+}

assets/shader/deferred/quad.vert

@@ -6,6 +6,6 @@ attribute vec2 a_texcoord;
 varying vec2 v_texcoord;
 
 void main(void){
-    v_texcoord = a_texcoord * 0.5 + vec2(0.5);
+    v_texcoord = a_texcoord;
     gl_Position = vec4( a_pos, 1.0 );
-}
+}

assets/shader/pass.frag

@@ -1,7 +1,10 @@
 precision highp float;
 
-varying vec3 fs_texcoord;
+uniform sampler2D u_texture;
+
+varying vec2 fs_texcoord;
 
 void main(void) {
-  gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+  float color = texture2D(u_texture, fs_texcoord).x;
+  gl_FragColor = vec4(color, 0.0, 0.0, 1.0);
 }

assets/shader/pass.vert

@@ -1,9 +1,9 @@
 precision highp float;
 
-attribute v_position;
-attribute v_texcoord;
+attribute vec3 v_position;
+attribute vec2 v_texcoord;
 
-varying fs_texcoord;
+varying vec2 fs_texcoord;
 
 void main (void) {
   fs_texcoord = v_texcoord;