Skip to content

Commit f6167f6

Browse files
committed
The GamepadManager now extends EventEmitter directly, just like the KeyboardManager does.
1 parent 19f7e25 commit f6167f6

4 files changed

Lines changed: 17 additions & 21 deletions

File tree

src/input/gamepad/Axis.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ var Axis = new Class({
6161
*/
6262
this.value = 0;
6363

64+
/**
65+
* Movement tolerance threshold.
66+
*
67+
* @name Phaser.Input.Gamepad.Axis#threshold
68+
* @type {float}
69+
* @default 0.05
70+
* @since 3.0.0
71+
*/
6472
this.threshold = 0.05;
6573
},
6674

src/input/gamepad/Button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var Button = new Class({
4040
* @type {Phaser.Events.EventEmitter}
4141
* @since 3.0.0
4242
*/
43-
this.events = pad.events;
43+
this.events = pad.manager;
4444

4545
/**
4646
* [description]

src/input/gamepad/Gamepad.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ var Gamepad = new Class({
3636
*/
3737
this.manager = manager;
3838

39-
/**
40-
* [description]
41-
*
42-
* @name Phaser.Input.Gamepad.Gamepad#events
43-
* @type {Phaser.Events.EventEmitter}
44-
* @since 3.0.0
45-
*/
46-
this.events = manager.events;
47-
4839
/**
4940
* [description]
5041
*

src/input/gamepad/GamepadManager.js

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

77
var Class = require('../../utils/Class');
8+
var EventEmitter = require('eventemitter3');
89
var Gamepad = require('./Gamepad');
910

1011
// https://developer.mozilla.org/en-US/docs/Web/API/Gamepad_API
@@ -30,6 +31,7 @@ var Gamepad = require('./Gamepad');
3031
* [description]
3132
*
3233
* @class GamepadManager
34+
* @extends Phaser.Events.EventEmitter
3335
* @memberOf Phaser.Input.Gamepad
3436
* @constructor
3537
* @since 3.0.0
@@ -38,10 +40,14 @@ var Gamepad = require('./Gamepad');
3840
*/
3941
var GamepadManager = new Class({
4042

43+
Extends: EventEmitter,
44+
4145
initialize:
4246

4347
function GamepadManager (inputManager)
4448
{
49+
EventEmitter.call(this);
50+
4551
/**
4652
* [description]
4753
*
@@ -51,15 +57,6 @@ var GamepadManager = new Class({
5157
*/
5258
this.manager = inputManager;
5359

54-
/**
55-
* [description]
56-
*
57-
* @name Phaser.Input.Gamepad.GamepadManager#events
58-
* @type {Phaser.Events.EventEmitter}
59-
* @since 3.0.0
60-
*/
61-
this.events = inputManager.events;
62-
6360
/**
6461
* [description]
6562
*
@@ -346,15 +343,15 @@ var GamepadManager = new Class({
346343

347344
pad = this.getPad(event.gamepad.index);
348345

349-
this.events.emit('connected', pad, event);
346+
this.emit('connected', pad, event);
350347

351348
break;
352349

353350
case 'gamepaddisconnected':
354351

355352
pad = this.getPad(event.gamepad.index);
356353

357-
this.events.emit('disconnected', pad, event);
354+
this.emit('disconnected', pad, event);
358355

359356
break;
360357
}

0 commit comments

Comments
 (0)