Updated to use typeof DefinePlugin check.

This commit is contained in:
Richard Davey 2018-04-20 00:23:24 +01:00
parent fc4fdc4e3c
commit 6299019838
20 changed files with 38 additions and 36 deletions

View file

@ -8,6 +8,8 @@
### Updates
* We've swapped use of the Webpack DefinePlugin so instead of setting a global flag for the compilation of the Canvas and WebGL renderers, we now use a typeof check instead. This means you should now be able to ingest the Phaser source more easily outside of Webpack without having to define any global vars first (thanks @tgrajewski)
### Bug Fixes

View file

@ -91,7 +91,7 @@ var CreateRenderer = function (game)
var CanvasRenderer;
var WebGLRenderer;
if (WEBGL_RENDERER && CANVAS_RENDERER)
if (typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)
{
CanvasRenderer = require('../renderer/canvas/CanvasRenderer');
WebGLRenderer = require('../renderer/webgl/WebGLRenderer');
@ -109,7 +109,7 @@ var CreateRenderer = function (game)
}
}
if (WEBGL_RENDERER && !CANVAS_RENDERER)
if (typeof WEBGL_RENDERER && !typeof CANVAS_RENDERER)
{
WebGLRenderer = require('../renderer/webgl/WebGLRenderer');
@ -119,7 +119,7 @@ var CreateRenderer = function (game)
game.context = null;
}
if (!WEBGL_RENDERER && CANVAS_RENDERER)
if (!typeof WEBGL_RENDERER && typeof CANVAS_RENDERER)
{
CanvasRenderer = require('../renderer/canvas/CanvasRenderer');

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../../utils/NOOP');
var renderCanvas = require('../../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./DynamicBitmapTextWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./DynamicBitmapTextCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../../utils/NOOP');
var renderCanvas = require('../../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./BitmapTextWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./BitmapTextCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./BlitterWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./BlitterCanvasRenderer');
}

View file

@ -8,12 +8,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./ContainerWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./ContainerCanvasRenderer');
}

View file

@ -7,7 +7,7 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./GraphicsWebGLRenderer');
@ -15,7 +15,7 @@ if (WEBGL_RENDERER)
renderCanvas = require('./GraphicsCanvasRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./GraphicsCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./ImageWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./ImageCanvasRenderer');
}

View file

@ -76,7 +76,7 @@ var GameObjects = {
};
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
// WebGL only Game Objects
GameObjects.Mesh = require('./mesh/Mesh');

View file

@ -27,7 +27,7 @@ var GameObjectFactory = require('../GameObjectFactory');
*
* @return {Phaser.GameObjects.Mesh} The Game Object that was created.
*/
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
GameObjectFactory.register('mesh', function (x, y, vertices, uv, colors, alphas, texture, frame)
{

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./MeshWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./MeshCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./ParticleManagerWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./ParticleManagerCanvasRenderer');
}

View file

@ -23,7 +23,7 @@ var GameObjectFactory = require('../GameObjectFactory');
*
* @return {Phaser.GameObjects.Quad} The Game Object that was created.
*/
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
GameObjectFactory.register('quad', function (x, y, key, frame)
{

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./RenderTextureWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./RenderTextureCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./SpriteWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./SpriteCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../../utils/NOOP');
var renderCanvas = require('../../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./TextWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./TextCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./TileSpriteWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./TileSpriteCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./DynamicTilemapLayerWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./DynamicTilemapLayerCanvasRenderer');
}

View file

@ -7,12 +7,12 @@
var renderWebGL = require('../../utils/NOOP');
var renderCanvas = require('../../utils/NOOP');
if (WEBGL_RENDERER)
if (typeof WEBGL_RENDERER)
{
renderWebGL = require('./StaticTilemapLayerWebGLRenderer');
}
if (CANVAS_RENDERER)
if (typeof CANVAS_RENDERER)
{
renderCanvas = require('./StaticTilemapLayerCanvasRenderer');
}

View file

@ -35,8 +35,8 @@ module.exports = {
plugins: [
new webpack.DefinePlugin({
CANVAS_RENDERER: JSON.stringify(true),
WEBGL_RENDERER: JSON.stringify(true)
"typeof CANVAS_RENDERER": JSON.stringify(true),
"typeof WEBGL_RENDERER": JSON.stringify(true)
}),
new WebpackShellPlugin({onBuildExit: 'node copy-to-examples.js'})