From 7fb6b7e27283d1a51e66936f92cc43a34525949b Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 14 Oct 2015 11:31:09 -0700 Subject: [PATCH] Reverted hand controller --- examples/controllers/handControllerGrab.js | 2 +- examples/painting/whiteboard/whiteboardEntityScript.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js index 0f59e80948..0b761c6559 100644 --- a/examples/controllers/handControllerGrab.js +++ b/examples/controllers/handControllerGrab.js @@ -67,7 +67,7 @@ var MSEC_PER_SEC = 1000.0; var startTime = Date.now(); var LIFETIME = 10; var ACTION_LIFETIME = 10; // seconds -var PICKS_PER_SECOND_PER_HAND = 60; +var PICKS_PER_SECOND_PER_HAND = 5; var MSECS_PER_SEC = 1000.0; // states for the state machine diff --git a/examples/painting/whiteboard/whiteboardEntityScript.js b/examples/painting/whiteboard/whiteboardEntityScript.js index 122e1b2e38..0cfa12746a 100644 --- a/examples/painting/whiteboard/whiteboardEntityScript.js +++ b/examples/painting/whiteboard/whiteboardEntityScript.js @@ -70,6 +70,7 @@ this.intersection = Entities.findRayIntersection(pickRay, true, this.whitelist); //Comment out above line and uncomment below line to see difference in performance between using a whitelist, and not using one + // this.intersection = Entities.findRayIntersection(pickRay, true); if (this.intersection.intersects) { var distance = Vec3.distance(handPosition, this.intersection.intersection);