From 9d5a0bc47dfe33e77f2d3f19e5dde5cbf7b9d95f Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Wed, 9 May 2018 15:35:00 -0700
Subject: [PATCH] taking out gamepad-controls
---
src/components/cursor-controller.js | 4 ++--
src/hub.html | 1 -
src/hub.js | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
index 4c95466f9..ba0398a62 100644
--- a/src/components/cursor-controller.js
+++ b/src/components/cursor-controller.js
@@ -386,7 +386,7 @@ AFRAME.registerComponent("cursor-controller", {
},
_handlePrimaryDown: function(e) {
- if (e.target === this.controller || e.type === "gamepadbuttondown") {
+ if (e.target === this.controller) {
const isInteractable = this._isTargetOfType(TARGET_TYPE_INTERACTABLE) && !this.grabStarting;
if (isInteractable || this._isTargetOfType(TARGET_TYPE_UI)) {
this.grabStarting = true;
@@ -398,7 +398,7 @@ AFRAME.registerComponent("cursor-controller", {
},
_handlePrimaryUp: function(e) {
- if (e.target === this.controller || e.type === "gamepadbuttonup") {
+ if (e.target === this.controller) {
if (this._isGrabbing() || this._isTargetOfType(TARGET_TYPE_UI)) {
this.grabStarting = false;
this.data.cursor.emit("cursor-release", e.detail);
diff --git a/src/hub.html b/src/hub.html
index e91be3d6b..c8771f313 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -230,7 +230,6 @@
ik-root
player-info
networked-avatar
- gamepad-controls
>
<a-entity
id="player-hud"
diff --git a/src/hub.js b/src/hub.js
index 1c71658bf..8d0086d4f 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -90,7 +90,6 @@ if (qs.quality) {
import "aframe-physics-system";
import "aframe-physics-extras";
import "aframe-extras/src/pathfinding";
-import "aframe-extras/src/controls/gamepad-controls";
import "super-hands";
import "./components/super-networked-interactable";
import "./components/networked-counter";
--
GitLab