mirror of
https://github.com/photonstorm/phaser
synced 2025-02-16 05:58:30 +00:00
The GamepadManager now extends EventEmitter directly, just like the KeyboardManager does.
This commit is contained in:
parent
19f7e2589a
commit
f6167f6fcf
4 changed files with 17 additions and 21 deletions
|
@ -61,6 +61,14 @@ var Axis = new Class({
|
|||
*/
|
||||
this.value = 0;
|
||||
|
||||
/**
|
||||
* Movement tolerance threshold.
|
||||
*
|
||||
* @name Phaser.Input.Gamepad.Axis#threshold
|
||||
* @type {float}
|
||||
* @default 0.05
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.threshold = 0.05;
|
||||
},
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ var Button = new Class({
|
|||
* @type {Phaser.Events.EventEmitter}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.events = pad.events;
|
||||
this.events = pad.manager;
|
||||
|
||||
/**
|
||||
* [description]
|
||||
|
|
|
@ -36,15 +36,6 @@ var Gamepad = new Class({
|
|||
*/
|
||||
this.manager = manager;
|
||||
|
||||
/**
|
||||
* [description]
|
||||
*
|
||||
* @name Phaser.Input.Gamepad.Gamepad#events
|
||||
* @type {Phaser.Events.EventEmitter}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.events = manager.events;
|
||||
|
||||
/**
|
||||
* [description]
|
||||
*
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
var Class = require('../../utils/Class');
|
||||
var EventEmitter = require('eventemitter3');
|
||||
var Gamepad = require('./Gamepad');
|
||||
|
||||
// https://developer.mozilla.org/en-US/docs/Web/API/Gamepad_API
|
||||
|
@ -30,6 +31,7 @@ var Gamepad = require('./Gamepad');
|
|||
* [description]
|
||||
*
|
||||
* @class GamepadManager
|
||||
* @extends Phaser.Events.EventEmitter
|
||||
* @memberOf Phaser.Input.Gamepad
|
||||
* @constructor
|
||||
* @since 3.0.0
|
||||
|
@ -38,10 +40,14 @@ var Gamepad = require('./Gamepad');
|
|||
*/
|
||||
var GamepadManager = new Class({
|
||||
|
||||
Extends: EventEmitter,
|
||||
|
||||
initialize:
|
||||
|
||||
function GamepadManager (inputManager)
|
||||
{
|
||||
EventEmitter.call(this);
|
||||
|
||||
/**
|
||||
* [description]
|
||||
*
|
||||
|
@ -51,15 +57,6 @@ var GamepadManager = new Class({
|
|||
*/
|
||||
this.manager = inputManager;
|
||||
|
||||
/**
|
||||
* [description]
|
||||
*
|
||||
* @name Phaser.Input.Gamepad.GamepadManager#events
|
||||
* @type {Phaser.Events.EventEmitter}
|
||||
* @since 3.0.0
|
||||
*/
|
||||
this.events = inputManager.events;
|
||||
|
||||
/**
|
||||
* [description]
|
||||
*
|
||||
|
@ -346,7 +343,7 @@ var GamepadManager = new Class({
|
|||
|
||||
pad = this.getPad(event.gamepad.index);
|
||||
|
||||
this.events.emit('connected', pad, event);
|
||||
this.emit('connected', pad, event);
|
||||
|
||||
break;
|
||||
|
||||
|
@ -354,7 +351,7 @@ var GamepadManager = new Class({
|
|||
|
||||
pad = this.getPad(event.gamepad.index);
|
||||
|
||||
this.events.emit('disconnected', pad, event);
|
||||
this.emit('disconnected', pad, event);
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue