diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 30388c6..dc66e48 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -15,7 +15,7 @@ { EventEmitter.call(this); - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The Resolution of the texture. @@ -416,7 +416,7 @@ { if (!canvas._pixiId) { - canvas._pixiId = 'canvas_' + utils.uuid(); + canvas._pixiId = 'canvas_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[canvas._pixiId]; diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 30388c6..dc66e48 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -15,7 +15,7 @@ { EventEmitter.call(this); - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The Resolution of the texture. @@ -416,7 +416,7 @@ { if (!canvas._pixiId) { - canvas._pixiId = 'canvas_' + utils.uuid(); + canvas._pixiId = 'canvas_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[canvas._pixiId]; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index d5bfdee..9297063 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -163,7 +163,7 @@ { if (!video._pixiId) { - video._pixiId = 'video_' + utils.uuid(); + video._pixiId = 'video_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[video._pixiId]; diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 30388c6..dc66e48 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -15,7 +15,7 @@ { EventEmitter.call(this); - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The Resolution of the texture. @@ -416,7 +416,7 @@ { if (!canvas._pixiId) { - canvas._pixiId = 'canvas_' + utils.uuid(); + canvas._pixiId = 'canvas_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[canvas._pixiId]; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index d5bfdee..9297063 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -163,7 +163,7 @@ { if (!video._pixiId) { - video._pixiId = 'video_' + utils.uuid(); + video._pixiId = 'video_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[video._pixiId]; diff --git a/src/core/utils/index.js b/src/core/utils/index.js index ddf3216..8c4ea72 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -11,11 +11,11 @@ async: require('async'), /** - * Gets the next uuid + * Gets the next unique identifier * - * @return {number} The next uuid to use. + * @return {number} The next unique identifier to use. */ - uuid: function () + uid: function () { return ++utils._uid; }, diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 30388c6..dc66e48 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -15,7 +15,7 @@ { EventEmitter.call(this); - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The Resolution of the texture. @@ -416,7 +416,7 @@ { if (!canvas._pixiId) { - canvas._pixiId = 'canvas_' + utils.uuid(); + canvas._pixiId = 'canvas_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[canvas._pixiId]; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index d5bfdee..9297063 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -163,7 +163,7 @@ { if (!video._pixiId) { - video._pixiId = 'video_' + utils.uuid(); + video._pixiId = 'video_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[video._pixiId]; diff --git a/src/core/utils/index.js b/src/core/utils/index.js index ddf3216..8c4ea72 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -11,11 +11,11 @@ async: require('async'), /** - * Gets the next uuid + * Gets the next unique identifier * - * @return {number} The next uuid to use. + * @return {number} The next unique identifier to use. */ - uuid: function () + uid: function () { return ++utils._uid; }, diff --git a/src/deprecation.js b/src/deprecation.js index 4370924..1acc683 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -278,3 +278,13 @@ } }); +/** + * @method + * @name PIXI.Texture#setFrame + * @see {@link PIXI.Texture#setFrame} + * @deprecated since version 3.0.6 + */ +core.utils.uuid = function () { + console.warn('utils.uuid() is deprecated, please use utils.uid() from now on.'); + return core.utils.uid(); +}; diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index d94b696..33439a6 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -473,7 +473,7 @@ // call base destroy SystemRenderer.prototype.destroy.call(this, removeView); - this.uuid = 0; + this.uid = 0; // destroy the managers this.shaderManager.destroy(); diff --git a/src/core/renderers/webgl/managers/ShaderManager.js b/src/core/renderers/webgl/managers/ShaderManager.js index 64112af..226552a 100644 --- a/src/core/renderers/webgl/managers/ShaderManager.js +++ b/src/core/renderers/webgl/managers/ShaderManager.js @@ -134,12 +134,12 @@ */ ShaderManager.prototype.setShader = function (shader) { - if (this._currentId === shader.uuid) + if (this._currentId === shader.uid) { return false; } - this._currentId = shader.uuid; + this._currentId = shader.uid; this.currentShader = shader; diff --git a/src/core/renderers/webgl/shaders/Shader.js b/src/core/renderers/webgl/shaders/Shader.js index ef8fca0..a33d7a8 100644 --- a/src/core/renderers/webgl/shaders/Shader.js +++ b/src/core/renderers/webgl/shaders/Shader.js @@ -22,7 +22,7 @@ * @member {number} * @readonly */ - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The current WebGL drawing context diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c2d6de5..ec3c2e0 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -323,7 +323,7 @@ nextShader = sprite.shader || this.shader; blendSwap = currentBlendMode !== nextBlendMode; - shaderSwap = currentShader !== nextShader; // should I use uuidS??? + shaderSwap = currentShader !== nextShader; // should I use uidS??? if (currentBaseTexture !== nextTexture || blendSwap || shaderSwap) { diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index 30388c6..dc66e48 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -15,7 +15,7 @@ { EventEmitter.call(this); - this.uuid = utils.uuid(); + this.uid = utils.uid(); /** * The Resolution of the texture. @@ -416,7 +416,7 @@ { if (!canvas._pixiId) { - canvas._pixiId = 'canvas_' + utils.uuid(); + canvas._pixiId = 'canvas_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[canvas._pixiId]; diff --git a/src/core/textures/VideoBaseTexture.js b/src/core/textures/VideoBaseTexture.js index d5bfdee..9297063 100644 --- a/src/core/textures/VideoBaseTexture.js +++ b/src/core/textures/VideoBaseTexture.js @@ -163,7 +163,7 @@ { if (!video._pixiId) { - video._pixiId = 'video_' + utils.uuid(); + video._pixiId = 'video_' + utils.uid(); } var baseTexture = utils.BaseTextureCache[video._pixiId]; diff --git a/src/core/utils/index.js b/src/core/utils/index.js index ddf3216..8c4ea72 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -11,11 +11,11 @@ async: require('async'), /** - * Gets the next uuid + * Gets the next unique identifier * - * @return {number} The next uuid to use. + * @return {number} The next unique identifier to use. */ - uuid: function () + uid: function () { return ++utils._uid; }, diff --git a/src/deprecation.js b/src/deprecation.js index 4370924..1acc683 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -278,3 +278,13 @@ } }); +/** + * @method + * @name PIXI.Texture#setFrame + * @see {@link PIXI.Texture#setFrame} + * @deprecated since version 3.0.6 + */ +core.utils.uuid = function () { + console.warn('utils.uuid() is deprecated, please use utils.uid() from now on.'); + return core.utils.uid(); +}; diff --git a/test/unit/core/utils/util.test.js b/test/unit/core/utils/util.test.js index 30c63f3..3ea1155 100644 --- a/test/unit/core/utils/util.test.js +++ b/test/unit/core/utils/util.test.js @@ -1,12 +1,12 @@ describe('PIXI.utils', function () { - describe('.uuid', function () { + describe('.uid', function () { it('should exist', function () { - expect(PIXI.utils.uuid) + expect(PIXI.utils.uid) .to.be.a('function'); }); it('should return a number', function () { - expect(PIXI.utils.uuid()) + expect(PIXI.utils.uid()) .to.be.a('number'); }); });