diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 50e7b4d..433fe2c 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -124,6 +124,7 @@ antialias: options.antialias, premultipliedAlpha: this.transparent && this.transparent !== 'notMultiplied', stencil: true, + forceWebGL1:!!options.forceWebGL1, preserveDrawingBuffer: options.preserveDrawingBuffer, }); } @@ -132,7 +133,7 @@ this._initContext(); - sayHello(this.context.webGLVersion === 2 ? 'WebGL' : 'WebGL 2'); + sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL'); } addSystem(_class, name) diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 50e7b4d..433fe2c 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -124,6 +124,7 @@ antialias: options.antialias, premultipliedAlpha: this.transparent && this.transparent !== 'notMultiplied', stencil: true, + forceWebGL1:!!options.forceWebGL1, preserveDrawingBuffer: options.preserveDrawingBuffer, }); } @@ -132,7 +133,7 @@ this._initContext(); - sayHello(this.context.webGLVersion === 2 ? 'WebGL' : 'WebGL 2'); + sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL'); } addSystem(_class, name) diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index 7430d11..60db681 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -16,7 +16,7 @@ { super(renderer); - this.webGLversion = 1; + this.webGLVersion = 1; this.handleContextLost = this.handleContextLost.bind(this); this.handleContextRestored = this.handleContextRestored.bind(this); @@ -69,15 +69,21 @@ */ createContext(canvas, options) { - let gl = canvas.getContext('webgl2', options); + + let gl; + + if(!options.forceWebGL1) + { + gl = canvas.getContext('webgl2', options); + } if (gl) { - this.webGLversion = 2; + this.webGLVersion = 2; } else { - this.webGLversion = 1; + this.webGLVersion = 1; gl = canvas.getContext('webgl', options) || canvas.getContext('experimental-webgl', options); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 50e7b4d..433fe2c 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -124,6 +124,7 @@ antialias: options.antialias, premultipliedAlpha: this.transparent && this.transparent !== 'notMultiplied', stencil: true, + forceWebGL1:!!options.forceWebGL1, preserveDrawingBuffer: options.preserveDrawingBuffer, }); } @@ -132,7 +133,7 @@ this._initContext(); - sayHello(this.context.webGLVersion === 2 ? 'WebGL' : 'WebGL 2'); + sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL'); } addSystem(_class, name) diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index 7430d11..60db681 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -16,7 +16,7 @@ { super(renderer); - this.webGLversion = 1; + this.webGLVersion = 1; this.handleContextLost = this.handleContextLost.bind(this); this.handleContextRestored = this.handleContextRestored.bind(this); @@ -69,15 +69,21 @@ */ createContext(canvas, options) { - let gl = canvas.getContext('webgl2', options); + + let gl; + + if(!options.forceWebGL1) + { + gl = canvas.getContext('webgl2', options); + } if (gl) { - this.webGLversion = 2; + this.webGLVersion = 2; } else { - this.webGLversion = 1; + this.webGLVersion = 1; gl = canvas.getContext('webgl', options) || canvas.getContext('experimental-webgl', options); diff --git a/src/deprecation.js b/src/deprecation.js index 0a9a771..c4aa8df 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,6 +1,6 @@ import * as core from './core'; import * as mesh from './mesh'; -import * as particles from './particles'; +//import * as particles from './particles'; import * as extras from './extras'; import * as filters from './filters'; import * as prepare from './prepare'; @@ -157,7 +157,7 @@ * @see PIXI.particles.ParticleContainer * @deprecated since version 4.0.0 */ - ParticleContainer: { + /*ParticleContainer: { enumerable: true, get() { @@ -166,7 +166,7 @@ return particles.ParticleContainer; }, - }, + },*/ /** * @class diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 50e7b4d..433fe2c 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -124,6 +124,7 @@ antialias: options.antialias, premultipliedAlpha: this.transparent && this.transparent !== 'notMultiplied', stencil: true, + forceWebGL1:!!options.forceWebGL1, preserveDrawingBuffer: options.preserveDrawingBuffer, }); } @@ -132,7 +133,7 @@ this._initContext(); - sayHello(this.context.webGLVersion === 2 ? 'WebGL' : 'WebGL 2'); + sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL'); } addSystem(_class, name) diff --git a/src/core/renderers/webgl/systems/ContextSystem.js b/src/core/renderers/webgl/systems/ContextSystem.js index 7430d11..60db681 100644 --- a/src/core/renderers/webgl/systems/ContextSystem.js +++ b/src/core/renderers/webgl/systems/ContextSystem.js @@ -16,7 +16,7 @@ { super(renderer); - this.webGLversion = 1; + this.webGLVersion = 1; this.handleContextLost = this.handleContextLost.bind(this); this.handleContextRestored = this.handleContextRestored.bind(this); @@ -69,15 +69,21 @@ */ createContext(canvas, options) { - let gl = canvas.getContext('webgl2', options); + + let gl; + + if(!options.forceWebGL1) + { + gl = canvas.getContext('webgl2', options); + } if (gl) { - this.webGLversion = 2; + this.webGLVersion = 2; } else { - this.webGLversion = 1; + this.webGLVersion = 1; gl = canvas.getContext('webgl', options) || canvas.getContext('experimental-webgl', options); diff --git a/src/deprecation.js b/src/deprecation.js index 0a9a771..c4aa8df 100644 --- a/src/deprecation.js +++ b/src/deprecation.js @@ -1,6 +1,6 @@ import * as core from './core'; import * as mesh from './mesh'; -import * as particles from './particles'; +//import * as particles from './particles'; import * as extras from './extras'; import * as filters from './filters'; import * as prepare from './prepare'; @@ -157,7 +157,7 @@ * @see PIXI.particles.ParticleContainer * @deprecated since version 4.0.0 */ - ParticleContainer: { + /*ParticleContainer: { enumerable: true, get() { @@ -166,7 +166,7 @@ return particles.ParticleContainer; }, - }, + },*/ /** * @class diff --git a/src/index.js b/src/index.js index 77da490..5f0d025 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ import * as interaction from './interaction'; import * as loaders from './loaders'; import * as mesh from './mesh'; -import * as particles from './particles'; +//import * as particles from './particles'; import * as prepare from './prepare'; // handle mixins now, after all code has been added, including deprecation @@ -36,7 +36,7 @@ interaction, loaders, mesh, - particles, + // particles, prepare, loader, };