From bb67ca87e238a4db2b613e15c3de787d93544955 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Wed, 16 Dec 2015 17:52:39 -0800
Subject: [PATCH] lightsabers

---
 examples/flowArts/flowArtsHutSpawner.js       |  2 ++
 .../raveStick/raveStickEntityScript.js        | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/examples/flowArts/flowArtsHutSpawner.js b/examples/flowArts/flowArtsHutSpawner.js
index aa87ddbd10..b9d89859df 100644
--- a/examples/flowArts/flowArtsHutSpawner.js
+++ b/examples/flowArts/flowArtsHutSpawner.js
@@ -23,6 +23,7 @@ basePosition.y = MyAvatar.position.y + 1;
 // RAVE ITEMS
 var lightBall = new LightBall(basePosition);
 var raveStick = new RaveStick(Vec3.sum(basePosition, {x: 1, y: 0.5, z: 1}));
+var raveStick2 = new RaveStick(Vec3.sum(basePosition, {x: 2, y: 0.5, z: 1}));
 
 
 var modelURL = "file:///C:/Users/Eric/Desktop/RaveRoom.fbx?v1" + Math.random();
@@ -73,6 +74,7 @@ function cleanup() {
     Entities.deleteEntity(floor);
     lightBall.cleanup();
     raveStick.cleanup();
+    raveStick2.cleanup();
 }
 
 Script.scriptEnding.connect(cleanup);
\ No newline at end of file
diff --git a/examples/flowArts/raveStick/raveStickEntityScript.js b/examples/flowArts/raveStick/raveStickEntityScript.js
index 67571e49fa..0372fd388f 100644
--- a/examples/flowArts/raveStick/raveStickEntityScript.js
+++ b/examples/flowArts/raveStick/raveStickEntityScript.js
@@ -15,6 +15,15 @@
     // this is the "constructor" for the entity as a JS object we don't do much here
     var RaveStick = function() {
         _this = this;
+        this.colorPalette = [{
+            red: 0,
+            green: 200,
+            blue: 40
+        }, {
+            red: 200,
+            green: 10,
+            blue: 40
+        }];
     };
 
     RaveStick.prototype = {
@@ -39,6 +48,7 @@
 
         unload: function() {
             Entities.deleteEntity(this.beam);
+            // Entities.deleteEntity(this.beamTrail);
         },
 
         createBeam: function() {
@@ -50,27 +60,20 @@
             var position = Vec3.sum(props.position, Vec3.multiply(Quat.getFront(props.rotation), 0.1));
             position.z += 0.1;
             position.x += -0.035;
+            var color =  this.colorPalette[randInt(0, this.colorPalette.length)];
             var props = {
                 type: "ParticleEffect",
                 position: position,
                 parentID: this.entityID,
                 isEmitting: true,
                 "name": "ParticlesTest Emitter",
-                "colorStart": {
-                    red: 0,
-                    green: 200,
-                    blue: 40
-                },
+                "colorStart": color,
                 color: {
                     red: 200,
                     green: 200,
                     blue: 255
                 },
-                "colorFinish": {
-                    red: 25,
-                    green: 200,
-                    blue: 5
-                },
+                "colorFinish": color,
                 "maxParticles": 100000,
                 "lifespan": 2,
                 "emitRate": 1000,
@@ -108,6 +111,9 @@
             }
             this.beam = Entities.addEntity(props);
 
+            // props.emitterShouldTrail = true;
+            // this.beamTrail = Entities.addEntity(props);
+
         }
     };
     // entity scripts always need to return a newly constructed object of our type