use latest dists for aframe-physics-system and aframe-physics-extras (f…

…ixes #269). Fix issue where phyiscal hand attached to cursor-controller wasn't being set properly and also add back hoverable component to ducks.

package.json

@@ -23,8 +23,8 @@
     "aframe-billboard-component": "^1.0.0",
     "aframe-extras": "https://github.com/MozillaReality/aframe-extras#feature/precompute-nav-mesh",
     "aframe-input-mapping-component": "https://github.com/mozillareality/aframe-input-mapping-component#hubs/master",
-    "aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash",
-    "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#feature/shape-component",
+    "aframe-physics-extras": "^0.1.3",
+    "aframe-physics-system": "^3.1.1",
     "aframe-rounded": "^1.0.3",
     "aframe-slice9-component": "^1.0.0",
     "aframe-teleport-controls": "https://github.com/mozillareality/aframe-teleport-controls#hubs/master",

src/components/cursor-controller.js

@@ -68,7 +68,7 @@ AFRAME.registerComponent("cursor-controller", {
   },
 
   update: function(oldData) {
-    if (oldData.physicalHand !== this.data.physicalHandSelector) {
+    if (oldData.physicalHandSelector !== this.data.physicalHandSelector) {
       this._handleModelLoaded();
     }
 
@@ -445,7 +445,7 @@ AFRAME.registerComponent("cursor-controller", {
     if (this.hasPointingDevice) {
       const controllerData = this.controllerQueue[0];
       const hand = controllerData.handedness;
-      this.el.setAttribute("cursor-controller", { physicalHand: `#${hand}-super-hand` });
+      this.el.setAttribute("cursor-controller", { physicalHandSelector: `#player-${hand}-controller` });
       this.controller = controllerData.controller;
     } else {
       this.controller = null;

src/gltf-component-mappings.js

@@ -22,6 +22,7 @@ AFRAME.GLTFModelPlus.registerComponent("loop-animation", "loop-animation");
 AFRAME.GLTFModelPlus.registerComponent("shape", "shape");
 AFRAME.GLTFModelPlus.registerComponent("visible", "visible");
 AFRAME.GLTFModelPlus.registerComponent("spawn-point", "spawn-point");
+AFRAME.GLTFModelPlus.registerComponent("hoverable", "hoverable");
 AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, componentName, componentData, gltfPath) => {
   if (componentData.src) {
     componentData.src = resolveURL(componentData.src, gltfPath);

src/hub.html

@@ -169,6 +169,7 @@
                     body="type: dynamic; shape: none; mass: 1;"
                     grabbable
                     stretchable="useWorldPosition: true;"
+                    hoverable
                     duck
                 ></a-entity>
             </template>
@@ -194,7 +195,7 @@
                 cursor: #cursor; 
                 camera: #player-camera; 
                 playerRig: #player-rig;
-                physicalHandSelector: #right-super-hand;
+                physicalHandSelector: #player-right-controller;
                 gazeTeleportControls: #gaze-teleport;"
             raycaster="objects: .collidable, .interactable, .ui; far: 3;"
             line="visible: false; color: white; opacity: 0.2;"

yarn.lock

@@ -170,18 +170,18 @@ aframe-billboard-component@^1.0.0:
   version "0.1.2"
   resolved "https://github.com/mozillareality/aframe-input-mapping-component#03932457c5318db243e811d2767fe0c5a8c7e9e0"
 
-"aframe-physics-extras@https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash":
-  version "0.1.2"
-  resolved "https://github.com/infinitelee/aframe-physics-extras#49b2d5d3c0caac905783aee51d9e89dbdf7199b8"
+aframe-physics-extras@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/aframe-physics-extras/-/aframe-physics-extras-0.1.3.tgz#803e2164fb96c0a80f2d1a81458f3277f262b130"
 
-"aframe-physics-system@https://github.com/infinitelee/aframe-physics-system#feature/shape-component":
-  version "3.0.2"
-  resolved "https://github.com/infinitelee/aframe-physics-system#be3e43f1af5b995952e1b3d27dce216ab2e79f05"
+aframe-physics-system@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/aframe-physics-system/-/aframe-physics-system-3.1.1.tgz#3e6c48f8ce63a1d356a7e302fed51c7b5ad23d22"
   dependencies:
     browserify "^14.3.0"
     budo "^10.0.3"
     cannon "github:donmccurdy/cannon.js#v0.6.2-dev1"
-    three-to-cannon "^1.2.0"
+    three-to-cannon "^1.3.0"
     webworkify "^1.4.0"
 
 aframe-rounded@^1.0.3:
@@ -7873,9 +7873,9 @@ three-pathfinding@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/three-pathfinding/-/three-pathfinding-0.5.5.tgz#ff05a8f8cfba343b3b07c05c25d11b0d161911f8"
 
-three-to-cannon@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/three-to-cannon/-/three-to-cannon-1.2.0.tgz#92b9a756a270851aa98c3058c51ef15891507c01"
+three-to-cannon@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/three-to-cannon/-/three-to-cannon-1.3.0.tgz#9ef95d74442b0ed9258e7783df4a130b90899b16"
 
 through2@^2.0.0, through2@^2.0.1:
   version "2.0.3"