Rim-Modules/gamepad-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added gamepad type to params collection

Browse Source
This commit is contained in:
e7d 2017-05-14 15:15:46 +02:00
parent 57494d6c6e
commit 11ba1e8fb0
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/gamepad.js
View File

@ -13,14 +13,17 @@ class Gamepad {
this.gamepadIdentifiers = { this.gamepadIdentifiers = {
'debug': { 'debug': {
'id': /debug/, 'id': /debug/,
'name': 'Debug',
'colors': [] 'colors': []
}, },
'ds4': { 'ds4': {
'id': /054c.*?05c4/, 'id': /054c.*?05c4/,
'name': 'DualShock 4',
'colors': ['black', 'white', 'red', 'blue'] 'colors': ['black', 'white', 'red', 'blue']
}, },
'xbox-one': { 'xbox-one': {
'id': /xinput|XInput/, 'id': /xinput|XInput/,
'name': 'Xbox One',
'colors': ['black', 'white'] 'colors': ['black', 'white']
} }
}; };
@ -56,8 +59,9 @@ class Gamepad {
// read URI for display parameters to initalize // read URI for display parameters to initalize
this.params = { this.params = {
gamepadIndex: $.urlParam('index') || $.urlParam('i') || null,
gamepadColor: $.urlParam('color') || $.urlParam('c') || null, gamepadColor: $.urlParam('color') || $.urlParam('c') || null,
gamepadIndex: $.urlParam('index') || $.urlParam('i') || null,
gamepadType: $.urlParam('type') || $.urlParam('t') || null,
zoom: $.urlParam('zoom') || $.urlParam('z') || null zoom: $.urlParam('zoom') || $.urlParam('z') || null
}; };
@ -153,6 +157,7 @@ class Gamepad {
if (gamepadIndex === this.activeGamepadIndex) { if (gamepadIndex === this.activeGamepadIndex) {
// clear associated date // clear associated date
this.activeGamepadIndex = null; this.activeGamepadIndex = null;
this.activeGamepad = null;
this.$gamepad.empty(); this.$gamepad.empty();
} }
delete this.gamepads[gamepadIndex]; delete this.gamepads[gamepadIndex];
@ -216,22 +221,24 @@ class Gamepad {
return; return;
} }
// determine gamepad type
this.activeGamepadType = null; this.activeGamepadType = null;
if (this.debug) { if (this.params.gamepadType) {
// if the gamepad type is set through params, apply it
this.activeGamepadType = this.params.gamepadType;
} else if (this.debug) {
// if the debug option is active, use the associated template // if the debug option is active, use the associated template
this.activeGamepadType = 'debug'; this.activeGamepadType = 'debug';
this.activeGamepadIdentifier = this.gamepadIdentifiers[this.activeGamepadType];
this.activeGamepadColorIndex = 0;
} else { } else {
// else, determine the template to use from the gamepad identifier // else, determine the template to use from the gamepad identifier
for (let gamepadType in this.gamepadIdentifiers) { for (let gamepadType in this.gamepadIdentifiers) {
if (this.gamepadIdentifiers[gamepadType].id.test(this.activeGamepad.id)) { if (this.gamepadIdentifiers[gamepadType].id.test(this.activeGamepad.id)) {
this.activeGamepadType = gamepadType; this.activeGamepadType = gamepadType;
this.activeGamepadIdentifier = this.gamepadIdentifiers[gamepadType];
this.activeGamepadColorIndex = 0;
} }
} }
} }
this.activeGamepadIdentifier = this.gamepadIdentifiers[this.activeGamepadType];
this.activeGamepadColorIndex = 0;
// ensure a valid gamepad type was discovered // ensure a valid gamepad type was discovered
if (!this.activeGamepadType) { if (!this.activeGamepadType) {