From a45458449618fce479fc5b321b6ce64f73a113a4 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 23 Sep 2015 10:59:52 -0700 Subject: [PATCH] Updated default avatar-animation.json --- .../meshes/defaultAvatar_full/avatar-animation.json | 5 +++++ libraries/animation/src/AnimNode.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/resources/meshes/defaultAvatar_full/avatar-animation.json b/interface/resources/meshes/defaultAvatar_full/avatar-animation.json index 9c357ac845..550a95e980 100644 --- a/interface/resources/meshes/defaultAvatar_full/avatar-animation.json +++ b/interface/resources/meshes/defaultAvatar_full/avatar-animation.json @@ -23,6 +23,11 @@ "positionVar": "leftHandPosition", "rotationVar": "leftHandRotation" }, + { + "jointName": "Neck", + "positionVar": "neckPosition", + "rotationVar": "neckRotation" + }, { "jointName": "Head", "positionVar": "headPosition", diff --git a/libraries/animation/src/AnimNode.h b/libraries/animation/src/AnimNode.h index d5da552a0f..e8c611d3e4 100644 --- a/libraries/animation/src/AnimNode.h +++ b/libraries/animation/src/AnimNode.h @@ -61,7 +61,7 @@ public: // hierarchy accessors void addChild(Pointer child) { _children.push_back(child); } void removeChild(Pointer child); - + Pointer getChild(int i) const; int getChildCount() const { return (int)_children.size(); }