Skip to content

Commit 26fd3ee

Browse files
committed
Renamed input manager files and refs.
1 parent b4a01bb commit 26fd3ee

8 files changed

Lines changed: 36 additions & 43 deletions

File tree

src/boot/Game.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var AnimationManager = require('../animations/AnimationManager');
1313
var CreateRenderer = require('./CreateRenderer');
1414
var Data = require('../data/Data');
1515
var GlobalCache = require('../cache/GlobalCache');
16-
var GlobalInputManager = require('../input/GlobalInputManager');
16+
var InputManager = require('../input/InputManager');
1717
var GlobalSceneManager = require('../scene/global/GlobalSceneManager');
1818
var PluginManager = require('../plugins/PluginManager');
1919
var SoundManagerCreator = require('../sound/SoundManagerCreator');
@@ -116,9 +116,9 @@ var Game = new Class({
116116
/**
117117
* [description]
118118
*
119-
* @property {Phaser.Input.GlobalInputManager} input
119+
* @property {Phaser.Input.InputManager} input
120120
*/
121-
this.input = new GlobalInputManager(this, this.config);
121+
this.input = new InputManager(this, this.config);
122122

123123
/**
124124
* [description]
@@ -151,7 +151,7 @@ var Game = new Class({
151151
/**
152152
* [description]
153153
*
154-
* @property {Phaser.Input.GlobalInputManager} input
154+
* @property {Phaser.Plugins.PluginManager} plugins
155155
*/
156156
this.plugins = new PluginManager(this, this.config);
157157

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Phaser.Input.GlobalInputManager
1+
// Phaser.Input.InputManager
22

33
var Class = require('../utils/Class');
44
var EventEmitter = require('eventemitter3');
@@ -9,11 +9,11 @@ var Pointer = require('./Pointer');
99
var Touch = require('./touch/TouchManager');
1010
var TransformXY = require('../math/TransformXY');
1111

12-
var GlobalInputManager = new Class({
12+
var InputManager = new Class({
1313

1414
initialize:
1515

16-
function GlobalInputManager (game, config)
16+
function InputManager (game, config)
1717
{
1818
this.game = game;
1919

@@ -278,4 +278,4 @@ var GlobalInputManager = new Class({
278278

279279
});
280280

281-
module.exports = GlobalInputManager;
281+
module.exports = InputManager;
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
var Class = require('../../utils/Class');
1+
var Class = require('../utils/Class');
22
var EventEmitter = require('eventemitter3');
3-
var DistanceBetween = require('../../math/distance/DistanceBetween');
4-
var InteractiveObject = require('../InteractiveObject');
5-
var Circle = require('../../geom/circle/Circle');
6-
var CircleContains = require('../../geom/circle/Contains');
7-
var Ellipse = require('../../geom/ellipse/Ellipse');
8-
var EllipseContains = require('../../geom/ellipse/Contains');
9-
var Rectangle = require('../../geom/rectangle/Rectangle');
10-
var RectangleContains = require('../../geom/rectangle/Contains');
11-
var Triangle = require('../../geom/triangle/Triangle');
12-
var TriangleContains = require('../../geom/triangle/Contains');
3+
var DistanceBetween = require('../math/distance/DistanceBetween');
4+
var InteractiveObject = require('./InteractiveObject');
5+
var Circle = require('../geom/circle/Circle');
6+
var CircleContains = require('../geom/circle/Contains');
7+
var Ellipse = require('../geom/ellipse/Ellipse');
8+
var EllipseContains = require('../geom/ellipse/Contains');
9+
var Rectangle = require('../geom/rectangle/Rectangle');
10+
var RectangleContains = require('../geom/rectangle/Contains');
11+
var Triangle = require('../geom/triangle/Triangle');
12+
var TriangleContains = require('../geom/triangle/Contains');
1313

1414
// Drag Events
1515
// https://developer.mozilla.org/en-US/docs/Web/API/HTML_Drag_and_Drop_API
1616
// Mouse Events
1717
// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent
1818

19-
var SceneInputManager = new Class({
19+
var InputPlugin = new Class({
2020

2121
Extends: EventEmitter,
2222

2323
initialize:
2424

25-
function SceneInputManager (scene)
25+
function InputPlugin (scene)
2626
{
2727
EventEmitter.call(this);
2828

2929
// The Scene that owns this plugin
3030
this.scene = scene;
3131

32-
// GlobalInputManager
32+
// InputManager
3333
this.manager = scene.sys.game.input;
3434

3535
// A reference to this.scene.sys.displayList (set in boot)
@@ -992,4 +992,4 @@ var SceneInputManager = new Class({
992992

993993
});
994994

995-
module.exports = SceneInputManager;
995+
module.exports = InputPlugin;

src/input/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
module.exports = {
44

55
Gamepad: require('./gamepad'),
6+
InteractiveObject: require('./InteractiveObject'),
67
Keyboard: require('./keyboard'),
7-
Mouse: require('./mouse')
8+
Mouse: require('./mouse'),
9+
Pointer: require('./Pointer'),
10+
Touch: require('./touch')
811

912
};

src/input/mouse/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module.exports = {
44

5-
MouseManager: require('./MouseManager')
5+
MouseManager: require('./MouseManager')
66

77
};

src/input/touch/index.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Phaser.Input.Touch
2+
3+
module.exports = {
4+
5+
TouchManager: require('./TouchManager')
6+
7+
};

src/scene/local/Systems.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var DisplayList = require('../plugins/DisplayList');
77
var EventEmitter = require('eventemitter3');
88
var GameObjectCreator = require('../plugins/GameObjectCreator');
99
var GameObjectFactory = require('../plugins/GameObjectFactory');
10-
var InputManager = require('../plugins/InputManager');
10+
var InputManager = require('../../input/InputPlugin');
1111
var Loader = require('../plugins/Loader');
1212
var PhysicsManager = require('../plugins/PhysicsManager');
1313
var SceneManager = require('../plugins/SceneManager');

src/scene/plugins/InputManager.js

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

0 commit comments

Comments
 (0)