From 5701ad2e8cdf4f700938f033442990888c411569 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 18 Dec 2015 12:38:50 -0800
Subject: [PATCH] update to new angular velocity

---
 examples/controllers/proceduralHandPoseExample.js | 2 +-
 libraries/controllers/src/controllers/Pose.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/controllers/proceduralHandPoseExample.js b/examples/controllers/proceduralHandPoseExample.js
index 5d0b10c46a..8b735f579f 100644
--- a/examples/controllers/proceduralHandPoseExample.js
+++ b/examples/controllers/proceduralHandPoseExample.js
@@ -63,7 +63,7 @@ mapping.from(function() {
             translation: translation,
             rotation: rotation,
             velocity: { x: 0, y: 0, z: 0 },
-            angularVelocity: { x: 0, y: 0, z: 0, w: 1 }
+            angularVelocity: { x: 0, y: 0, z: 0 }
         };
     return pose;
 }).debug(true).to(Controller.Standard.LeftHand);
diff --git a/libraries/controllers/src/controllers/Pose.cpp b/libraries/controllers/src/controllers/Pose.cpp
index 6b2d12e5df..d9641618c1 100644
--- a/libraries/controllers/src/controllers/Pose.cpp
+++ b/libraries/controllers/src/controllers/Pose.cpp
@@ -53,7 +53,7 @@ namespace controller {
             vec3FromScriptValue(translation, pose.translation);
             quatFromScriptValue(rotation, pose.rotation);
             vec3FromScriptValue(velocity, pose.velocity);
-            quatFromScriptValue(angularVelocity, pose.angularVelocity);
+            vec3FromScriptValue(angularVelocity, pose.angularVelocity);
             pose.valid = true;
         } else {
             pose.valid = false;