Merge pull request #6191 from sebavan/master

Fix vertex Alpha

src/Layers/effectLayer.ts

@@ -507,7 +507,7 @@ export abstract class EffectLayer {
             this._effectLayerMapGenerationEffect = this._scene.getEngine().createEffect("glowMapGeneration",
                 attribs,
                 ["world", "mBones", "viewProjection",
-                    "color", "morphTargetInfluences",
+                    "glowColor", "morphTargetInfluences",
                     "diffuseMatrix", "emissiveMatrix", "opacityMatrix", "opacityIntensity"],
                 ["diffuseSampler", "emissiveSampler", "opacitySampler"], join,
                 undefined, undefined, undefined, { maxSimultaneousMorphTargets: morphInfluencers });
@@ -664,7 +664,7 @@ export abstract class EffectLayer {
 
             this._effectLayerMapGenerationEffect.setMatrix("viewProjection", scene.getTransformMatrix());
 
-            this._effectLayerMapGenerationEffect.setFloat4("color",
+            this._effectLayerMapGenerationEffect.setFloat4("glowColor",
                 this._emissiveTextureAndColor.color.r,
                 this._emissiveTextureAndColor.color.g,
                 this._emissiveTextureAndColor.color.b,

src/Shaders/glowMapGeneration.fragment.fx

@@ -14,12 +14,16 @@ varying vec2 vUVEmissive;
 uniform sampler2D emissiveSampler;
 #endif
 
-uniform vec4 color;
+#ifdef VERTEXALPHA
+    varying vec4 vColor;
+#endif
+
+uniform vec4 glowColor;
 
 void main(void)
 {
 
-vec4 finalColor = color;
+vec4 finalColor = glowColor;
 
 // _____________________________ Alpha Information _______________________________
 #ifdef DIFFUSE