Update libs

Author: lannymcnie

lib/easeljs-NEXT.combined.js

@@ -9248,56 +9248,58 @@ this.createjs = this.createjs||{};
 	 */
 	StageGL.UV_RECT = {t:0, l:0, b:1, r:1};
 
-	/**
-	 * Vertex positions for a card that covers the entire render. Used with render targets primarily.
-	 * @property COVER_VERT
-	 * @static
-	 * @final
-	 * @type {Float32Array}
-	 * @readonly
-	 */
-	StageGL.COVER_VERT = new Float32Array([
-		-1,		 1,		//TL
-		1,		 1,		//TR
-		-1,		-1,		//BL
-		1,		 1,		//TR
-		1,		-1,		//BR
-		-1,		-1		//BL
-	]);
-
-	/**
-	 * U/V for {{#crossLink "StageGL/COVER_VERT:property"}}{{/crossLink}}.
-	 * @property COVER_UV
-	 * @static
-	 * @final
-	 * @type {Float32Array}
-	 * @readonly
-	 */
-	StageGL.COVER_UV = new Float32Array([
-		 0,		 0,		//TL
-		 1,		 0,		//TR
-		 0,		 1,		//BL
-		 1,		 0,		//TR
-		 1,		 1,		//BR
-		 0,		 1		//BL
-	]);
-
-	/**
-	 * Flipped U/V for {{#crossLink "StageGL:COVER_VERT:property"}}{{/crossLink}}.
-	 * @property COVER_UV_FLIP
-	 * @static
-	 * @final
-	 * @type {Float32Array}
-	 * @readonly
-	 */
-	StageGL.COVER_UV_FLIP = new Float32Array([
-		 0,		 1,		//TL
-		 1,		 1,		//TR
-		 0,		 0,		//BL
-		 1,		 1,		//TR
-		 1,		 0,		//BR
-		 0,		 0		//BL
-	]);
+	try {
+		/**
+		 * Vertex positions for a card that covers the entire render. Used with render targets primarily.
+		 * @property COVER_VERT
+		 * @static
+		 * @final
+		 * @type {Float32Array}
+		 * @readonly
+		 */
+		StageGL.COVER_VERT = new Float32Array([
+			-1,		 1,		//TL
+			1,		 1,		//TR
+			-1,		-1,		//BL
+			1,		 1,		//TR
+			1,		-1,		//BR
+			-1,		-1		//BL
+		]);
+
+		/**
+		 * U/V for {{#crossLink "StageGL/COVER_VERT:property"}}{{/crossLink}}.
+		 * @property COVER_UV
+		 * @static
+		 * @final
+		 * @type {Float32Array}
+		 * @readonly
+		 */
+		StageGL.COVER_UV = new Float32Array([
+			 0,		 0,		//TL
+			 1,		 0,		//TR
+			 0,		 1,		//BL
+			 1,		 0,		//TR
+			 1,		 1,		//BR
+			 0,		 1		//BL
+		]);
+
+		/**
+		 * Flipped U/V for {{#crossLink "StageGL:COVER_VERT:property"}}{{/crossLink}}.
+		 * @property COVER_UV_FLIP
+		 * @static
+		 * @final
+		 * @type {Float32Array}
+		 * @readonly
+		 */
+		StageGL.COVER_UV_FLIP = new Float32Array([
+			 0,		 1,		//TL
+			 1,		 1,		//TR
+			 0,		 0,		//BL
+			 1,		 1,		//TR
+			 1,		 0,		//BR
+			 0,		 0		//BL
+		]);
+	} catch(e) { /* Breaking in older browsers, but those browsers wont run StageGL so no recovery or warning needed */ }
 
 	/**
 	 * Portion of the shader that contains the "varying" properties required in both vertex and fragment shaders. The
@@ -9392,7 +9394,17 @@ this.createjs = this.createjs||{};
 				"{{alternates}}" +
 			"}" +
 
-			"gl_FragColor = vec4(color.rgb{{premultiply}}, color.a * alphaValue);" +
+			"{{fragColor}}" +
+		"}"
+	);
+	StageGL.REGULAR_FRAG_COLOR_NORMAL = (
+		"gl_FragColor = vec4(color.rgb, color.a * alphaValue);"
+	);
+	StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY = (
+		"if(color.a > 0.0035) {" +		// 1/255 = 0.0039, so ignore any value below 1 because it's probably noise
+			"gl_FragColor = vec4(color.rgb/color.a, color.a * alphaValue);" +
+		"} else {" +
+			"gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);" +
 		"}"
 	);
 
@@ -10280,7 +10292,7 @@ this.createjs = this.createjs||{};
 			insert += "} else if (indexPicker <= "+ i +".5) { color = texture2D(uSampler["+ i +"], vTextureCoord);";
 		}
 		str = str.replace(/{{alternates}}/g, insert);
-		str = str.replace(/{{premultiply}}/g, this._premultiply ? "/color.a" : "");
+		str = str.replace(/{{fragColor}}/g, this._premultiply ? StageGL.REGULAR_FRAG_COLOR_NORMAL : StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY);
 
 		// actually compile the shader
 		var shader = gl.createShader(type);
@@ -10689,15 +10701,14 @@ this.createjs = this.createjs||{};
 		mtx = mtx.clone();
 		mtx.scale(1/manager.scale, 1/manager.scale);
 		mtx = mtx.invert();
-		mtx.translate(-manager.offX/manager.scale, -manager.offY/manager.scale);
+		mtx.translate(-manager.offX/manager.scale*target.scaleX, -manager.offY/manager.scale*target.scaleY);
 		var container = this._cacheContainer;
 		container.children = [target];
 		container.transformMatrix = mtx;
 
 		this._backupBatchTextures(false);
 
-		var filterCount = filters && filters.length;
-		if (filterCount) {
+		if (filters && filters.length) {
 			this._drawFilters(target, filters, manager);
 		} else {
 			// is this for another stage or mine?
@@ -10743,7 +10754,7 @@ this.createjs = this.createjs||{};
 		var wBackup = this._viewportWidth, hBackup = this._viewportHeight;
 
 		var container = this._cacheContainer;
-		var filterCount = filters && filters.length;
+		var filterCount = filters.length;
 
 		// we don't know which texture slot we're dealing with previously and we need one out of the way
 		// once we're using that slot activate it so when we make and bind our RenderTexture it's safe there
@@ -10762,10 +10773,8 @@ this.createjs = this.createjs||{};
 		this.setTextureParams(gl);
 
 		var flipY = false;
-
-		// apply each filter in order, but remember to toggle used texture and render buffer
-		for (var i=0; i<filterCount; i++) {
-			var filter = filters[i];
+		var i = 0, filter = filters[i];
+		do { // this is safe because we wouldn't be in apply filters without a filter count of at least 1
 
 			// swap to correct shader
 			this._activeShader = this.getFilterShader(filter);
@@ -10787,10 +10796,14 @@ this.createjs = this.createjs||{};
 			this.setTextureParams(gl);
 
 			// use flipping to keep things upright, things already cancel out on a single filter
-			if (filterCount > 1) {
+			// this needs to be here as multiPass is not accurate to _this_ frame until after shader acquisition
+			if (filterCount > 1 || filters[0]._multiPass) {
 				flipY = !flipY;
 			}
-		}
+
+			// work through the multipass if it's there, otherwise move on
+			filter = filter._multiPass !== null ? filter._multiPass : filters[++i];
+		} while (filter);
 
 		// is this for another stage or mine
 		if (this.isCacheControlled) {
@@ -14289,6 +14302,15 @@ this.createjs = this.createjs||{};
 		 */
 		this.usesContext = false;
 
+		/**
+		 * Another filter that is required to act as part of this filter and created and managed under the hood.
+		 * @private
+		 * @property _multiPass
+		 * @type {Filter}
+		 * @default null
+		 */
+		this._multiPass = null;
+
 		/**
 		 * Pre-processed template shader code. It will be parsed before being fed in into the shader compiler.
 		 * This should be based upon StageGL.SHADER_VERTEX_BODY_REGULAR
@@ -14891,9 +14913,8 @@ this.createjs = this.createjs||{};
 
 		var data;
 
-		var l = filters.length;
-		for (var i=0; i<l; i++) {
-			var filter = filters[i];
+		var i = 0, filter = filters[i];
+		do { // this is safe because we wouldn't be in apply filters without a filter count of at least 1
 			if(filter.usesContext){
 				if(data) {
 					ctx.putImageData(data, 0,0);
@@ -14906,7 +14927,10 @@ this.createjs = this.createjs||{};
 				}
 				filter._applyFilter(data);
 			}
-		}
+
+			// work through the multipass if it's there, otherwise move on
+			filter = filter._multiPass !== null ? filter._multiPass : filters[++i];
+		} while (filter);
 
 		//done
 		if(data) {
@@ -16621,6 +16645,6 @@ this.createjs = this.createjs || {};
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*=date*/"Tue, 04 Jul 2017 15:42:51 GMT"; // injected by build process
+	s.buildDate = /*=date*/"Mon, 17 Jul 2017 17:06:39 GMT"; // injected by build process
 
 })();