Support built-in controls. Fix gamepad initialization

AltspaceVR · Sep 22, 2016 · 947afd2 · 947afd2
1 parent 33a33df
commit 947afd2
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ Note that when running in Altspace, the scene will not be synchronized between u
 | `verticalAlign` | Puts the scene origin at the bottom, middle, or top of the Altspace enclosure.  If your scene seems to be floating in midair, try setting this to 'bottom'. | `middle`
 
 ### Usage
-Add the "altspace" parameter on your `<a-scene>` like so: `<a-scene altspace>`
 
+Add the "altspace" attribute on your `<a-scene>` like so: `<a-scene altspace>`
 
 #### Example
 
@@ -34,3 +34,16 @@ Install and use by directly including the [browser files](dist):
   </a-scene>
 </body>
 ```
+
+## altspace-tracked-controls
+
+This library also includes an `altspace-tracked-controls` component that enables tracked control support for A-Frame
+applications that use the built-in `tracked-controls`, `vive-controls` or `hand-controls` components.
+
+### Usage
+
+Add the "altspace-tracked-controls" attribute to your tracked entity. For example:
+
+```html
+<a-entity hand-controls="right" altspace-tracked-controls></a-entity>
+```
diff --git a/dist/aframe-altspace-component.js b/dist/aframe-altspace-component.js
@@ -208,11 +208,34 @@
 	});
 
 	AFRAME.registerComponent('altspace-tracked-controls', {
-	  update: function () {
-	      if (window.altspace && altspace.getGamepads) {
+	  init: function () {
+	    this.gamepadIndex = null;
+	    this.trackedControlsSystem = document.querySelector('a-scene').systems['tracked-controls'];
+	    this.systemGamepads = 0;
+	    altspace.getGamepads();
+	  },
+	  tick: function () {
+	      if (
+	        this.trackedControlsSystem &&
+	        this.systemGamepads !== this.trackedControlsSystem.controllers.length &&
+	        window.altspace && altspace.getGamepads && altspace.getGamepads().length
+	      ) {
+	        var components = this.el.components;
+	        if (components['paint-controls']) {
+	          this.gamepadIndex = components['paint-controls'].data.hand === 'left' ? 2 : 1;
+	        }
+	        if (this.gamepadIndex === null && components['hand-controls']) {
+	          this.gamepadIndex = components['hand-controls'].data === 'left' ? 2 : 1;
+	        }
+	        if (this.gamepadIndex === null && components['vive-controls']) {
+	          this.gamepadIndex = components['vive-controls'].data.hand === 'left' ? 2 : 1;
+	        }
+	        if (this.gamepadIndex === null && components['tracked-controls']) {
+	          this.gamepadIndex = components['tracked-controls'].data.controller;
+	        }
+	        this.el.setAttribute('tracked-controls', 'id', altspace.getGamepads()[this.gamepadIndex].id);
 	        this.el.setAttribute('tracked-controls', 'controller', 0);
-	        var gamepadIndex = this.el.components['hand-controls'].data === 'left' ? 2 : 1;
-	        this.el.setAttribute('tracked-controls', 'id', altspace.getGamepads()[gamepadIndex].id);
+	        this.systemGamepads = this.trackedControlsSystem.controllers.length;
 	      }
 	  }
 	});

diff --git a/dist/aframe-altspace-component.min.js b/dist/aframe-altspace-component.min.js
diff --git a/index.js b/index.js
@@ -162,11 +162,34 @@ AFRAME.registerComponent('altspace', {
 });
 
 AFRAME.registerComponent('altspace-tracked-controls', {
-  update: function () {
-      if (window.altspace && altspace.getGamepads) {
+  init: function () {
+    this.gamepadIndex = null;
+    this.trackedControlsSystem = document.querySelector('a-scene').systems['tracked-controls'];
+    this.systemGamepads = 0;
+    altspace.getGamepads();
+  },
+  tick: function () {
+      if (
+        this.trackedControlsSystem &&
+        this.systemGamepads !== this.trackedControlsSystem.controllers.length &&
+        window.altspace && altspace.getGamepads && altspace.getGamepads().length
+      ) {
+        var components = this.el.components;
+        if (components['paint-controls']) {
+          this.gamepadIndex = components['paint-controls'].data.hand === 'left' ? 2 : 1;
+        }
+        if (this.gamepadIndex === null && components['hand-controls']) {
+          this.gamepadIndex = components['hand-controls'].data === 'left' ? 2 : 1;
+        }
+        if (this.gamepadIndex === null && components['vive-controls']) {
+          this.gamepadIndex = components['vive-controls'].data.hand === 'left' ? 2 : 1;
+        }
+        if (this.gamepadIndex === null && components['tracked-controls']) {
+          this.gamepadIndex = components['tracked-controls'].data.controller;
+        }
+        this.el.setAttribute('tracked-controls', 'id', altspace.getGamepads()[this.gamepadIndex].id);
         this.el.setAttribute('tracked-controls', 'controller', 0);
-        var gamepadIndex = this.el.components['hand-controls'].data === 'left' ? 2 : 1;
-        this.el.setAttribute('tracked-controls', 'id', altspace.getGamepads()[gamepadIndex].id);
+        this.systemGamepads = this.trackedControlsSystem.controllers.length;
       }
   }
 });