Skip to content

Commit f770712

Browse files
committed
Huge refactoring of States, plugins and object factories
1 parent 10be573 commit f770712

127 files changed

Lines changed: 945 additions & 4269 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

v3/src/boot/Game.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var VisibilityHandler = require('./VisibilityHandler');
1111

1212
var AnimationManager = require('../animation/manager/AnimationManager');
1313
var CreateRenderer = require('./CreateRenderer');
14-
var Data = require('../components/Data');
14+
var Data = require('../plugins/Data');
1515
var GlobalCache = require('../cache/GlobalCache');
1616
var GlobalInputManager = require('../input/GlobalInputManager');
1717
var GlobalStateManager = require('../state/GlobalStateManager');

v3/src/camera/Camera.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var Class = require('../utils/Class');
22
var Rectangle = require('../geom/rectangle/Rectangle');
3-
var TransformMatrix = require('../components/TransformMatrix');
3+
var TransformMatrix = require('../gameobjects/components/TransformMatrix');
44
var ValueToColor = require('../graphics/color/ValueToColor');
55

66
var Camera = new Class({

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: '752ee830-6009-11e7-ad20-7b53f4549f8a'
2+
build: '8e828540-6053-11e7-9b69-797a676deb6e'
33
};
44
module.exports = CHECKSUM;

v3/src/gameobjects/FactoryContainer.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

v3/src/gameobjects/GameObject.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
var Class = require('../utils/Class');
8-
var Components = require('../components');
8+
var Components = require('./components');
99

1010
/**
1111
* This is the base Game Object class that you can use when creating your own extended Game Objects.
@@ -21,9 +21,10 @@ var GameObject = new Class({
2121
{
2222
this.state = state;
2323

24-
this.id = 0;
2524
this.type = type;
25+
2626
this.name = '';
27+
2728
this.tabIndex = -1;
2829

2930
this.parent;

v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapText.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var Class = require('../../../utils/Class');
22
var GameObject = require('../../GameObject');
3-
var Components = require('../../../components');
3+
var Components = require('../../components');
44
var Render = require('./DynamicBitmapTextRender');
55
var GetBitmapTextSize = require('../GetBitmapTextSize');
66

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
var BitmapText = require('./DynamicBitmapText');
2+
var GetAdvancedValue = require('../../../utils/object/GetAdvancedValue');
3+
var BuildGameObject = require('../../BuildGameObject');
4+
5+
var DynamicBitmapTextCreator = function (state, config)
6+
{
7+
var font = GetAdvancedValue(config, 'font', '');
8+
var text = GetAdvancedValue(config, 'text', '');
9+
var size = GetAdvancedValue(config, 'size', false);
10+
var align = GetAdvancedValue(config, 'align', 'left');
11+
12+
var bitmapText = new BitmapText(state, 0, 0, font, text, size, align);
13+
14+
BuildGameObject(state, bitmapText, config);
15+
16+
return bitmapText;
17+
};
18+
19+
module.exports = DynamicBitmapTextCreator;
Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
var BitmapText = require('./DynamicBitmapText');
2-
var FactoryContainer = require('../../FactoryContainer');
3-
4-
var DynamicBitmapTextFactory = {
5-
6-
KEY: 'dynamicBitmapText',
7-
8-
add: function (x, y, font, text, size, align)
9-
{
10-
return this.children.add(new BitmapText(this.state, x, y, font, text, size, align));
11-
},
12-
13-
make: function (x, y, font, text, size, align)
14-
{
15-
return new BitmapText(this.state, x, y, font, text, size, align);
16-
}
172

3+
var DynamicBitmapTextFactory = function (state, x, y, font, text, size, align)
4+
{
5+
return new BitmapText(state, x, y, font, text, size, align);
186
};
197

20-
module.exports = FactoryContainer.register(DynamicBitmapTextFactory);
8+
module.exports = DynamicBitmapTextFactory;

v3/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var TransformMatrix = require('../../../components/TransformMatrix');
1+
var TransformMatrix = require('../../components/TransformMatrix');
22
var tempMatrix = new TransformMatrix();
33
var tempMatrixChar = new TransformMatrix();
44

v3/src/gameobjects/bitmaptext/static/BitmapText.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var Class = require('../../../utils/Class');
22
var GameObject = require('../../GameObject');
3-
var Components = require('../../../components');
3+
var Components = require('../../components');
44
var Render = require('./BitmapTextRender');
55
var GetBitmapTextSize = require('../GetBitmapTextSize');
66
var ParseRetroFont = require('../ParseRetroFont');

0 commit comments

Comments
 (0)