run attachedEntitiesManager.js by default, but without a UI

This commit is contained in:
Seth Alves 2016-02-02 16:34:06 -08:00
parent e4ef3ae869
commit 30e97c2a76
2 changed files with 42 additions and 34 deletions

View file

@ -22,9 +22,11 @@ var MINIMUM_DROP_DISTANCE_FROM_JOINT = 0.4;
var ATTACHED_ENTITY_SEARCH_DISTANCE = 10.0; var ATTACHED_ENTITY_SEARCH_DISTANCE = 10.0;
var ATTACHED_ENTITIES_SETTINGS_KEY = "ATTACHED_ENTITIES"; var ATTACHED_ENTITIES_SETTINGS_KEY = "ATTACHED_ENTITIES";
var DRESSING_ROOM_DISTANCE = 2.0; var DRESSING_ROOM_DISTANCE = 2.0;
var SHOW_TOOL_BAR = false;
// tool bar // tool bar
if (SHOW_TOOL_BAR) {
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
var BUTTON_SIZE = 32; var BUTTON_SIZE = 32;
var PADDING = 3; var PADDING = 3;
@ -57,6 +59,7 @@ var loadButton = toolBar.addOverlay("image", {
}, },
alpha: 1 alpha: 1
}); });
}
function mousePressEvent(event) { function mousePressEvent(event) {
@ -73,10 +76,14 @@ function mousePressEvent(event) {
} }
function scriptEnding() { function scriptEnding() {
if (SHOW_TOOL_BAR) {
toolBar.cleanup(); toolBar.cleanup();
} }
}
if (SHOW_TOOL_BAR) {
Controller.mousePressEvent.connect(mousePressEvent); Controller.mousePressEvent.connect(mousePressEvent);
}
Script.scriptEnding.connect(scriptEnding); Script.scriptEnding.connect(scriptEnding);

View file

@ -21,3 +21,4 @@ Script.load("controllers/squeezeHands.js");
Script.load("grab.js"); Script.load("grab.js");
Script.load("directory.js"); Script.load("directory.js");
Script.load("dialTone.js"); Script.load("dialTone.js");
Script.load("attachedEntitiesManager.js");