Add material ID to provide increased specular effect in Rembrandt for water and ubershader.

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>

Shaders/sunlight-nofiltering.frag

@@ -73,6 +73,11 @@ void main() {
         halfDir /= len;
         Ispec = pow( clamp( dot( halfDir, normal ), 0.0, 1.0 ), spec_emis.y * 128.0 ) * spec_emis.x * fg_SunSpecularColor.rgb;
     }
+
+    float matID = texture2D( color_tex, coords ).a * 255.0;
+    if (matID == 255.0)
+        Idiff += Ispec * spec_emis.x;
+
     gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);
 //    gl_FragColor = mix(tint, vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0), 0.92);
 }

Shaders/sunlight-noshadow.frag

@@ -33,5 +33,10 @@ void main() {
         halfDir /= len;
         Ispec = pow( clamp( dot( halfDir, normal ), 0.0, 1.0 ), spec_emis.y * 255.0 ) * spec_emis.x * fg_SunSpecularColor.rgb;
     }
+
+    float matID = texture2D( color_tex, coords ).a * 255.0;
+    if (matID == 255.0)
+        Idiff += Ispec * spec_emis.x;
+
     gl_FragColor = vec4(Idiff + Ispec + Iemis, 1.0);
 }

Shaders/sunlight-simple.frag

@@ -69,6 +69,11 @@ void main() {
         halfDir /= len;
         Ispec = pow( clamp( dot( halfDir, normal ), 0.0, 1.0 ), spec_emis.y * 128.0 ) * spec_emis.x * fg_SunSpecularColor.rgb;
     }
+
+    float matID = texture2D( color_tex, coords ).a * 255.0;
+    if (matID == 255.0)
+        Idiff += Ispec * spec_emis.x;
+
     gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);
 //    gl_FragColor = mix(tint, vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0), 0.92);
 }

Shaders/sunlight.frag

@@ -91,6 +91,11 @@ void main() {
         halfDir /= len;
         Ispec = pow( clamp( dot( halfDir, normal ), 0.0, 1.0 ), spec_emis.y * 128.0 ) * spec_emis.x * fg_SunSpecularColor.rgb;
     }
+
+    float matID = texture2D( color_tex, coords ).a * 255.0;
+    if (matID == 255.0)
+        Idiff += Ispec * spec_emis.x;
+
     gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);
 //    gl_FragColor = mix(tint, vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0), 0.92);
 }

Shaders/ubershader-gbuffer.frag

@@ -184,5 +184,5 @@ void main (void)
 // END lightmap
 /////////////////////////////////////////////////////////////////////
 
-	encode_gbuffer(N, fragColor.rgb, 1, specular, gl_FrontMaterial.shininess, emission, gl_FragCoord.z);
+	encode_gbuffer(N, fragColor.rgb, 255, specular, gl_FrontMaterial.shininess, emission, gl_FragCoord.z);
 }

Shaders/water-gbuffer.frag

@@ -199,5 +199,5 @@ void main(void)
                           vec3( 0.3, 0.59, 0.11 )
                         );
     float specular = smoothstep(0.0, 3.5, cover);
-    encode_gbuffer(Normal, finalColor.rgb, 1, specular, 128, emission, gl_FragCoord.z);
+    encode_gbuffer(Normal, finalColor.rgb, 255, specular, 128, emission, gl_FragCoord.z);
     }

Shaders/water_sine-gbuffer.frag

@@ -379,5 +379,5 @@ void main(void)
                           vec3( 0.3, 0.59, 0.11 )
                         );
     float specular = smoothstep(0.0, 3.5, cover);
-    encode_gbuffer(Normal, finalColor.rgb, 1, specular, water_shininess, emission, gl_FragCoord.z);
+    encode_gbuffer(Normal, finalColor.rgb, 255, specular, water_shininess, emission, gl_FragCoord.z);
     }