Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Load controller scripts in their own script engine

Browse source
This commit is contained in:
David Rowe 2017-03-15 14:31:13 +13:00
parent 08ee2fd43f
commit cb4bd58381
2 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
scripts/defaultScripts.js
View file

@ -11,7 +11,7 @@
// 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
// //
var DEFAULT_SCRIPTS = [ var DEFAULT_SCRIPTS_COMBINED = [
"system/progress.js", "system/progress.js",
"system/away.js", "system/away.js",
"system/audio.js", "system/audio.js",
@ -27,17 +27,13 @@ var DEFAULT_SCRIPTS = [
"system/tablet-users.js", "system/tablet-users.js",
"system/selectAudioDevice.js", "system/selectAudioDevice.js",
"system/notifications.js", "system/notifications.js",
"system/controllers/squeezeHands.js",
"system/controllers/controllerDisplayManager.js",
"system/controllers/handControllerGrab.js",
"system/controllers/handControllerPointer.js",
"system/controllers/grab.js",
"system/controllers/teleport.js",
"system/controllers/toggleAdvancedMovementForHandControllers.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",
"system/tablet-ui/tabletUI.js" "system/tablet-ui/tabletUI.js"
]; ];
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js"
];
// add a menu item for debugging // add a menu item for debugging
var MENU_CATEGORY = "Developer"; var MENU_CATEGORY = "Developer";
@ -64,16 +60,24 @@ if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_I
}); });
} }
function runDefaultsTogether() { function loadSeparateDefaults() {
for (var j in DEFAULT_SCRIPTS) { for (var i in DEFAULT_SCRIPTS_SEPARATE) {
Script.include(DEFAULT_SCRIPTS[j]); Script.load(DEFAULT_SCRIPTS_SEPARATE[i]);
} }
} }
function runDefaultsSeparately() { function runDefaultsTogether() {
for (var i in DEFAULT_SCRIPTS) { for (var i in DEFAULT_SCRIPTS_COMBINED) {
Script.load(DEFAULT_SCRIPTS[i]); Script.include(DEFAULT_SCRIPTS_COMBINED[i]);
} }
loadSeparateDefaults();
}
function runDefaultsSeparately() {
for (var i in DEFAULT_SCRIPTS_COMBINED) {
Script.load(DEFAULT_SCRIPTS_COMBINED[i]);
}
loadSeparateDefaults();
} }
// start all scripts // start all scripts

41
scripts/system/controllers/controllerScripts.js Normal file
View file

@ -0,0 +1,41 @@
"use strict";
// controllerScripts.js
//
// Created by David Rowe on 15 Mar 2017.
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var CONTOLLER_SCRIPTS = [
"squeezeHands.js",
"controllerDisplayManager.js",
"handControllerGrab.js",
"handControllerPointer.js",
"grab.js",
"teleport.js",
"toggleAdvancedMovementForHandControllers.js",
];
var DEBUG_MENU_ITEM = "Debug defaultScripts.js";
function runDefaultsTogether() {
for (var j in CONTOLLER_SCRIPTS) {
Script.include(CONTOLLER_SCRIPTS[j]);
}
}
function runDefaultsSeparately() {
for (var i in CONTOLLER_SCRIPTS) {
Script.load(CONTOLLER_SCRIPTS[i]);
}
}
if (Menu.isOptionChecked(DEBUG_MENU_ITEM)) {
runDefaultsSeparately();
} else {
runDefaultsTogether();
}