updating the model fragment shaders to use DeferredBUfferWrite

libraries/render-utils/src/DeferredBufferWrite.slh

@@ -10,19 +10,28 @@
 !>
 <@if not DEFERRED_BUFFER_WRITE_SLH@>
 <@def DEFERRED_BUFFER_WRITE_SLH@>
-/*
+
 // the glow intensity
 uniform float glowIntensity;
 
 // the alpha threshold
 uniform float alphaThreshold;
-*/
+
+float evalOpaqueFinalAlpha(float alpha, float mapAlpha) {
+    return mix(alpha * glowIntensity, 1.0 - alpha * glowIntensity, step(mapAlpha, alphaThreshold));
+}
 
 void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
-   // gl_FragData[0] = vec4(diffuse.rgb,  mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[0] = vec4(diffuse.rgb, alpha);
     gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(specular, shininess / 128.0);
 }
 
+void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {
+    gl_FragData[0] = vec4(diffuse.rgb, alpha);
+    //gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
+    gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 0.5);
+    gl_FragData[2] = vec4(emissive, shininess / 128.0);
+}
+
 <@endif@>

libraries/render-utils/src/Model.cpp

@@ -178,7 +178,7 @@ void Model::initProgram(ProgramObject& program, Model::Locations& locations, boo
     locations.alphaThreshold = program.uniformLocation("alphaThreshold");
     locations.texcoordMatrices = program.uniformLocation("texcoordMatrices");
     locations.emissiveParams = program.uniformLocation("emissiveParams");
-
+    locations.glowIntensity = program.uniformLocation("glowIntensity");
     program.setUniformValue("diffuseMap", 0);
     program.setUniformValue("normalMap", 1);
 
@@ -2367,6 +2367,10 @@ int Model::renderMeshesFromList(QVector<int>& list, gpu::Batch& batch, RenderMod
                     }
 
                     glm::vec4 diffuse = glm::vec4(part.diffuseColor, part.opacity);
+                    
+                    if (locations->glowIntensity >= 0) {
+                        GLBATCH(glUniform1f)(locations->glowIntensity, glowEffect->getIntensity());
+                    }
                     if (!(translucent && alphaThreshold == 0.0f)) {
                         GLBATCH(glAlphaFunc)(GL_EQUAL, diffuse.a = glowEffect->getIntensity());
                     }

libraries/render-utils/src/Model.h

@@ -338,6 +338,7 @@ private:
         int specularTextureUnit;
         int emissiveTextureUnit;
         int emissiveParams;
+        int glowIntensity;
     };
     
     static Locations _locations;

libraries/render-utils/src/model.slf

@@ -16,9 +16,6 @@
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 normal;
 
@@ -28,13 +25,8 @@ void main(void) {
 
     packDeferredFragment(
         normalize(normal.xyz), 
-        mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)),
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
         gl_Color.rgb * diffuse.rgb,
         gl_FrontMaterial.specular.rgb,
         gl_FrontMaterial.shininess);
-/*
-    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
-    gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
-    gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0);
-*/
 }

libraries/render-utils/src/model_lightmap.slf

@@ -12,6 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
@@ -19,9 +21,6 @@ uniform sampler2D diffuseMap;
 uniform sampler2D emissiveMap;
 uniform vec2 emissiveParams;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 normal;
 
@@ -32,7 +31,12 @@ void main(void) {
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
     vec4 emissive = texture2D(emissiveMap, interpolatedTexcoord1.st);
-    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
-    gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 0.5);
-    gl_FragData[2] = vec4((vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb), gl_FrontMaterial.shininess / 128.0);
+
+    packDeferredFragmentLightmap(
+        normalize(normal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        gl_FrontMaterial.specular.rgb,
+        gl_FrontMaterial.shininess,
+        (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb));
 }

libraries/render-utils/src/model_lightmap_normal_map.slf

@@ -12,6 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
@@ -22,9 +24,6 @@ uniform sampler2D normalMap;
 uniform sampler2D emissiveMap;
 uniform vec2 emissiveParams;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 interpolatedNormal;
 
@@ -45,7 +44,13 @@ void main(void) {
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
     vec4 emissive = texture2D(emissiveMap, interpolatedTexcoord1.st);
-    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb * (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb), mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
-    gl_FragData[1] = viewNormal + vec4(0.5, 0.5, 0.5, 1.0);
-    gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0);
+
+    packDeferredFragmentLightmap(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        //gl_Color.rgb * diffuse.rgb,
+        vec3(1.0, 0.0, 0.0),
+        gl_FrontMaterial.specular.rgb,
+        gl_FrontMaterial.shininess,
+        (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb));
 }

libraries/render-utils/src/model_lightmap_normal_specular_map.slf

@@ -12,6 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
@@ -25,9 +27,6 @@ uniform sampler2D normalMap;
 // the specular map texture
 uniform sampler2D specularMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 interpolatedNormal;
 
@@ -47,9 +46,20 @@ void main(void) {
     
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
+    vec3 specular = texture2D(specularMap, gl_TexCoord[0].st).rgb;
     vec4 emissive = texture2D(emissiveMap, interpolatedTexcoord1.st);
+
+    packDeferredFragmentLightmap(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        specular,
+        gl_FrontMaterial.shininess,
+        (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb));
+/*
     gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb * (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb), mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[1] = viewNormal + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb * texture2D(specularMap, gl_TexCoord[0].st).rgb,
         gl_FrontMaterial.shininess / 128.0);
+*/
 }

libraries/render-utils/src/model_lightmap_specular_map.slf

@@ -12,6 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
@@ -22,9 +24,6 @@ uniform vec2 emissiveParams;
 // the specular texture
 uniform sampler2D specularMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 normal;
 
@@ -33,9 +32,20 @@ varying vec2 interpolatedTexcoord1;
 void main(void) {
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
+    vec3 specular = texture2D(specularMap, gl_TexCoord[0].st).rgb;
     vec4 emissive = texture2D(emissiveMap, interpolatedTexcoord1.st);
+
+    packDeferredFragmentLightmap(
+        normalize(normal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        specular,
+        gl_FrontMaterial.shininess,
+        (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb));
+/*
     gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb * (vec3(emissiveParams.x) + emissiveParams.y * emissive.rgb), mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb * texture2D(specularMap, gl_TexCoord[0].st).rgb,
         gl_FrontMaterial.shininess / 128.0);    
+*/
 }

libraries/render-utils/src/model_normal_map.slf

@@ -12,15 +12,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
 // the normal map texture
 uniform sampler2D normalMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 interpolatedNormal;
 
@@ -38,7 +37,15 @@ void main(void) {
     
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
-    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
+/*    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[1] = viewNormal + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0);
+    */
+
+    packDeferredFragment(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        gl_FrontMaterial.specular.rgb,
+        gl_FrontMaterial.shininess);
 }

libraries/render-utils/src/model_normal_specular_map.slf

@@ -12,6 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
@@ -21,9 +23,6 @@ uniform sampler2D normalMap;
 // the specular map texture
 uniform sampler2D specularMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 interpolatedNormal;
 
@@ -41,8 +40,16 @@ void main(void) {
     
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
-    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
+    vec3 specular = texture2D(specularMap, gl_TexCoord[0].st).rgb;
+/*    gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[1] = viewNormal + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb * texture2D(specularMap, gl_TexCoord[0].st).rgb,
         gl_FrontMaterial.shininess / 128.0);
+        */
+    packDeferredFragment(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        specular,
+        gl_FrontMaterial.shininess);
 }

libraries/render-utils/src/model_specular_map.slf

@@ -12,23 +12,31 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
 // the specular texture
 uniform sampler2D specularMap;
 
-// the alpha threshold
-uniform float alphaThreshold;
-
 // the interpolated normal
 varying vec4 normal;
 
 void main(void) {
     // set the diffuse, normal, specular data
     vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
+    vec3 specular = texture2D(specularMap, gl_TexCoord[0].st).rgb;
+/*  
     gl_FragData[0] = vec4(gl_Color.rgb * diffuse.rgb, mix(gl_Color.a, 1.0 - gl_Color.a, step(diffuse.a, alphaThreshold)));
     gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb * texture2D(specularMap, gl_TexCoord[0].st).rgb,
         gl_FrontMaterial.shininess / 128.0);    
+        */
+    packDeferredFragment(
+        normalize(normal.xyz), 
+        evalOpaqueFinalAlpha(gl_Color.a, diffuse.a),
+        gl_Color.rgb * diffuse.rgb,
+        specular,
+        gl_FrontMaterial.shininess);
 }

libraries/render-utils/src/simple.slf

@@ -12,15 +12,25 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
 // the interpolated normal
 varying vec4 normal;
 
 // the glow intensity
-uniform float glowIntensity;
+//uniform float glowIntensity;
 
 void main(void) {
-    // set the diffuse, normal, specular data
+ /*   // set the diffuse, normal, specular data
     gl_FragData[0] = vec4(gl_Color.rgb, glowIntensity);
     gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
     gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0);
+    */
+
+    packDeferredFragment(
+        normalize(normal.xyz), 
+        glowIntensity,
+        gl_Color.rgb,
+        gl_FrontMaterial.specular.rgb,
+        gl_FrontMaterial.shininess);
 }