From 109aa89619b10fc108c2980a47933d4596a95631 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 14 Dec 2015 18:42:00 -0800
Subject: [PATCH] end of day

---
 examples/lights/box.js            | 22 +++++++++++-----------
 examples/lights/light_modifier.js |  3 +++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/examples/lights/box.js b/examples/lights/box.js
index 806d6be389..b1f9252073 100644
--- a/examples/lights/box.js
+++ b/examples/lights/box.js
@@ -13,8 +13,9 @@
     Box.prototype = {
         preload: function(entityID) {
             this.entityID = entityID;
-            var userData = Entities.getEntityProperties(this.entityID, "userData");
-            this.userData = JSON.parse(userData);
+            var entityProperties = Entities.getEntityProperties(this.entityID, "userData");
+            var parsedUserData = JSON.parse(entityProperties.userData);
+            var userData = parsedUserData.lightModifierKey;
         },
         startNearGrab: function() {
             this.setInitialProperties();
@@ -26,10 +27,10 @@
             this.initialProperties = Entities.getEntityProperties(this.entityID);
         },
         getClampedPosition: function() {
-
-            dPosition = Vec3.subtract(MyAvatar.position, this.previousPosition);
+            var dPosition;
+           // dPosition = Vec3.subtract(MyAvatar.position, this.previousPosition);
             //convert to localFrame
-            dPosition = Vec3.multiplyQbyV(Quat.inverse(MyAvatar.orientation), dPosition);
+          //  dPosition = Vec3.multiplyQbyV(Quat.inverse(MyAvatar.orientation), dPosition);
 
             return dPosition;
         },
@@ -52,12 +53,12 @@
             }
             if (userData.sliderType === 'exponent') {
                 this.sliderValue = scaleValueBasedOnDistanceFromStart(distance, EXPONENT_MAX);
-            }
+            };
 
-            Entities.editEntity(this.entityID) {
+            Entities.editEntity(this.entityID, {
                 position: currentPosition,
-                rotation: this.getClampedRotation()
-            }
+                // rotation: this.getClampedRotation()
+            });
         },
         releaseGrab: function() {
             Entities.editEntity(this.entityID, {
@@ -84,8 +85,7 @@
                 sliderValue: this.sliderValue
             }
             Messages.sendMessage('Hifi-Slider-Value-Reciever', JSON.stringify(message));
-        };
-
+        }
     };
 
     return new Box();
diff --git a/examples/lights/light_modifier.js b/examples/lights/light_modifier.js
index ac29b65f74..2e11c5e22e 100644
--- a/examples/lights/light_modifier.js
+++ b/examples/lights/light_modifier.js
@@ -115,6 +115,7 @@ entitySlider.prototype = {
         var endOfAxis;
         var properties = {
             type: 'Line',
+            name: 'Hifi-Slider-Axis::'+this.sliderType,
             color: this.color,
             collisionsWillMove: false,
             ignoreForCollisions: true,
@@ -135,6 +136,7 @@ entitySlider.prototype = {
         this.axis = Entities.addEntity(properties);
     },
     createBoxIndicator: function() {
+        print('BOX COLOR IS:::'+JSON.stringify(this.color));
         var position = Vec3.sum(this.basePosition, this.verticalOffset);
 
         //line starts on left and goes to right
@@ -163,6 +165,7 @@ entitySlider.prototype = {
         var endOfAxis = Vec3.sum(position, extension);
         var properties = {
             type: 'Box',
+            name: 'Hifi-Slider::'+this.sliderType,
             dimensions: BOX_DIMENSIONS,
             color: this.color,
             position: endOfAxis,