mirror of
https://github.com/photonstorm/phaser
synced 2024-09-20 22:41:54 +00:00
Updated to use typeof DefinePlugin check.
This commit is contained in:
parent
fc4fdc4e3c
commit
6299019838
20 changed files with 38 additions and 36 deletions
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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');
|
||||
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ var GameObjects = {
|
|||
|
||||
};
|
||||
|
||||
if (WEBGL_RENDERER)
|
||||
if (typeof WEBGL_RENDERER)
|
||||
{
|
||||
// WebGL only Game Objects
|
||||
GameObjects.Mesh = require('./mesh/Mesh');
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
|
|
|
@ -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'})
|
||||
|
|
Loading…
Reference in a new issue