From 56d654987c1f0fe91731f5671900e927814f124b Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Tue, 22 Dec 2015 11:48:56 -0800
Subject: [PATCH] changing branches

---
 examples/light_modifier/lightModifier.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/examples/light_modifier/lightModifier.js b/examples/light_modifier/lightModifier.js
index e8a9f39903..48efe89a6e 100644
--- a/examples/light_modifier/lightModifier.js
+++ b/examples/light_modifier/lightModifier.js
@@ -8,7 +8,9 @@
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
+//  
+
+// todo: text labels for property names, panel plane for visibility
 
 //some experimental options
 var ONLY_I_CAN_EDIT = false;
@@ -16,7 +18,7 @@ var SLIDERS_SHOULD_STAY_WITH_AVATAR = false;
 var VERTICAL_SLIDERS = false;
 var SHOW_OVERLAYS = true;
 var SHOW_LIGHT_VOLUME = true;
-var USE_PARENTED_PANEL = false;
+var USE_PARENTED_PANEL = true;
 
 //variables for managing overlays
 var selectionDisplay;
@@ -225,6 +227,9 @@ entitySlider.prototype = {
         };
 
         this.axis = Entities.addEntity(properties);
+    },
+    createLabel:function(){
+        
     },
     createSliderIndicator: function() {
         var extensionVector;
@@ -652,6 +657,12 @@ function handleCleanupMessages(channel, message, sender) {
     }
 }
 
+function updateSliderAxis(){
+    sliders.forEach(function(slider){
+
+    })
+}
+
 function cleanup(fromMessage) {
     var i;
     for (i = 0; i < sliders.length; i++) {