From 993af3b996bb557bf8de6d2292425c70d0077a74 Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Wed, 7 Mar 2018 15:01:50 -0800
Subject: [PATCH] Fix hand animations for the inflated model.
---
src/components/animated-robot-hands.js | 9 +++++----
src/elements/a-gltf-entity.js | 13 +++++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/components/animated-robot-hands.js b/src/components/animated-robot-hands.js
index 134ef1cf9..a7cde1952 100644
--- a/src/components/animated-robot-hands.js
+++ b/src/components/animated-robot-hands.js
@@ -25,12 +25,13 @@ AFRAME.registerComponent("animated-robot-hands", {
// Get the three.js object in the scene graph that has the animation data
const root = this.el.querySelector("a-gltf-entity .RootScene").object3D.children[0];
this.mixer = new THREE.AnimationMixer(root);
+ this.root = root;
// Set hands to open pose because the bind pose is funky due
// to the workaround for FBX2glTF animations.
- this.openL = this.mixer.clipAction(POSES.open + "_L");
- this.openR = this.mixer.clipAction(POSES.open + "_R");
+ this.openL = this.mixer.clipAction(POSES.open + "_L", root.parent);
+ this.openR = this.mixer.clipAction(POSES.open + "_R", root.parent);
this.openL.play();
this.openR.play();
},
@@ -81,8 +82,8 @@ AFRAME.registerComponent("animated-robot-hands", {
// console.log(
// `Animating ${isLeft ? "left" : "right"} hand from ${prevPose} to ${currPose} over ${duration} seconds.`
// );
- var from = mixer.clipAction(prevPose);
- var to = mixer.clipAction(currPose);
+ var from = mixer.clipAction(prevPose, this.root.parent);
+ var to = mixer.clipAction(currPose, this.root.parent);
from.fadeOut(duration);
to.fadeIn(duration);
to.play();
diff --git a/src/elements/a-gltf-entity.js b/src/elements/a-gltf-entity.js
index afc9522ad..66ad29803 100644
--- a/src/elements/a-gltf-entity.js
+++ b/src/elements/a-gltf-entity.js
@@ -83,6 +83,19 @@ const inflateEntities = function(classPrefix, parentEl, node) {
el.setObject3D(node.type.toLowerCase(), node);
+ // Set the name of the `THREE.Group` to match the name of the node,
+ // so that `THREE.PropertyBinding` will find (and later animate)
+ // the group. See `PropertyBinding.findNode`:
+ // https://github.com/mrdoob/three.js/blob/dev/src/animation/PropertyBinding.js#L211
+ el.object3D.name = node.name;
+ if (node.animations) {
+ // Pass animations up to the group object so that when we can pass the group as
+ // the optional root in `THREE.AnimationMixer.clipAction` and use the hierarchy
+ // preserved under the group (but not the node). Otherwise `clipArray` will be
+ // `null` in `THREE.AnimationClip.findByName`.
+ node.parent.animations = node.animations;
+ }
+
children.forEach(childNode => {
inflateEntities(classPrefix, el, childNode);
});
--
GitLab