Support new hand animations (#2191)

* working remapping to new hands from @arturitu

* minor changes requested per discussion on PR
update to CDN URLs from aframevr/assets#18

Author: machenmusik

docs/components/hand-controls.md

@@ -46,5 +46,5 @@ handles hand animations and poses.
 
 ## Assets
 
-- [Left hand model](https://cdn.aframe.io/controllers/oculus-hands/leftHand.json)
-- [Right hand model](https://cdn.aframe.io/controllers/oculus-hands/rightHand.json)
+- [Left hand model](https://cdn.aframe.io/controllers/oculus-hands/v2/leftHand.json)
+- [Right hand model](https://cdn.aframe.io/controllers/oculus-hands/v2/rightHand.json)

src/components/hand-controls.js

@@ -1,7 +1,7 @@
 var registerComponent = require('../core/component').registerComponent;
 
-var OCULUS_LEFT_HAND_MODEL_URL = 'https://cdn.aframe.io/controllers/oculus-hands/leftHand.json';
-var OCULUS_RIGHT_HAND_MODEL_URL = 'https://cdn.aframe.io/controllers/oculus-hands/rightHand.json';
+var OCULUS_LEFT_HAND_MODEL_URL = 'https://cdn.aframe.io/controllers/oculus-hands/v2/leftHand.json';
+var OCULUS_RIGHT_HAND_MODEL_URL = 'https://cdn.aframe.io/controllers/oculus-hands/v2/rightHand.json';
 
 /**
 *
@@ -183,30 +183,32 @@ module.exports.Component = registerComponent('hand-controls', {
   },
 
   gestureAnimationMapping: {
-    'pointing': 'pointing',
-    'pistol': 'pistol',
-    'fist': 'press',
-    'touch': 'touch',
-    'thumb': 'thumb'
+    default: 'Open',
+    pointing: 'Point',
+    pistol: 'Point + Thumb',
+    fist: 'Fist',
+    touch: 'Hold',
+    thumb: 'Thumb Up'
   },
 
   animateGesture: function (gesture) {
     var isOculusTouch = this.isOculusTouchController();
-    if (!gesture) {
-      this.playAnimation('touch', isOculusTouch);
+    if (!gesture && !isOculusTouch) {
+      // for Vive (and other non-Oculus Touch), change rest pose to be thumb down
+      this.playAnimation('Open', true);
       return;
     }
-    var animation = this.gestureAnimationMapping[gesture];
-    this.playAnimation(animation || 'touch', !animation && isOculusTouch);
+    var animation = this.gestureAnimationMapping[gesture || 'default'];
+    this.playAnimation(animation || 'Open', !animation && isOculusTouch);
   },
 
   // map to old vive-specific event names for now
   gestureEventMapping: {
-    'fist': 'grip',         // fist: e.g. grip active, trigger active, trackpad / surface active
-    'touch': 'point',       // 'touch' e.g. trigger active, grip not active
-    'thumb': 'thumb',       // thumbs up: e.g. grip active, trigger active, trackpad / surface not active
-    'pointing': 'pointing', // pointing: e.g. grip active, trackpad / surface active, trigger not active
-    'pistol': 'pistol'      // pistol: e.g. grip active, trigger not active, trackpad / surface not active
+    fist: 'grip',         // fist: e.g. grip active, trigger active, trackpad / surface active
+    touch: 'point',       // 'touch' e.g. trigger active, grip not active
+    thumb: 'thumb',       // thumbs up: e.g. grip active, trigger active, trackpad / surface not active
+    pointing: 'pointing', // pointing: e.g. grip active, trackpad / surface active, trigger not active
+    pistol: 'pistol'      // pistol: e.g. grip active, trigger not active, trackpad / surface not active
   },
 
   gestureEventName: function (gesture, active) {
@@ -239,6 +241,7 @@ module.exports.Component = registerComponent('hand-controls', {
     var animationActive = this.animationActive;
     var timeScale = 1;
     var mesh = this.el.getObject3D('mesh');
+    var clipAction;
     if (!mesh) { return; }
 
     // determine direction of the animation.
@@ -248,9 +251,14 @@ module.exports.Component = registerComponent('hand-controls', {
     if (animationActive) { mesh.play(animationActive, 0); }
 
     // play new animation.
-    mesh.mixer.clipAction(animation).loop = 2200;
-    mesh.mixer.clipAction(animation).clampWhenFinished = true;
-    mesh.mixer.clipAction(animation).timeScale = timeScale;
+    clipAction = mesh.mixer.clipAction(animation);
+    // returning when no clipAction will prevent further issues
+    // (e.g. controllers no longer updating pose)
+    // but per https://github.com/aframevr/aframe/pull/2191#discussion_r93121878
+    // the preference is to NOT prevent the issues to catch bugs earlier in QA.
+    clipAction.loop = 2200;
+    clipAction.clampWhenFinished = true;
+    clipAction.timeScale = timeScale;
     mesh.play(animation, 1);
     this.animationActive = animation;
   }