diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 1bd3162..867f247 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -1068,6 +1068,20 @@ }); /** + * @deprecated since 5.0.0 + * @member {PIXI.systems.TextureSystem} PIXI.Renderer#textureManager + * @see PIXI.Renderer#texture + */ + Object.defineProperty(PIXI.Renderer.prototype, 'textureManager', { + get() + { + deprecation(v5, 'PIXI.Renderer.textureManager property is deprecated, use texture'); + + return this.texture; + }, + }); + + /** * @namespace PIXI.utils.mixins * @deprecated since 5.0.0 */ diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 1bd3162..867f247 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -1068,6 +1068,20 @@ }); /** + * @deprecated since 5.0.0 + * @member {PIXI.systems.TextureSystem} PIXI.Renderer#textureManager + * @see PIXI.Renderer#texture + */ + Object.defineProperty(PIXI.Renderer.prototype, 'textureManager', { + get() + { + deprecation(v5, 'PIXI.Renderer.textureManager property is deprecated, use texture'); + + return this.texture; + }, + }); + + /** * @namespace PIXI.utils.mixins * @deprecated since 5.0.0 */ diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 5940a0e..d1167ae 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -35,6 +35,7 @@ * @param {boolean} [options.premultiplyAlpha=true] - Pre multiply the image alpha * @param {number} [options.width=0] - Width of the texture * @param {number} [options.height=0] - Height of the texture + * @param {number} [options.resolution] - Resolution of the base texture * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 1bd3162..867f247 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -1068,6 +1068,20 @@ }); /** + * @deprecated since 5.0.0 + * @member {PIXI.systems.TextureSystem} PIXI.Renderer#textureManager + * @see PIXI.Renderer#texture + */ + Object.defineProperty(PIXI.Renderer.prototype, 'textureManager', { + get() + { + deprecation(v5, 'PIXI.Renderer.textureManager property is deprecated, use texture'); + + return this.texture; + }, + }); + + /** * @namespace PIXI.utils.mixins * @deprecated since 5.0.0 */ diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 5940a0e..d1167ae 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -35,6 +35,7 @@ * @param {boolean} [options.premultiplyAlpha=true] - Pre multiply the image alpha * @param {number} [options.width=0] - Width of the texture * @param {number} [options.height=0] - Height of the texture + * @param {number} [options.resolution] - Resolution of the base texture * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index b725550..1e3b394 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -41,7 +41,7 @@ this.maxIdle = settings.GC_MAX_IDLE; /** - * Maximum number of itesm to check + * Maximum number of item to check * @member {number} * @see PIXI.settings.GC_MAX_CHECK_COUNT */ diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 1bd3162..867f247 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -1068,6 +1068,20 @@ }); /** + * @deprecated since 5.0.0 + * @member {PIXI.systems.TextureSystem} PIXI.Renderer#textureManager + * @see PIXI.Renderer#texture + */ + Object.defineProperty(PIXI.Renderer.prototype, 'textureManager', { + get() + { + deprecation(v5, 'PIXI.Renderer.textureManager property is deprecated, use texture'); + + return this.texture; + }, + }); + + /** * @namespace PIXI.utils.mixins * @deprecated since 5.0.0 */ diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 5940a0e..d1167ae 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -35,6 +35,7 @@ * @param {boolean} [options.premultiplyAlpha=true] - Pre multiply the image alpha * @param {number} [options.width=0] - Width of the texture * @param {number} [options.height=0] - Height of the texture + * @param {number} [options.resolution] - Resolution of the base texture * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index b725550..1e3b394 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -41,7 +41,7 @@ this.maxIdle = settings.GC_MAX_IDLE; /** - * Maximum number of itesm to check + * Maximum number of item to check * @member {number} * @see PIXI.settings.GC_MAX_CHECK_COUNT */ diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index 87a7079..a04fe29 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -269,6 +269,12 @@ updateTexture(texture) { const glTexture = texture._glTextures[this.CONTEXT_UID]; + + if (!glTexture) + { + return; + } + const renderer = this.renderer; this.initTextureType(texture, glTexture); diff --git a/bundles/pixi.js/src/useDeprecated.js b/bundles/pixi.js/src/useDeprecated.js index 1bd3162..867f247 100644 --- a/bundles/pixi.js/src/useDeprecated.js +++ b/bundles/pixi.js/src/useDeprecated.js @@ -1068,6 +1068,20 @@ }); /** + * @deprecated since 5.0.0 + * @member {PIXI.systems.TextureSystem} PIXI.Renderer#textureManager + * @see PIXI.Renderer#texture + */ + Object.defineProperty(PIXI.Renderer.prototype, 'textureManager', { + get() + { + deprecation(v5, 'PIXI.Renderer.textureManager property is deprecated, use texture'); + + return this.texture; + }, + }); + + /** * @namespace PIXI.utils.mixins * @deprecated since 5.0.0 */ diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 5940a0e..d1167ae 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -35,6 +35,7 @@ * @param {boolean} [options.premultiplyAlpha=true] - Pre multiply the image alpha * @param {number} [options.width=0] - Width of the texture * @param {number} [options.height=0] - Height of the texture + * @param {number} [options.resolution] - Resolution of the base texture * @param {object} [options.resourceOptions] - Optional resource options, * see {@link PIXI.resources.autoDetectResource autoDetectResource} */ diff --git a/packages/core/src/textures/TextureGCSystem.js b/packages/core/src/textures/TextureGCSystem.js index b725550..1e3b394 100644 --- a/packages/core/src/textures/TextureGCSystem.js +++ b/packages/core/src/textures/TextureGCSystem.js @@ -41,7 +41,7 @@ this.maxIdle = settings.GC_MAX_IDLE; /** - * Maximum number of itesm to check + * Maximum number of item to check * @member {number} * @see PIXI.settings.GC_MAX_CHECK_COUNT */ diff --git a/packages/core/src/textures/TextureSystem.js b/packages/core/src/textures/TextureSystem.js index 87a7079..a04fe29 100644 --- a/packages/core/src/textures/TextureSystem.js +++ b/packages/core/src/textures/TextureSystem.js @@ -269,6 +269,12 @@ updateTexture(texture) { const glTexture = texture._glTextures[this.CONTEXT_UID]; + + if (!glTexture) + { + return; + } + const renderer = this.renderer; this.initTextureType(texture, glTexture); diff --git a/packages/prepare/src/Prepare.js b/packages/prepare/src/Prepare.js index 3d8ada4..b7f2819 100644 --- a/packages/prepare/src/Prepare.js +++ b/packages/prepare/src/Prepare.js @@ -45,7 +45,7 @@ // reuploads the texture without need for preparing it again if (!item._glTextures[renderer.CONTEXT_UID]) { - renderer.textureManager.updateTexture(item); + renderer.texture.updateTexture(item); } return true;