diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 1bfc4b6..afe51ab 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -3,8 +3,6 @@ import settings from '../../../settings'; import { GLFramebuffer } from 'pixi-gl-core'; -const { RESOLUTION, SCALE_MODE } = settings; - /** * @class * @memberof PIXI @@ -66,7 +64,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The projection matrix @@ -126,7 +124,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Whether this object is the root element or not diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 1bfc4b6..afe51ab 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -3,8 +3,6 @@ import settings from '../../../settings'; import { GLFramebuffer } from 'pixi-gl-core'; -const { RESOLUTION, SCALE_MODE } = settings; - /** * @class * @memberof PIXI @@ -66,7 +64,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The projection matrix @@ -126,7 +124,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Whether this object is the root element or not diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c678301..6368368 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -8,8 +8,6 @@ import glCore from 'pixi-gl-core'; import bitTwiddle from 'bit-twiddle'; -const { SPRITE_BATCH_SIZE, SPRITE_MAX_TEXTURES, CAN_UPLOAD_SAME_BUFFER } = settings; - let TICK = 0; let TEXTURE_TICK = 0; @@ -50,7 +48,7 @@ * * @member {number} */ - this.size = SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop + this.size = settings.SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop // the total number of bytes in our batch // let numVerts = this.size * 4 * this.vertByteSize; @@ -106,7 +104,7 @@ const gl = this.renderer.gl; // step 1: first check max textures the GPU can handle. - this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), SPRITE_MAX_TEXTURES); + this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), settings.SPRITE_MAX_TEXTURES); // step 2: check the maximum number of if statements the shader can have too.. this.MAX_TEXTURES = checkMaxIfStatmentsInShader(this.MAX_TEXTURES, gl); @@ -362,7 +360,7 @@ currentGroup.size = i - currentGroup.start; - if (!CAN_UPLOAD_SAME_BUFFER) + if (!settings.CAN_UPLOAD_SAME_BUFFER) { // this is still needed for IOS performance.. // it really does not like uploading to the same buffer in a single frame! @@ -435,7 +433,7 @@ { this.renderer.bindShader(this.shader); - if (CAN_UPLOAD_SAME_BUFFER) + if (settings.CAN_UPLOAD_SAME_BUFFER) { // bind buffer #0, we don't need others this.renderer.bindVao(this.vaos[this.vertexCount]); diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 1bfc4b6..afe51ab 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -3,8 +3,6 @@ import settings from '../../../settings'; import { GLFramebuffer } from 'pixi-gl-core'; -const { RESOLUTION, SCALE_MODE } = settings; - /** * @class * @memberof PIXI @@ -66,7 +64,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The projection matrix @@ -126,7 +124,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Whether this object is the root element or not diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c678301..6368368 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -8,8 +8,6 @@ import glCore from 'pixi-gl-core'; import bitTwiddle from 'bit-twiddle'; -const { SPRITE_BATCH_SIZE, SPRITE_MAX_TEXTURES, CAN_UPLOAD_SAME_BUFFER } = settings; - let TICK = 0; let TEXTURE_TICK = 0; @@ -50,7 +48,7 @@ * * @member {number} */ - this.size = SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop + this.size = settings.SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop // the total number of bytes in our batch // let numVerts = this.size * 4 * this.vertByteSize; @@ -106,7 +104,7 @@ const gl = this.renderer.gl; // step 1: first check max textures the GPU can handle. - this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), SPRITE_MAX_TEXTURES); + this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), settings.SPRITE_MAX_TEXTURES); // step 2: check the maximum number of if statements the shader can have too.. this.MAX_TEXTURES = checkMaxIfStatmentsInShader(this.MAX_TEXTURES, gl); @@ -362,7 +360,7 @@ currentGroup.size = i - currentGroup.start; - if (!CAN_UPLOAD_SAME_BUFFER) + if (!settings.CAN_UPLOAD_SAME_BUFFER) { // this is still needed for IOS performance.. // it really does not like uploading to the same buffer in a single frame! @@ -435,7 +433,7 @@ { this.renderer.bindShader(this.shader); - if (CAN_UPLOAD_SAME_BUFFER) + if (settings.CAN_UPLOAD_SAME_BUFFER) { // bind buffer #0, we don't need others this.renderer.bindVao(this.vaos[this.vertexCount]); diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 7bdd125..4bf17ea 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -7,8 +7,6 @@ import settings from '../settings'; import TextStyle from './TextStyle'; -const { RESOLUTION } = settings; - const defaultDestroyOptions = { texture: true, children: false, @@ -67,7 +65,7 @@ * @member {number} * @default 1 */ - this.resolution = RESOLUTION; + this.resolution = settings.RESOLUTION; /** * Private tracker for the current text. diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 1bfc4b6..afe51ab 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -3,8 +3,6 @@ import settings from '../../../settings'; import { GLFramebuffer } from 'pixi-gl-core'; -const { RESOLUTION, SCALE_MODE } = settings; - /** * @class * @memberof PIXI @@ -66,7 +64,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The projection matrix @@ -126,7 +124,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Whether this object is the root element or not diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c678301..6368368 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -8,8 +8,6 @@ import glCore from 'pixi-gl-core'; import bitTwiddle from 'bit-twiddle'; -const { SPRITE_BATCH_SIZE, SPRITE_MAX_TEXTURES, CAN_UPLOAD_SAME_BUFFER } = settings; - let TICK = 0; let TEXTURE_TICK = 0; @@ -50,7 +48,7 @@ * * @member {number} */ - this.size = SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop + this.size = settings.SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop // the total number of bytes in our batch // let numVerts = this.size * 4 * this.vertByteSize; @@ -106,7 +104,7 @@ const gl = this.renderer.gl; // step 1: first check max textures the GPU can handle. - this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), SPRITE_MAX_TEXTURES); + this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), settings.SPRITE_MAX_TEXTURES); // step 2: check the maximum number of if statements the shader can have too.. this.MAX_TEXTURES = checkMaxIfStatmentsInShader(this.MAX_TEXTURES, gl); @@ -362,7 +360,7 @@ currentGroup.size = i - currentGroup.start; - if (!CAN_UPLOAD_SAME_BUFFER) + if (!settings.CAN_UPLOAD_SAME_BUFFER) { // this is still needed for IOS performance.. // it really does not like uploading to the same buffer in a single frame! @@ -435,7 +433,7 @@ { this.renderer.bindShader(this.shader); - if (CAN_UPLOAD_SAME_BUFFER) + if (settings.CAN_UPLOAD_SAME_BUFFER) { // bind buffer #0, we don't need others this.renderer.bindVao(this.vaos[this.vertexCount]); diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 7bdd125..4bf17ea 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -7,8 +7,6 @@ import settings from '../settings'; import TextStyle from './TextStyle'; -const { RESOLUTION } = settings; - const defaultDestroyOptions = { texture: true, children: false, @@ -67,7 +65,7 @@ * @member {number} * @default 1 */ - this.resolution = RESOLUTION; + this.resolution = settings.RESOLUTION; /** * Private tracker for the current text. diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index d83c447..676dca3 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -7,8 +7,6 @@ import determineCrossOrigin from '../utils/determineCrossOrigin'; import bitTwiddle from 'bit-twiddle'; -const { RESOLUTION, MIPMAP_TEXTURES, SCALE_MODE, WRAP_MODE } = settings; - /** * A texture stores the information that represents an image. All textures have a base texture. * @@ -37,7 +35,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The width of the base texture set when the image has loaded @@ -79,7 +77,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Set to true once the base texture has successfully loaded. @@ -176,7 +174,7 @@ * @member {boolean} * @see PIXI.MIPMAP_TEXTURES */ - this.mipmap = MIPMAP_TEXTURES; + this.mipmap = settings.MIPMAP_TEXTURES; /** * @@ -185,7 +183,7 @@ * @member {number} * @see PIXI.WRAP_MODES */ - this.wrapMode = WRAP_MODE; + this.wrapMode = settings.WRAP_MODE; /** * A map of renderer IDs to webgl textures diff --git a/src/core/renderers/SystemRenderer.js b/src/core/renderers/SystemRenderer.js index 5e0a3ca..0f1c817 100644 --- a/src/core/renderers/SystemRenderer.js +++ b/src/core/renderers/SystemRenderer.js @@ -7,7 +7,6 @@ import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); -const { RESOLUTION, RENDER_OPTIONS } = settings; /** * The SystemRenderer is the base for a Pixi Renderer. It is extended by the {@link PIXI.CanvasRenderer} @@ -47,17 +46,17 @@ // prepare options if (options) { - for (const i in RENDER_OPTIONS) + for (const i in settings.RENDER_OPTIONS) { if (typeof options[i] === 'undefined') { - options[i] = RENDER_OPTIONS[i]; + options[i] = settings.RENDER_OPTIONS[i]; } } } else { - options = RENDER_OPTIONS; + options = settings.RENDER_OPTIONS; } /** @@ -98,7 +97,7 @@ * @member {number} * @default 1 */ - this.resolution = options.resolution || RESOLUTION; + this.resolution = options.resolution || settings.RESOLUTION; /** * Whether the render view is transparent diff --git a/src/core/renderers/webgl/TextureGarbageCollector.js b/src/core/renderers/webgl/TextureGarbageCollector.js index 7047f2c..8a3be33 100644 --- a/src/core/renderers/webgl/TextureGarbageCollector.js +++ b/src/core/renderers/webgl/TextureGarbageCollector.js @@ -1,8 +1,6 @@ import { GC_MODES } from '../../const'; import settings from '../../settings'; -const { GC_MODE, GC_MAX_IDLE, GC_MAX_CHECK_COUNT } = settings; - /** * TextureGarbageCollector. This class manages the GPU and ensures that it does not get clogged * up with textures that are no longer being used. @@ -21,9 +19,9 @@ this.count = 0; this.checkCount = 0; - this.maxIdle = GC_MAX_IDLE; - this.checkCountMax = GC_MAX_CHECK_COUNT; - this.mode = GC_MODE; + this.maxIdle = settings.GC_MAX_IDLE; + this.checkCountMax = settings.GC_MAX_CHECK_COUNT; + this.mode = settings.GC_MODE; } /** diff --git a/src/core/renderers/webgl/utils/RenderTarget.js b/src/core/renderers/webgl/utils/RenderTarget.js index 1bfc4b6..afe51ab 100644 --- a/src/core/renderers/webgl/utils/RenderTarget.js +++ b/src/core/renderers/webgl/utils/RenderTarget.js @@ -3,8 +3,6 @@ import settings from '../../../settings'; import { GLFramebuffer } from 'pixi-gl-core'; -const { RESOLUTION, SCALE_MODE } = settings; - /** * @class * @memberof PIXI @@ -66,7 +64,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The projection matrix @@ -126,7 +124,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Whether this object is the root element or not diff --git a/src/core/sprites/webgl/SpriteRenderer.js b/src/core/sprites/webgl/SpriteRenderer.js index c678301..6368368 100644 --- a/src/core/sprites/webgl/SpriteRenderer.js +++ b/src/core/sprites/webgl/SpriteRenderer.js @@ -8,8 +8,6 @@ import glCore from 'pixi-gl-core'; import bitTwiddle from 'bit-twiddle'; -const { SPRITE_BATCH_SIZE, SPRITE_MAX_TEXTURES, CAN_UPLOAD_SAME_BUFFER } = settings; - let TICK = 0; let TEXTURE_TICK = 0; @@ -50,7 +48,7 @@ * * @member {number} */ - this.size = SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop + this.size = settings.SPRITE_BATCH_SIZE; // 2000 is a nice balance between mobile / desktop // the total number of bytes in our batch // let numVerts = this.size * 4 * this.vertByteSize; @@ -106,7 +104,7 @@ const gl = this.renderer.gl; // step 1: first check max textures the GPU can handle. - this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), SPRITE_MAX_TEXTURES); + this.MAX_TEXTURES = Math.min(gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS), settings.SPRITE_MAX_TEXTURES); // step 2: check the maximum number of if statements the shader can have too.. this.MAX_TEXTURES = checkMaxIfStatmentsInShader(this.MAX_TEXTURES, gl); @@ -362,7 +360,7 @@ currentGroup.size = i - currentGroup.start; - if (!CAN_UPLOAD_SAME_BUFFER) + if (!settings.CAN_UPLOAD_SAME_BUFFER) { // this is still needed for IOS performance.. // it really does not like uploading to the same buffer in a single frame! @@ -435,7 +433,7 @@ { this.renderer.bindShader(this.shader); - if (CAN_UPLOAD_SAME_BUFFER) + if (settings.CAN_UPLOAD_SAME_BUFFER) { // bind buffer #0, we don't need others this.renderer.bindVao(this.vaos[this.vertexCount]); diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 7bdd125..4bf17ea 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -7,8 +7,6 @@ import settings from '../settings'; import TextStyle from './TextStyle'; -const { RESOLUTION } = settings; - const defaultDestroyOptions = { texture: true, children: false, @@ -67,7 +65,7 @@ * @member {number} * @default 1 */ - this.resolution = RESOLUTION; + this.resolution = settings.RESOLUTION; /** * Private tracker for the current text. diff --git a/src/core/textures/BaseTexture.js b/src/core/textures/BaseTexture.js index d83c447..676dca3 100644 --- a/src/core/textures/BaseTexture.js +++ b/src/core/textures/BaseTexture.js @@ -7,8 +7,6 @@ import determineCrossOrigin from '../utils/determineCrossOrigin'; import bitTwiddle from 'bit-twiddle'; -const { RESOLUTION, MIPMAP_TEXTURES, SCALE_MODE, WRAP_MODE } = settings; - /** * A texture stores the information that represents an image. All textures have a base texture. * @@ -37,7 +35,7 @@ * @member {number} * @default 1 */ - this.resolution = resolution || RESOLUTION; + this.resolution = resolution || settings.RESOLUTION; /** * The width of the base texture set when the image has loaded @@ -79,7 +77,7 @@ * @default PIXI.settings.SCALE_MODE * @see PIXI.SCALE_MODES */ - this.scaleMode = scaleMode || SCALE_MODE; + this.scaleMode = scaleMode || settings.SCALE_MODE; /** * Set to true once the base texture has successfully loaded. @@ -176,7 +174,7 @@ * @member {boolean} * @see PIXI.MIPMAP_TEXTURES */ - this.mipmap = MIPMAP_TEXTURES; + this.mipmap = settings.MIPMAP_TEXTURES; /** * @@ -185,7 +183,7 @@ * @member {number} * @see PIXI.WRAP_MODES */ - this.wrapMode = WRAP_MODE; + this.wrapMode = settings.WRAP_MODE; /** * A map of renderer IDs to webgl textures diff --git a/src/core/ticker/Ticker.js b/src/core/ticker/Ticker.js index 6aec195..d6b30e1 100644 --- a/src/core/ticker/Ticker.js +++ b/src/core/ticker/Ticker.js @@ -4,8 +4,6 @@ // Internal event used by composed emitter const TICK = 'tick'; -const { TARGET_FPMS } = settings; - /** * A Ticker class that runs an update loop that other objects listen to. * This class is composed around an EventEmitter object to add listeners @@ -73,7 +71,7 @@ * @member {number} * @default 1 / TARGET_FPMS */ - this.elapsedMS = 1 / TARGET_FPMS; // default to target frame time + this.elapsedMS = 1 / settings.TARGET_FPMS; // default to target frame time /** * The last time {@link PIXI.ticker.Ticker#update} was invoked. @@ -319,7 +317,7 @@ elapsedMS = this._maxElapsedMS; } - this.deltaTime = elapsedMS * TARGET_FPMS * this.speed; + this.deltaTime = elapsedMS * settings.TARGET_FPMS * this.speed; // Invoke listeners added to internal emitter this._emitter.emit(TICK, this.deltaTime); @@ -371,7 +369,7 @@ set minFPS(fps) { // Clamp: 0 to TARGET_FPMS - const minFPMS = Math.min(Math.max(0, fps) / 1000, TARGET_FPMS); + const minFPMS = Math.min(Math.max(0, fps) / 1000, settings.TARGET_FPMS); this._maxElapsedMS = 1 / minFPMS; }