From 876d8ab6b25a427ae16acbe459ea3e4f01b05348 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Mon, 21 Dec 2015 13:59:00 -0800
Subject: [PATCH] far grabbing arc balls

---
 examples/flowArts/arcBall/arcBall.js             | 12 ++++++------
 examples/flowArts/arcBall/arcBallEntityScript.js | 16 ++++++----------
 .../lightSaber/lightSaberEntityScript.js         |  1 -
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/examples/flowArts/arcBall/arcBall.js b/examples/flowArts/arcBall/arcBall.js
index e67dffddff..5a6b1b47f3 100644
--- a/examples/flowArts/arcBall/arcBall.js
+++ b/examples/flowArts/arcBall/arcBall.js
@@ -15,7 +15,7 @@
 Script.include("../../libraries/utils.js");
 
 
-var scriptURL = Script.resolvePath("arcBallEntityScript.js");
+var scriptURL = Script.resolvePath("arcBallEntityScript.js?v1" + Math.random());
 ArcBall = function(spawnPosition) {
 
     var colorPalette = [{
@@ -50,11 +50,11 @@ ArcBall = function(spawnPosition) {
         userData: JSON.stringify({
             grabbableKey: {
                 spatialKey: {
-                    relativePosition: {
-                        x: 0,
-                        y: 0.0,
-                        z: -0.5
-                    },
+                    // relativePosition: {
+                    //     x: 0,
+                    //     y: -0.5,
+                    //     z: 0.0
+                    // },
                 },
                 // invertSolidWhileHeld: true
             }
diff --git a/examples/flowArts/arcBall/arcBallEntityScript.js b/examples/flowArts/arcBall/arcBallEntityScript.js
index 1952209c95..102ceca40c 100644
--- a/examples/flowArts/arcBall/arcBallEntityScript.js
+++ b/examples/flowArts/arcBall/arcBallEntityScript.js
@@ -27,12 +27,11 @@
 
     ArcBall.prototype = {
         isGrabbed: false,
-        startDistanceGrab: function() {
+        startDistantGrab: function() {
             this.searchForNearbyArcBalls();
-
         },
 
-        startFarGrab: function() {
+        startNearGrab: function() {
             this.searchForNearbyArcBalls();
         },
 
@@ -58,7 +57,6 @@
             var emitOrientation = Quat.rotationBetween(Vec3.UNIT_Z, sourceToTargetVec);
             emitOrientation = Quat.multiply(Quat.inverse(rotation), emitOrientation);
 
-
             var color = this.colorPalette[randInt(0, this.colorPalette.length)];
             var props = {
                 type: "ParticleEffect",
@@ -75,10 +73,10 @@
                 },
                 colorFinish: color,
                 maxParticles: 100000,
-                lifespan: 2,
+                lifespan: 1,
                 emitRate: 1000,
                 emitOrientation: emitOrientation,
-                emitSpeed: .1,
+                emitSpeed: 1,
                 speedSpread: 0.02,
                 emitDimensions: {
                     x: .01,
@@ -105,7 +103,7 @@
                 alpha: 0.5,
                 alphaSpread: .1,
                 alphaStart: 0.5,
-                alphaFinish: 0.0,
+                alphaFinish: 0.5,
                 textures: "https://s3.amazonaws.com/hifi-public/eric/textures/particleSprites/beamParticle.png",
                 emitterShouldTrail: true
             }
@@ -117,12 +115,10 @@
                 return;
             }
             var startPosition = Entities.getEntityProperties(this.entityID, "position").position;
-
             var targetPosition = Entities.getEntityProperties(this.target, "position").position;
             var rotation = Entities.getEntityProperties(this.entityID, "rotation").rotation;
             var sourceToTargetVec = Vec3.subtract(targetPosition, startPosition);
             var emitOrientation = Quat.rotationBetween(Vec3.UNIT_Z, sourceToTargetVec);
-            // emitOrientation = Quat.multiply(emitOrientation,Quat.inverse(rotation));
             Entities.editEntity(this.particleArc, {
                 emitOrientation: emitOrientation
             });
@@ -132,7 +128,7 @@
             this.updateBeam();
         },
 
-        continueDistanceGrab: function() {
+        continueDistantGrab: function() {
             this.updateBeam();
         },
 
diff --git a/examples/flowArts/lightSaber/lightSaberEntityScript.js b/examples/flowArts/lightSaber/lightSaberEntityScript.js
index cbbcd8a0bf..fd55916cc6 100644
--- a/examples/flowArts/lightSaber/lightSaberEntityScript.js
+++ b/examples/flowArts/lightSaber/lightSaberEntityScript.js
@@ -54,7 +54,6 @@
 
         createBeam: function() {
 
-
             this.props = Entities.getEntityProperties(this.entityID, ["position", "rotation"]);
             var forwardVec = Quat.getFront(Quat.multiply(this.props.rotation, Quat.fromPitchYawRollDegrees(-90, 0, 0)));
             // forwardVec = Vec3.normalize(forwardVec);