From 7f3f202567b4ca36037673779c6db9bd3de8647e Mon Sep 17 00:00:00 2001
From: AlessandroSigna <alesigna92@gmail.com>
Date: Fri, 23 Oct 2015 18:23:15 -0700
Subject: [PATCH] fix stick.js

---
 examples/stick.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/examples/stick.js b/examples/stick.js
index f581591957..6683d8dcb6 100644
--- a/examples/stick.js
+++ b/examples/stick.js
@@ -10,7 +10,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var hand = "left";
+var hand = "right";
 var nullActionID = "00000000-0000-0000-0000-000000000000";
 var controllerID;
 var controllerActive;
@@ -32,7 +32,7 @@ function makeNewStick() {
             modelURL: "https://hifi-public.s3.amazonaws.com/eric/models/stick.fbx",
             compoundShapeURL: "https://hifi-public.s3.amazonaws.com/eric/models/stick.obj",
             dimensions: {x: .11, y: .11, z: 1.0},
-            position: MyAvatar.getRightPalmPosition(), // initial position doesn't matter, as long as it's close
+            position: MyAvatar.rightHandPosition, // initial position doesn't matter, as long as it's close
             rotation: MyAvatar.orientation,
             damping: .1,
             collisionSoundURL: "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/67LCollision07.wav",
@@ -84,23 +84,15 @@ function mouseMoveEvent(event) {
 }
 
 
-function initControls(){
-    if (hand == "right") {
-        controllerID = 3; // right handed
-    } else {
-        controllerID = 4; // left handed
-    }
-}
-
-
 function update(deltaTime){
-    var palmPosition = Controller.getSpatialControlPosition(controllerID);
+    var handPose = (hand == "right") ? MyAvatar.rightHandPose : MyAvatar.leftHandPose;
+    var palmPosition = handPose.translation;
     controllerActive = (Vec3.length(palmPosition) > 0);
     if(!controllerActive){
         return;
     }
 
-    stickOrientation = Controller.getSpatialControlRawRotation(controllerID);
+    stickOrientation = handPose.rotation;
     var adjustment = Quat.fromPitchYawRollDegrees(180, 0, 0);
     stickOrientation = Quat.multiply(stickOrientation, adjustment);