diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index c844137..e7102e2 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -9,13 +9,13 @@ * pixi.js is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php */ -/** - * @author Mat Groves http://matgroves.com/ @Doormat23 - */ - -(function(){ - - var root = this; +/** + * @author Mat Groves http://matgroves.com/ @Doormat23 + */ + +(function(){ + + var root = this; /** * @author Mat Groves http://matgroves.com/ @Doormat23 @@ -11254,6 +11254,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -11263,7 +11264,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index c844137..e7102e2 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -9,13 +9,13 @@ * pixi.js is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php */ -/** - * @author Mat Groves http://matgroves.com/ @Doormat23 - */ - -(function(){ - - var root = this; +/** + * @author Mat Groves http://matgroves.com/ @Doormat23 + */ + +(function(){ + + var root = this; /** * @author Mat Groves http://matgroves.com/ @Doormat23 @@ -11254,6 +11254,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -11263,7 +11264,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/docs/files/src_pixi_extras_Spine.js.html b/docs/files/src_pixi_extras_Spine.js.html index bb31640..f92ab4e 100644 --- a/docs/files/src_pixi_extras_Spine.js.html +++ b/docs/files/src_pixi_extras_Spine.js.html @@ -997,6 +997,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -1006,7 +1007,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index c844137..e7102e2 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -9,13 +9,13 @@ * pixi.js is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php */ -/** - * @author Mat Groves http://matgroves.com/ @Doormat23 - */ - -(function(){ - - var root = this; +/** + * @author Mat Groves http://matgroves.com/ @Doormat23 + */ + +(function(){ + + var root = this; /** * @author Mat Groves http://matgroves.com/ @Doormat23 @@ -11254,6 +11254,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -11263,7 +11264,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/docs/files/src_pixi_extras_Spine.js.html b/docs/files/src_pixi_extras_Spine.js.html index bb31640..f92ab4e 100644 --- a/docs/files/src_pixi_extras_Spine.js.html +++ b/docs/files/src_pixi_extras_Spine.js.html @@ -997,6 +997,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -1006,7 +1007,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/src/pixi/extras/Spine.js b/src/pixi/extras/Spine.js index cf68012..38db1ad 100644 --- a/src/pixi/extras/Spine.js +++ b/src/pixi/extras/Spine.js @@ -791,6 +791,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -800,7 +801,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index c844137..e7102e2 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -9,13 +9,13 @@ * pixi.js is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php */ -/** - * @author Mat Groves http://matgroves.com/ @Doormat23 - */ - -(function(){ - - var root = this; +/** + * @author Mat Groves http://matgroves.com/ @Doormat23 + */ + +(function(){ + + var root = this; /** * @author Mat Groves http://matgroves.com/ @Doormat23 @@ -11254,6 +11254,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -11263,7 +11264,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/docs/files/src_pixi_extras_Spine.js.html b/docs/files/src_pixi_extras_Spine.js.html index bb31640..f92ab4e 100644 --- a/docs/files/src_pixi_extras_Spine.js.html +++ b/docs/files/src_pixi_extras_Spine.js.html @@ -997,6 +997,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -1006,7 +1007,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/src/pixi/extras/Spine.js b/src/pixi/extras/Spine.js index cf68012..38db1ad 100644 --- a/src/pixi/extras/Spine.js +++ b/src/pixi/extras/Spine.js @@ -791,6 +791,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -800,7 +801,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index f4d82cb..190c439 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -361,15 +361,11 @@ * Destroys this text object * * @method destroy - * @param destroyTexture {Boolean} + * @param destroyBaseTexture {Boolean} whether to destroy the base texture as well */ -PIXI.Text.prototype.destroy = function(destroyTexture) +PIXI.Text.prototype.destroy = function(destroyBaseTexture) { - if(destroyTexture) - { - this.texture.destroy(); - } - + this.texture.destroy(destroyBaseTexture); }; PIXI.Text.heightCache = {}; diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index c844137..e7102e2 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -9,13 +9,13 @@ * pixi.js is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php */ -/** - * @author Mat Groves http://matgroves.com/ @Doormat23 - */ - -(function(){ - - var root = this; +/** + * @author Mat Groves http://matgroves.com/ @Doormat23 + */ + +(function(){ + + var root = this; /** * @author Mat Groves http://matgroves.com/ @Doormat23 @@ -11254,6 +11254,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -11263,7 +11264,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/docs/files/src_pixi_extras_Spine.js.html b/docs/files/src_pixi_extras_Spine.js.html index bb31640..f92ab4e 100644 --- a/docs/files/src_pixi_extras_Spine.js.html +++ b/docs/files/src_pixi_extras_Spine.js.html @@ -997,6 +997,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -1006,7 +1007,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/src/pixi/extras/Spine.js b/src/pixi/extras/Spine.js index cf68012..38db1ad 100644 --- a/src/pixi/extras/Spine.js +++ b/src/pixi/extras/Spine.js @@ -791,6 +791,7 @@ this.queue = []; }; spine.AnimationState.prototype = { + animationSpeed: 1, current: null, previous: null, currentTime: 0, @@ -800,7 +801,7 @@ mixTime: 0, mixDuration: 0, update: function (delta) { - this.currentTime += delta; + this.currentTime += (delta * this.animationSpeed); //timeScale: Multiply delta by the speed of animation required. this.previousTime += delta; this.mixTime += delta; diff --git a/src/pixi/text/Text.js b/src/pixi/text/Text.js index f4d82cb..190c439 100644 --- a/src/pixi/text/Text.js +++ b/src/pixi/text/Text.js @@ -361,15 +361,11 @@ * Destroys this text object * * @method destroy - * @param destroyTexture {Boolean} + * @param destroyBaseTexture {Boolean} whether to destroy the base texture as well */ -PIXI.Text.prototype.destroy = function(destroyTexture) +PIXI.Text.prototype.destroy = function(destroyBaseTexture) { - if(destroyTexture) - { - this.texture.destroy(); - } - + this.texture.destroy(destroyBaseTexture); }; PIXI.Text.heightCache = {}; diff --git a/src/pixi/textures/BaseTexture.js b/src/pixi/textures/BaseTexture.js index d0b3ce4..d01b281 100644 --- a/src/pixi/textures/BaseTexture.js +++ b/src/pixi/textures/BaseTexture.js @@ -115,9 +115,14 @@ if(this.imageUrl) { delete PIXI.BaseTextureCache[this.imageUrl]; + delete PIXI.TextureCache[this.imageUrl]; this.imageUrl = null; this.source.src = null; } + else if (this.source && this.source._pixiId) + { + delete PIXI.BaseTextureCache[this.source._pixiId]; + } this.source = null; PIXI.texturesToDestroy.push(this); };