Merge pull request #457 from tsherif/pre-mult-alpha

Alpha pre-multiplied in fragment shader for proper compositing.
xeolabs · Mar 16, 2016 · 668f3fa · 668f3fa
2 parents 21f8249 + 6b267a7
commit 668f3fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/core/display/chunks/flagsChunk.js b/src/core/display/chunks/flagsChunk.js
@@ -63,7 +63,7 @@ SceneJS_ChunkFactory.createChunkType({
                     // Entering a transparency bin
 
                     gl.enable(gl.BLEND);
-                    gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+                    gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
                     frameCtx.blendEnabled = true;
 
                 } else {

diff --git a/src/core/display/chunks/regionMapChunk.js b/src/core/display/chunks/regionMapChunk.js
@@ -29,7 +29,7 @@ SceneJS_ChunkFactory.createChunkType({
                 // Entering a transparency bin
 
                 gl.enable(gl.BLEND);
-                gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+                gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
                 frameCtx.blendEnabled = true;
 
             } else {

diff --git a/src/core/display/chunks/renderTargetChunk.js b/src/core/display/chunks/renderTargetChunk.js
@@ -36,7 +36,7 @@ SceneJS_ChunkFactory.createChunkType({
             //  Enable blending for non-depth targets
             if (frameCtx.blendEnabled) {
                 gl.enable(gl.BLEND);
-                gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+                gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
             }
         }
 

diff --git a/src/core/display/programSourceFactory.js b/src/core/display/programSourceFactory.js
@@ -1214,6 +1214,10 @@ var SceneJS_ProgramSourceFactory = new (function () {
             add("fragColor.rgb *= mix(SCENEJS_uFragmentFresnelEdgeColor.rgb, SCENEJS_uFragmentFresnelCenterColor.rgb, fragmentFresnel);");
         }
 
+        if (!depthTargeting) {
+            add("fragColor.rgb *= fragColor.a;");
+        }
+
         add("gl_FragColor = fragColor;");
 
         add("}");