changing branches

This commit is contained in:
James B. Pollack 2015-12-22 11:48:56 -08:00
parent b59b8db5c9
commit 56d654987c

View file

@ -8,7 +8,9 @@
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 //some experimental options
var ONLY_I_CAN_EDIT = false; var ONLY_I_CAN_EDIT = false;
@ -16,7 +18,7 @@ var SLIDERS_SHOULD_STAY_WITH_AVATAR = false;
var VERTICAL_SLIDERS = false; var VERTICAL_SLIDERS = false;
var SHOW_OVERLAYS = true; var SHOW_OVERLAYS = true;
var SHOW_LIGHT_VOLUME = true; var SHOW_LIGHT_VOLUME = true;
var USE_PARENTED_PANEL = false; var USE_PARENTED_PANEL = true;
//variables for managing overlays //variables for managing overlays
var selectionDisplay; var selectionDisplay;
@ -225,6 +227,9 @@ entitySlider.prototype = {
}; };
this.axis = Entities.addEntity(properties); this.axis = Entities.addEntity(properties);
},
createLabel:function(){
}, },
createSliderIndicator: function() { createSliderIndicator: function() {
var extensionVector; var extensionVector;
@ -652,6 +657,12 @@ function handleCleanupMessages(channel, message, sender) {
} }
} }
function updateSliderAxis(){
sliders.forEach(function(slider){
})
}
function cleanup(fromMessage) { function cleanup(fromMessage) {
var i; var i;
for (i = 0; i < sliders.length; i++) { for (i = 0; i < sliders.length; i++) {