Skip to content

Commit c6a2edd

Browse files
committed
Refactored Input Manager as it was getting too large for a single file class. Split up into Scene and Global Managers, broke all functions off into single files and started work on the new multi-pointer flow.
1 parent c848d18 commit c6a2edd

46 files changed

Lines changed: 641 additions & 503 deletions

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
@@ -14,7 +14,7 @@ var AnimationManager = require('../animation/manager/AnimationManager');
1414
var CreateRenderer = require('./CreateRenderer');
1515
var Data = require('../plugins/Data');
1616
var GlobalCache = require('../cache/GlobalCache');
17-
var GlobalInputManager = require('../input/GlobalInputManager');
17+
var GlobalInputManager = require('../input/global/GlobalInputManager');
1818
var GlobalSceneManager = require('../scene/GlobalSceneManager');
1919
var TextureManager = require('../textures/TextureManager');
2020
var TimeStep = require('./TimeStep');

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: '668ff4c0-6d49-11e7-a9ff-d120a05f4baf'
2+
build: 'a59b1ca0-6d65-11e7-9e25-f9ff7de73fa8'
33
};
44
module.exports = CHECKSUM;

v3/src/input/InteractiveObject.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ var InteractiveObject = function (gameObject, hitArea, hitAreaCallback)
2020
isDown: false,
2121
isDragged: false,
2222

23+
pointersOver: [],
24+
pointersDown: [],
25+
2326
callbackContext: gameObject,
2427

2528
onDown: NOOP,

v3/src/input/const.js

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Phaser.Input.GlobalInputManager
22

3-
var Class = require('../utils/Class');
4-
var EventDispatcher = require('../events/EventDispatcher');
3+
var Class = require('../../utils/Class');
4+
var EventDispatcher = require('../../events/EventDispatcher');
55
var GetTransformedPoint = require('./components/GetTransformedPoint');
6-
var Keyboard = require('./keyboard/KeyboardManager');
7-
var Mouse = require('./mouse/MouseManager');
8-
var MouseEvent = require('./mouse/events/');
9-
var Pointer = require('./Pointer');
6+
var Keyboard = require('../keyboard/KeyboardManager');
7+
var Mouse = require('../mouse/MouseManager');
8+
var MouseEvent = require('../mouse/events/');
9+
var Pointer = require('../Pointer');
1010
var PointScreenToWorldHitTest = require('./components/PointScreenToWorldHitTest');
1111
var HitTest = require('./components/HitTest');
1212
var PointWithinGameObject = require('./components/PointWithinGameObject');
13-
var TransformMatrix = require('../gameobjects/components/TransformMatrix');
13+
var TransformMatrix = require('../../gameobjects/components/TransformMatrix');
1414

1515
var GlobalInputManager = new Class({
1616

File renamed without changes.

v3/src/input/components/PointScreenToWorldHitTest.js renamed to v3/src/input/global/components/PointScreenToWorldHitTest.js

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)