Updated shader to support tint effect attribute

Author: photonstorm

src/renderer/webgl/shaders/TextureTint-frag.js

@@ -6,12 +6,22 @@ module.exports = [
     'uniform sampler2D uMainSampler;',
     '',
     'varying vec2 outTexCoord;',
+    'varying float outTintEffect;',
     'varying vec4 outTint;',
     '',
     'void main()',
     '{',
     '    vec4 texel = texture2D(uMainSampler, outTexCoord);',
-    '    texel *= vec4(outTint.rgb * outTint.a, outTint.a);',
+    '',
+    '    if (outTintEffect == 1.0)',
+    '    {',
+    '        texel.rgb = mix(texel.rgb, outTint.rgb, texel.a);',
+    '    }',
+    '    else',
+    '    {',
+    '        texel *= vec4(outTint.rgb * outTint.a, outTint.a);',
+    '    }',
+    '',
     '    gl_FragColor = texel;',
     '}',
     ''

src/renderer/webgl/shaders/TextureTint-vert.js

@@ -9,16 +9,20 @@ module.exports = [
     '',
     'attribute vec2 inPosition;',
     'attribute vec2 inTexCoord;',
+    'attribute float inTintEffect;',
     'attribute vec4 inTint;',
     '',
     'varying vec2 outTexCoord;',
+    'varying float outTintEffect;',
     'varying vec4 outTint;',
     '',
     'void main ()',
     '{',
     '    gl_Position = uProjectionMatrix * uViewMatrix * uModelMatrix * vec4(inPosition, 1.0, 1.0);',
+    '',
     '    outTexCoord = inTexCoord;',
     '    outTint = inTint;',
+    '    outTintEffect = inTintEffect;',
     '}',
     '',
     ''

src/renderer/webgl/shaders/src/TextureTint.frag

@@ -5,11 +5,21 @@ precision mediump float;
 uniform sampler2D uMainSampler;
 
 varying vec2 outTexCoord;
+varying float outTintEffect;
 varying vec4 outTint;
 
-void main() 
+void main()
 {
     vec4 texel = texture2D(uMainSampler, outTexCoord);
-    texel *= vec4(outTint.rgb * outTint.a, outTint.a);
+
+    if (outTintEffect == 1.0)
+    {
+        texel.rgb = mix(texel.rgb, outTint.rgb, texel.a);
+    }
+    else
+    {
+        texel *= vec4(outTint.rgb * outTint.a, outTint.a);
+    }
+
     gl_FragColor = texel;
 }

src/renderer/webgl/shaders/src/TextureTint.vert

@@ -8,15 +8,19 @@ uniform mat4 uModelMatrix;
 
 attribute vec2 inPosition;
 attribute vec2 inTexCoord;
+attribute float inTintEffect;
 attribute vec4 inTint;
 
 varying vec2 outTexCoord;
+varying float outTintEffect;
 varying vec4 outTint;
 
 void main () 
 {
     gl_Position = uProjectionMatrix * uViewMatrix * uModelMatrix * vec4(inPosition, 1.0, 1.0);
+
     outTexCoord = inTexCoord;
     outTint = inTint;
+    outTintEffect = inTintEffect;
 }