Fixed build problem.

This commit is contained in:
Sebastian Kupke 2019-07-18 08:52:46 +02:00
parent 0f4949b0ae
commit 5704beaad4
4 changed files with 86 additions and 44 deletions

View File

@ -4355,8 +4355,8 @@ if (typeof define === 'function' && define.amd) {
})); }));
/*! /*!
* pixi.js - v4.8.7 * pixi.js - v4.8.8
* Compiled Fri, 22 Mar 2019 16:20:35 UTC * Compiled Sun, 02 Jun 2019 22:37:20 UTC
* *
* pixi.js is licensed under the MIT License. * pixi.js is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license * http://www.opensource.org/licenses/mit-license
@ -12778,7 +12778,7 @@ exports.__esModule = true;
* @name VERSION * @name VERSION
* @type {string} * @type {string}
*/ */
var VERSION = exports.VERSION = '4.8.7'; var VERSION = exports.VERSION = '4.8.8';
/** /**
* Two Pi. * Two Pi.
@ -16851,6 +16851,8 @@ var CanvasGraphicsRenderer = function () {
var holes = data.holes; var holes = data.holes;
var outerArea = void 0; var outerArea = void 0;
var innerArea = void 0; var innerArea = void 0;
var px = void 0;
var py = void 0;
context.moveTo(points[0], points[1]); context.moveTo(points[0], points[1]);
@ -16865,31 +16867,41 @@ var CanvasGraphicsRenderer = function () {
if (holes.length > 0) { if (holes.length > 0) {
outerArea = 0; outerArea = 0;
for (var _j = 0; _j < points.length; _j += 2) { px = points[0];
outerArea += points[_j] * points[_j + 3] - points[_j + 1] * points[_j + 2]; py = points[1];
for (var _j = 2; _j + 2 < points.length; _j += 2) {
outerArea += (points[_j] - px) * (points[_j + 3] - py) - (points[_j + 2] - px) * (points[_j + 1] - py);
} }
for (var k = 0; k < holes.length; k++) { for (var k = 0; k < holes.length; k++) {
points = holes[k].points; points = holes[k].points;
innerArea = 0; if (!points) {
for (var _j2 = 0; _j2 < points.length; _j2 += 2) { continue;
innerArea += points[_j2] * points[_j2 + 3] - points[_j2 + 1] * points[_j2 + 2];
} }
context.moveTo(points[0], points[1]); innerArea = 0;
px = points[0];
py = points[1];
for (var _j2 = 2; _j2 + 2 < points.length; _j2 += 2) {
innerArea += (points[_j2] - px) * (points[_j2 + 3] - py) - (points[_j2 + 2] - px) * (points[_j2 + 1] - py);
}
if (innerArea * outerArea < 0) { if (innerArea * outerArea < 0) {
context.moveTo(points[0], points[1]);
for (var _j3 = 2; _j3 < points.length; _j3 += 2) { for (var _j3 = 2; _j3 < points.length; _j3 += 2) {
context.lineTo(points[_j3], points[_j3 + 1]); context.lineTo(points[_j3], points[_j3 + 1]);
} }
} else { } else {
for (var _j4 = points.length - 2; _j4 >= 2; _j4 -= 2) { context.moveTo(points[points.length - 2], points[points.length - 1]);
for (var _j4 = points.length - 4; _j4 >= 0; _j4 -= 2) {
context.lineTo(points[_j4], points[_j4 + 1]); context.lineTo(points[_j4], points[_j4 + 1]);
} }
} }
if (holes[k].closed) { if (holes[k].close) {
context.closePath(); context.closePath();
} }
} }
@ -25321,9 +25333,9 @@ function mapWebGLBlendModesToPixi(gl) {
// TODO - premultiply alpha would be different. // TODO - premultiply alpha would be different.
// add a boolean for that! // add a boolean for that!
array[_const.BLEND_MODES.NORMAL] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.NORMAL] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.ADD] = [gl.ONE, gl.DST_ALPHA]; array[_const.BLEND_MODES.ADD] = [gl.ONE, gl.ONE];
array[_const.BLEND_MODES.MULTIPLY] = [gl.DST_COLOR, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.MULTIPLY] = [gl.DST_COLOR, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.SCREEN] = [gl.ONE, gl.ONE_MINUS_SRC_COLOR]; array[_const.BLEND_MODES.SCREEN] = [gl.ONE, gl.ONE_MINUS_SRC_COLOR, gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.OVERLAY] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.OVERLAY] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.DARKEN] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.DARKEN] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.LIGHTEN] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.LIGHTEN] = [gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
@ -25340,8 +25352,8 @@ function mapWebGLBlendModesToPixi(gl) {
// not-premultiplied blend modes // not-premultiplied blend modes
array[_const.BLEND_MODES.NORMAL_NPM] = [gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA]; array[_const.BLEND_MODES.NORMAL_NPM] = [gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
array[_const.BLEND_MODES.ADD_NPM] = [gl.SRC_ALPHA, gl.DST_ALPHA, gl.ONE, gl.DST_ALPHA]; array[_const.BLEND_MODES.ADD_NPM] = [gl.SRC_ALPHA, gl.ONE, gl.ONE, gl.ONE];
array[_const.BLEND_MODES.SCREEN_NPM] = [gl.SRC_ALPHA, gl.ONE_MINUS_SRC_COLOR, gl.ONE, gl.ONE_MINUS_SRC_COLOR]; array[_const.BLEND_MODES.SCREEN_NPM] = [gl.SRC_ALPHA, gl.ONE_MINUS_SRC_COLOR, gl.ONE, gl.ONE_MINUS_SRC_ALPHA];
return array; return array;
} }
@ -69645,8 +69657,8 @@ var __filters=function(e,t){"use strict";var n="attribute vec2 aVertexPosition;\
/*! /*!
* pixi-particles - v4.1.0 * pixi-particles - v4.1.2
* Compiled Tue, 09 Apr 2019 13:12:08 UTC * Compiled Fri, 05 Jul 2019 15:33:06 UTC
* *
* pixi-particles is licensed under the MIT License. * pixi-particles is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license * http://www.opensource.org/licenses/mit-license
@ -70785,8 +70797,45 @@ this.PIXI = this.PIXI || {};
this.particlesPerWave = config.particlesPerWave; this.particlesPerWave = config.particlesPerWave;
this.particleSpacing = 0; this.particleSpacing = 0;
this.angleStart = 0; this.angleStart = 0;
var spawnCircle;
//determine the spawn function to use //determine the spawn function to use
this.parseSpawnType(config);
//set the spawning frequency
this.frequency = config.frequency;
this.spawnChance = (typeof config.spawnChance === 'number' && config.spawnChance > 0) ? config.spawnChance : 1;
//set the emitter lifetime
this.emitterLifetime = config.emitterLifetime || -1;
//set the max particles
this.maxParticles = config.maxParticles > 0 ? config.maxParticles : 1000;
//determine if we should add the particle at the back of the list or not
this.addAtBack = !!config.addAtBack;
//reset the emitter position and rotation variables
this.rotation = 0;
this.ownerPos = new pixi.Point();
this.spawnPos = new pixi.Point(config.pos.x, config.pos.y);
this.initAdditional(art, config);
this._prevEmitterPos = this.spawnPos.clone();
//previous emitter position is invalid and should not be used for interpolation
this._prevPosIsValid = false;
//start emitting
this._spawnTimer = 0;
this.emit = config.emit === undefined ? true : !!config.emit;
this.autoUpdate = !!config.autoUpdate;
};
/**
* Sets up additional parameters to the emitter from config settings.
* Using for parsing additional parameters on classes that extend from Emitter
* @param art A texture or array of textures to use for the particles.
* @param config A configuration object containing settings for the emitter.
*/
Emitter.prototype.initAdditional = function (art, config) {
};
/**
* Parsing emitter spawn type from config settings.
* Place for override and add new kind of spawn type
* @param config A configuration object containing settings for the emitter.
*/
Emitter.prototype.parseSpawnType = function (config) {
var spawnCircle;
switch (config.spawnType) { switch (config.spawnType) {
case "rect": case "rect":
this.spawnType = "rect"; this.spawnType = "rect";
@ -70827,26 +70876,6 @@ this.PIXI = this.PIXI || {};
this._spawnFunc = this._spawnPoint; this._spawnFunc = this._spawnPoint;
break; break;
} }
//set the spawning frequency
this.frequency = config.frequency;
this.spawnChance = (typeof config.spawnChance === 'number' && config.spawnChance > 0) ? config.spawnChance : 1;
//set the emitter lifetime
this.emitterLifetime = config.emitterLifetime || -1;
//set the max particles
this.maxParticles = config.maxParticles > 0 ? config.maxParticles : 1000;
//determine if we should add the particle at the back of the list or not
this.addAtBack = !!config.addAtBack;
//reset the emitter position and rotation variables
this.rotation = 0;
this.ownerPos = new pixi.Point();
this.spawnPos = new pixi.Point(config.pos.x, config.pos.y);
this._prevEmitterPos = this.spawnPos.clone();
//previous emitter position is invalid and should not be used for interpolation
this._prevPosIsValid = false;
//start emitting
this._spawnTimer = 0;
this.emit = config.emit === undefined ? true : !!config.emit;
this.autoUpdate = !!config.autoUpdate;
}; };
/** /**
* Recycles an individual particle. For internal use only. * Recycles an individual particle. For internal use only.
@ -71091,6 +71120,8 @@ this.PIXI = this.PIXI || {};
p.ease = this.customEase; p.ease = this.customEase;
//set the extra data, if any //set the extra data, if any
p.extraData = this.extraData; p.extraData = this.extraData;
//set additional properties to particle
this.applyAdditionalProperties(p);
//call the proper function to handle rotation and position of particle //call the proper function to handle rotation and position of particle
this._spawnFunc(p, emitPosX, emitPosY, i); this._spawnFunc(p, emitPosX, emitPosY, i);
//initialize particle //initialize particle
@ -71148,13 +71179,22 @@ this.PIXI = this.PIXI || {};
//if we are all done and should destroy ourselves, take care of that //if we are all done and should destroy ourselves, take care of that
if (!this._emit && !this._activeParticlesFirst) { if (!this._emit && !this._activeParticlesFirst) {
if (this._completeCallback) { if (this._completeCallback) {
this._completeCallback(); var cb = this._completeCallback;
this._completeCallback = null;
cb();
} }
if (this._destroyWhenComplete) { if (this._destroyWhenComplete) {
this.destroy(); this.destroy();
} }
} }
}; };
/**
* Set additional properties to new particle.
* Using on classes that extend from Emitter
* @param p The particle
*/
Emitter.prototype.applyAdditionalProperties = function (p) {
};
/** /**
* Positions a particle for a point type emitter. * Positions a particle for a point type emitter.
* @param p The particle to position and rotate. * @param p The particle to position and rotate.
@ -73408,6 +73448,7 @@ var pixi_projection;
matrix.c = -matrix.b * D; matrix.c = -matrix.b * D;
} }
} }
return matrix;
}; };
Matrix2d.prototype.copyFrom = function (matrix) { Matrix2d.prototype.copyFrom = function (matrix) {
var mat3 = this.mat3; var mat3 = this.mat3;
@ -74809,6 +74850,7 @@ var pixi_projection;
matrix.c = 0; matrix.c = 0;
} }
} }
return matrix;
}; };
Matrix3d.prototype.copyFrom = function (matrix) { Matrix3d.prototype.copyFrom = function (matrix) {
var mat3 = this.mat4; var mat3 = this.mat4;
@ -103180,7 +103222,7 @@ module.exports = function (_Plugin) {
getTransformationMatrix(element)) getTransformationMatrix(element))
} }
}()) }());
(function () { (function () {

File diff suppressed because one or more lines are too long

View File

@ -8189,4 +8189,4 @@ if (_gsScope._gsDefine) { _gsScope._gsQueue.pop()(); } //necessary in case Tween
getTransformationMatrix(element)) getTransformationMatrix(element))
} }
}()) }());

View File

@ -80,4 +80,4 @@
getTransformationMatrix(element)) getTransformationMatrix(element))
} }
}()) }());