Skip to content

Commit ba15700

Browse files
committed
Namespace adjustments
1 parent 04dd273 commit ba15700

2 files changed

Lines changed: 45 additions & 22 deletions

File tree

src/phaser-arcade-physics.js

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,11 @@ var Extend = require('./utils/object/Extend');
1313
* @namespace Phaser
1414
*/
1515

16-
/**
17-
* The root types namespace.
18-
*
19-
* @namespace Phaser.Types
20-
* @since 3.17.0
21-
*/
22-
2316
var Phaser = {
2417

2518
Actions: require('./actions'),
2619
Animations: require('./animations'),
20+
BlendModes: require('./renderer/BlendModes'),
2721
Cache: require('./cache'),
2822
Cameras: require('./cameras'),
2923
Core: require('./core'),
@@ -44,7 +38,9 @@ var Phaser = {
4438
Arcade: require('./physics/arcade')
4539
},
4640
Plugins: require('./plugins'),
41+
Renderer: require('./renderer'),
4742
Scale: require('./scale'),
43+
ScaleModes: require('./renderer/ScaleModes'),
4844
Scene: require('./scene/Scene'),
4945
Scenes: require('./scene'),
5046
Structs: require('./structs'),
@@ -56,15 +52,37 @@ var Phaser = {
5652

5753
};
5854

59-
// Merge in the consts
60-
61-
Phaser = Extend(false, Phaser, CONST);
55+
// Merge in the optional plugins and WebGL only features
6256

6357
if (typeof FEATURE_SOUND)
6458
{
6559
Phaser.Sound = require('./sound');
6660
}
6761

62+
if (typeof PLUGIN_CAMERA3D)
63+
{
64+
Phaser.Cameras.Sprite3D = require('../plugins/camera3d/src');
65+
Phaser.GameObjects.Sprite3D = require('../plugins/camera3d/src/sprite3d/Sprite3D');
66+
Phaser.GameObjects.Factories.Sprite3D = require('../plugins/camera3d/src/sprite3d/Sprite3DFactory');
67+
Phaser.GameObjects.Creators.Sprite3D = require('../plugins/camera3d/src/sprite3d/Sprite3DCreator');
68+
}
69+
70+
if (typeof PLUGIN_FBINSTANT)
71+
{
72+
Phaser.FacebookInstantGamesPlugin = require('../plugins/fbinstant/src/FacebookInstantGamesPlugin');
73+
}
74+
75+
// Merge in the consts
76+
77+
Phaser = Extend(false, Phaser, CONST);
78+
79+
/**
80+
* The root types namespace.
81+
*
82+
* @namespace Phaser.Types
83+
* @since 3.17.0
84+
*/
85+
6886
// Export it
6987

7088
module.exports = Phaser;

src/phaser-core.js

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,17 @@ var Extend = require('./utils/object/Extend');
1313
* @namespace Phaser
1414
*/
1515

16-
/**
17-
* The root types namespace.
18-
*
19-
* @namespace Phaser.Types
20-
* @since 3.17.0
21-
*/
22-
2316
var Phaser = {
2417

2518
Animations: require('./animations'),
19+
BlendModes: require('./renderer/BlendModes'),
2620
Cache: require('./cache'),
2721
Cameras: { Scene2D: require('./cameras/2d') },
2822
Core: require('./core'),
2923
Class: require('./utils/Class'),
3024
Data: require('./data'),
3125
Display: { Masks: require('./display/mask') },
26+
DOM: require('./dom'),
3227
Events: require('./events'),
3328
Game: require('./core/Game'),
3429
GameObjects: {
@@ -96,6 +91,7 @@ var Phaser = {
9691
Plugins: require('./plugins'),
9792
Renderer: require('./renderer'),
9893
Scale: require('./scale'),
94+
ScaleModes: require('./renderer/ScaleModes'),
9995
Scene: require('./scene/Scene'),
10096
Scenes: require('./scene'),
10197
Structs: require('./structs'),
@@ -104,17 +100,26 @@ var Phaser = {
104100
Tweens: require('./tweens')
105101
};
106102

107-
// Merge in the consts
108-
109-
Phaser = Extend(false, Phaser, CONST);
110-
111-
// Export it
103+
// Merge in the consts// Merge in the optional plugins and WebGL only features
112104

113105
if (typeof FEATURE_SOUND)
114106
{
115107
Phaser.Sound = require('./sound');
116108
}
117109

110+
// Merge in the consts
111+
112+
Phaser = Extend(false, Phaser, CONST);
113+
114+
/**
115+
* The root types namespace.
116+
*
117+
* @namespace Phaser.Types
118+
* @since 3.17.0
119+
*/
120+
121+
// Export it
122+
118123
module.exports = Phaser;
119124

120125
global.Phaser = Phaser;

0 commit comments

Comments
 (0)