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

improved active gamepad handling

Browse Source
This commit is contained in:
e7d 2017-05-14 11:02:54 +02:00
parent d5297d4f89
commit 5f7038fe93
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/gamepad.js
View File

@ -24,6 +24,7 @@ class Gamepad {
}; };
this.gamepadHelpTimeout = null; this.gamepadHelpTimeout = null;
this.gamepadHelpDelay = 5000; this.gamepadHelpDelay = 5000;
this.activeGamepad = null;
this.activeGamepadIndex = null; this.activeGamepadIndex = null;
this.activeGamepadType = null; this.activeGamepadType = null;
this.activeGamepadIdentifier = null; this.activeGamepadIdentifier = null;
@ -143,13 +144,17 @@ class Gamepad {
} }
mapGamepad(gamepadIndex) { mapGamepad(gamepadIndex) {
if ('undefined' === typeof gamepadIndex) {
return;
}
this.activeGamepadIndex = gamepadIndex; this.activeGamepadIndex = gamepadIndex;
const gamepad = this.gamepads[this.activeGamepadIndex]; this.activeGamepad = this.gamepads[this.activeGamepadIndex];
let button; // ensure that a gamepad is currently active
let axis; if (!this.activeGamepad) {
return;
this.hideGamepadHelp(); }
if (this.debug) { if (this.debug) {
this.activeGamepadType = 'debug'; this.activeGamepadType = 'debug';
@ -157,7 +162,7 @@ class Gamepad {
this.activeGamepadColorIndex = 0; this.activeGamepadColorIndex = 0;
} else { } else {
for (let gamepadType in this.gamepadIdentifiers) { for (let gamepadType in this.gamepadIdentifiers) {
if (this.gamepadIdentifiers[gamepadType].id.test(gamepad.id)) { if (this.gamepadIdentifiers[gamepadType].id.test(this.activeGamepad.id)) {
this.activeGamepadType = gamepadType; this.activeGamepadType = gamepadType;
this.activeGamepadIdentifier = this.gamepadIdentifiers[gamepadType]; this.activeGamepadIdentifier = this.gamepadIdentifiers[gamepadType];
this.activeGamepadColorIndex = 0; this.activeGamepadColorIndex = 0;
@ -165,10 +170,11 @@ class Gamepad {
} }
} }
let button;
let axis;
this.hideGamepadHelp();
$.ajax( $.ajax(
'templates/' + this.activeGamepadType + '/template.html', { 'templates/' + this.activeGamepadType + '/template.html'
async: true
}
).done((template) => { ).done((template) => {
this.$gamepad.html(template); this.$gamepad.html(template);
@ -187,14 +193,14 @@ class Gamepad {
} }
this.mapping.buttons = []; this.mapping.buttons = [];
for (let buttonIndex = 0; buttonIndex < gamepad.buttons.length; buttonIndex++) { for (let buttonIndex = 0; buttonIndex < this.activeGamepad.buttons.length; buttonIndex++) {
button = gamepad.buttons[buttonIndex]; button = this.activeGamepad.buttons[buttonIndex];
this.mapping.buttons[buttonIndex] = $('[data-button=' + buttonIndex + ']'); this.mapping.buttons[buttonIndex] = $('[data-button=' + buttonIndex + ']');
} }
this.mapping.axes = []; this.mapping.axes = [];
for (let axisIndex = 0; axisIndex < gamepad.axes.length; axisIndex++) { for (let axisIndex = 0; axisIndex < this.activeGamepad.axes.length; axisIndex++) {
axis = gamepad.axes[axisIndex]; axis = this.activeGamepad.axes[axisIndex];
this.mapping.axes[axisIndex] = $('[data-axis=' + axisIndex + '], [data-axis-x=' + axisIndex + '], [data-axis-y=' + axisIndex + '], [data-axis-z=' + axisIndex + ']'); this.mapping.axes[axisIndex] = $('[data-axis=' + axisIndex + '], [data-axis-x=' + axisIndex + '], [data-axis-y=' + axisIndex + '], [data-axis-z=' + axisIndex + ']');
} }
@ -203,14 +209,9 @@ class Gamepad {
} }
updateVisualStatus() { updateVisualStatus() {
if (null === this.activeGamepadIndex) {
return;
}
this.gamepads = this.getGamepads(); this.gamepads = this.getGamepads();
const activeGamepad = this.gamepads[this.activeGamepadIndex]; // ensure that a gamepad is currently active
if (!this.activeGamepad) {
if (!activeGamepad) {
return; return;
} }
@ -218,13 +219,13 @@ class Gamepad {
let button; let button;
let $button; let $button;
for (let buttonIndex = 0; buttonIndex < activeGamepad.buttons.length; buttonIndex++) { for (let buttonIndex = 0; buttonIndex < this.activeGamepad.buttons.length; buttonIndex++) {
$button = this.mapping.buttons[buttonIndex]; $button = this.mapping.buttons[buttonIndex];
if (!$button) { if (!$button) {
break; break;
} }
button = activeGamepad.buttons[buttonIndex]; button = this.activeGamepad.buttons[buttonIndex];
$button.attr('data-pressed', button.pressed); $button.attr('data-pressed', button.pressed);
$button.attr('data-value', button.value); $button.attr('data-value', button.value);
@ -236,13 +237,13 @@ class Gamepad {
let axis; let axis;
let $axis; let $axis;
for (let axisIndex = 0; axisIndex < activeGamepad.axes.length; axisIndex++) { for (let axisIndex = 0; axisIndex < this.activeGamepad.axes.length; axisIndex++) {
$axis = this.mapping.axes[axisIndex]; $axis = this.mapping.axes[axisIndex];
if (!$axis) { if (!$axis) {
break; break;
} }
axis = activeGamepad.axes[axisIndex]; axis = this.activeGamepad.axes[axisIndex];
if ($axis.is('[data-axis=' + axisIndex + ']')) { if ($axis.is('[data-axis=' + axisIndex + ']')) {
$axis.attr('data-value', axis); $axis.attr('data-value', axis);
@ -264,7 +265,8 @@ class Gamepad {
} }
changeGamepadColor(gamepadColor) { changeGamepadColor(gamepadColor) {
if (!this.activeGamepadIdentifier) { // ensure that a gamepad is currently active
if (!this.activeGamepad) {
return; return;
} }
@ -295,7 +297,8 @@ class Gamepad {
} }
changeZoom(zoomLevel) { changeZoom(zoomLevel) {
if (!this.activeGamepadIdentifier) { // ensure that a gamepad is currently active
if (!this.activeGamepad) {
return; return;
} }
@ -330,10 +333,12 @@ class Gamepad {
} }
toggleDebug() { toggleDebug() {
if (null === this.activeGamepadIndex) { // ensure that a gamepad is currently active
if (!this.activeGamepad) {
return; return;
} }
// update debug value
this.debug = !this.debug; this.debug = !this.debug;
// remap current gamepad // remap current gamepad