From b90af1a1ce636f6dc66d098011b8a8ac508643ab Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 28 Oct 2015 13:21:45 -0700
Subject: [PATCH] Fixing typo and review comments

---
 examples/controllers/handPosesDebug.js        | 143 +++++++-----------
 .../src/controllers/StateController.h         |   1 +
 2 files changed, 54 insertions(+), 90 deletions(-)

diff --git a/examples/controllers/handPosesDebug.js b/examples/controllers/handPosesDebug.js
index 3eabee8f53..e770abd957 100644
--- a/examples/controllers/handPosesDebug.js
+++ b/examples/controllers/handPosesDebug.js
@@ -11,17 +11,17 @@
 
 
 function makeSphere(color) {
-	var SPHERE_SIZE = 0.05;
-	var sphere = Overlays.addOverlay("sphere", {
-	    position: { x: 0, y: 0, z: 0 },
-	    size: SPHERE_SIZE,
-	    color: color,
-	    alpha: 1.0,
-	    solid: true,
-	    visible: true,
-	});
+    var SPHERE_SIZE = 0.05;
+    var sphere = Overlays.addOverlay("sphere", {
+        position: { x: 0, y: 0, z: 0 },
+        size: SPHERE_SIZE,
+        color: color,
+        alpha: 1.0,
+        solid: true,
+        visible: true,
+    });
 
-	return sphere;
+    return sphere;
 }
 
 
@@ -34,104 +34,67 @@ var COLORS = [ { red: 255, green: 0, blue: 0 }, { red: 0, green: 0, blue: 255 }
 
 
 function index(handNum, indexNum) {
-	return handNum * NUM_HANDS + indexNum;
+    return handNum * NUM_HANDS + indexNum;
 }
 
 var app = {};
 
 
 function setup() {
-	app.spheres = new Array();
+    app.spheres = new Array();
 
-	for (var h = 0; h < NUM_HANDS; h++) {
-		for (var s = 0; s < NUM_SPHERES_PER_HAND; s++) {
-			var i = index(h, s);
-			app.spheres[i] = makeSphere(COLORS[h]);
-			print("Added Sphere num " + i + " = " + JSON.stringify(app.spheres[i]));
-		}
-	}
+    for (var h = 0; h < NUM_HANDS; h++) {
+        for (var s = 0; s < NUM_SPHERES_PER_HAND; s++) {
+            var i = index(h, s);
+            app.spheres[i] = makeSphere(COLORS[h]);
+            print("Added Sphere num " + i + " = " + JSON.stringify(app.spheres[i]));
+        }
+    }
 }
 
 function updateHand(handNum, deltaTime) {
-	var pose;
-	var handName = "right";
-	if (handNum == LEFT_HAND) {
-		pose = MyAvatar.getLeftHandPose();
-		handName = "left";
-	} else {
-		pose = MyAvatar.getRightHandPose();
-		handName = "right";
-	}
+    var pose;
+    var handName = "right";
+    if (handNum == LEFT_HAND) {
+        pose = MyAvatar.getLeftHandPose();
+        handName = "left";
+    } else {
+        pose = MyAvatar.getRightHandPose();
+        handName = "right";
+    }
 
-	if (pose.valid) {
-		//print(handName + " hand moving" +  JSON.stringify(pose));
-		Overlays.editOverlay(app.spheres[index(handNum, 0)], {
-	        position: pose.translation,
-	        visible: true,
-	    });
-	   	var vpos = Vec3.sum(Vec3.multiply(10 * deltaTime, pose.velocity), pose.translation);
-	    Overlays.editOverlay(app.spheres[index(handNum, 1)], {
-	        position: vpos,
-	        visible: true,
-	    });
-	} else {
-		Overlays.editOverlay(app.spheres[index(handNum, 0)], {
-	        visible: false
-	    });
+    if (pose.valid) {
+        //print(handName + " hand moving" +  JSON.stringify(pose));
+        Overlays.editOverlay(app.spheres[index(handNum, 0)], {
+            position: pose.translation,
+            visible: true,
+        });
+        var vpos = Vec3.sum(Vec3.multiply(10 * deltaTime, pose.velocity), pose.translation);
+        Overlays.editOverlay(app.spheres[index(handNum, 1)], {
+            position: vpos,
+            visible: true,
+        });
+    } else {
+        Overlays.editOverlay(app.spheres[index(handNum, 0)], {
+            visible: false
+        });
 
-	    Overlays.editOverlay(app.spheres[index(handNum, 1)], {
-	        visible: false
-	    });
-	}
-}
-
-function updateHydra(handNum, deltaTime) {
-	var pose;
-	var handName = "right";
-	if (handNum == LEFT_HAND) {
-		pose = Controller.getPoseValue(Controller.Hardware.Hydra.LeftHand);
-		handName = "left";
-	} else {
-		pose = Controller.getPoseValue(Controller.Hardware.Hydra.RightHand);
-		handName = "right";
-	}
-
-	if (pose.valid) {
-		//print(handName + " hand moving" +  JSON.stringify(pose));
-		var wpos = Vec3.sum(MyAvatar.getPosition(), pose.translation);
-	    
-		Overlays.editOverlay(app.spheres[index(handNum, 0)], {
-	        position: pose.translation,
-	        visible: true,
-	    });
-	   	/*var vpos = Vec3.sum(Vec3.multiply(10 * deltaTime, pose.velocity), pose.translation);
-	    Overlays.editOverlay(app.spheres[index(handNum, 1)], {
-	        position: vpos,
-	        visible: true,
-	    });*/
-	} else {
-		Overlays.editOverlay(app.spheres[index(handNum, 0)], {
-	        visible: false
-	    });
-
-	    Overlays.editOverlay(app.spheres[index(handNum, 1)], {
-	        visible: false
-	    });
-	}
+        Overlays.editOverlay(app.spheres[index(handNum, 1)], {
+            visible: false
+        });
+    }
 }
 
 function update(deltaTime) {
-	//updateHand(LEFT_HAND, deltaTime);
-	//updateHand(RIGHT_HAND, deltaTime);
-	updateHydra(LEFT_HAND, deltaTime);
-	updateHydra(RIGHT_HAND, deltaTime);
+    updateHand(LEFT_HAND, deltaTime);
+    updateHand(RIGHT_HAND, deltaTime);
 }
 
 function scriptEnding() {
-	print("Removing spheres = " + JSON.stringify(app.spheres));
-	for (var i = 0; i < app.spheres.length; i++) {
-		Overlays.deleteOverlay(app.spheres[i]);
-	}
+    print("Removing spheres = " + JSON.stringify(app.spheres));
+    for (var i = 0; i < app.spheres.length; i++) {
+        Overlays.deleteOverlay(app.spheres[i]);
+    }
 }
 
 setup();
diff --git a/libraries/controllers/src/controllers/StateController.h b/libraries/controllers/src/controllers/StateController.h
index 963f884d98..fad3b0abba 100644
--- a/libraries/controllers/src/controllers/StateController.h
+++ b/libraries/controllers/src/controllers/StateController.h
@@ -40,6 +40,7 @@ public:
 
     void addInputVariant(QString name, ReadLambda& lambda);
 
+protected:
     QVector<NamedReadLambda> _namedReadLambdas;
 };