Cleaning the Model rendering path from any use of glMaterial

libraries/render-utils/src/DeferredBufferWrite.slh

@@ -34,4 +34,10 @@ void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 s
     gl_FragData[2] = vec4(emissive, shininess / 128.0);
 }
 
+void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
+    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);
+}
+
 <@endif@>

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -169,7 +169,8 @@ void DeferredLightingEffect::render() {
     QOpenGLFramebufferObject* freeFBO = DependencyManager::get<GlowEffect>()->getFreeFramebufferObject();
     freeFBO->bind();
     glClear(GL_COLOR_BUFFER_BIT);
-    
+    glEnable(GL_FRAMEBUFFER_SRGB);
+
     glBindTexture(GL_TEXTURE_2D, primaryFBO->texture());
     
     glActiveTexture(GL_TEXTURE1);
@@ -371,6 +372,7 @@ void DeferredLightingEffect::render() {
     glBindTexture(GL_TEXTURE_2D, 0);
     
     freeFBO->release();
+    glDisable(GL_FRAMEBUFFER_SRGB);
     
     glDisable(GL_CULL_FACE);
     

libraries/render-utils/src/Material.slh

@@ -23,6 +23,7 @@ vec3 getMaterialSpecular(Material m) { return m._specular.rgb; }
 float getMaterialShininess(Material m) { return m._specular.a; }
 
 
+
 <@if GLPROFILE == PC_GL@>
 uniform materialBuffer {
     Material mat;

libraries/render-utils/src/model.slv

@@ -23,7 +23,7 @@ void main(void) {
     normal = normalize(gl_ModelViewMatrix * vec4(gl_Normal, 0.0));
     
     // pass along the diffuse color
-    gl_FrontColor = gl_Color * gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
     
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);

libraries/render-utils/src/model_lightmap.slv

@@ -29,7 +29,7 @@ void main(void) {
     normal = normalize(gl_ModelViewMatrix * vec4(gl_Normal, 0.0));
     
     // pass along the diffuse color
-    gl_FrontColor = gl_Color * gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
     
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);

libraries/render-utils/src/model_lightmap_normal_map.slv

@@ -36,7 +36,7 @@ void main(void) {
     interpolatedTangent = gl_ModelViewMatrix * vec4(tangent, 0.0);
     
     // pass along the diffuse color
-    gl_FrontColor = gl_Color * gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
     
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);

libraries/render-utils/src/model_normal_map.slv

@@ -31,7 +31,7 @@ void main(void) {
     interpolatedTangent = gl_ModelViewMatrix * vec4(tangent, 0.0);
     
     // pass along the diffuse color
-    gl_FrontColor = gl_Color * gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
     
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);

libraries/render-utils/src/model_translucent.slf

@@ -12,10 +12,29 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+<@include DeferredBufferWrite.slh@>
+
+<@include Material.slh@>
+
 // the diffuse texture
 uniform sampler2D diffuseMap;
 
+varying vec4 normal;
+
 void main(void) {
+
+    // Fetch diffuse map
+    vec4 diffuse = texture2D(diffuseMap, gl_TexCoord[0].st);
+
+    Material mat = getMaterial();
+
+    packDeferredFragmentTranslucent(
+        normalize(normal.xyz), 
+        getMaterialOpacity(mat) * diffuse.a,
+        getMaterialDiffuse(mat) * diffuse.rgb,
+        getMaterialSpecular(mat),
+        getMaterialShininess(mat));
+
     // set the diffuse data
-    gl_FragData[0] = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].st);
+ //   gl_FragData[0] = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].st);
 }

libraries/render-utils/src/skin_model.slv

@@ -38,8 +38,8 @@ void main(void) {
     normal = normalize(gl_ModelViewMatrix * normal);
     
     // pass along the diffuse color
-    gl_FrontColor = gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
-    
+
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);
     

libraries/render-utils/src/skin_model_normal_map.slv

@@ -46,8 +46,8 @@ void main(void) {
     interpolatedTangent = gl_ModelViewMatrix * interpolatedTangent;
     
     // pass along the diffuse color
-    gl_FrontColor = gl_FrontMaterial.diffuse;
+    gl_FrontColor = gl_Color;
-    
+
     // and the texture coordinates
     gl_TexCoord[0] = texcoordMatrices[0] * vec4(gl_MultiTexCoord0.xy, 0.0, 1.0);