Premultiply WebGL alpha

jonobr1 · Dec 4, 2019 · 8e32a99 · 8e32a99
1 parent ffbf48d
commit 8e32a99
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 51 deletions.
diff --git a/build/two.js b/build/two.js
@@ -472,7 +472,7 @@ SOFTWARE.
      * @name Two.PublishDate
      * @property {String} - The automatically generated publish date in the build process to verify version release candidates.
      */
-    PublishDate: '2019-12-04T10:23:43+01:00',
+    PublishDate: '2019-12-04T05:29:49-05:00',
 
     /**
      * @name Two.Identifier
@@ -6979,9 +6979,7 @@ SOFTWARE.
         });
 
         if (this._mask) {
-
           gl.disable(gl.STENCIL_TEST);
-
         }
 
         return this.flagReset();
@@ -8122,18 +8120,10 @@ SOFTWARE.
     // Setup some initial statements of the gl context
     gl.enable(gl.BLEND);
 
-    // https://code.google.com/p/chromium/issues/detail?id=316393
-    gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, gl.TRUE);
-
-    gl.blendEquationSeparate(gl.FUNC_ADD, gl.FUNC_ADD);
-    gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA,
-      gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
-
-    // TODO: Fiddling with blend functions still required.
-    // gl.blendEquation(gl.FUNC_ADD);
-    // gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-
+    gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true);
 
+    gl.blendEquation(gl.FUNC_ADD);
+    gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
   };
 
   _.extend(Renderer, {