From cb4bd5838192c75a41081d40eec92f0ded824d73 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 15 Mar 2017 14:31:13 +1300
Subject: [PATCH] Load controller scripts in their own script engine

---
 scripts/defaultScripts.js                     | 32 ++++++++-------
 .../system/controllers/controllerScripts.js   | 41 +++++++++++++++++++
 2 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 scripts/system/controllers/controllerScripts.js

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 27efab134a..aba2f35e6b 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -11,7 +11,7 @@
 //  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/away.js",
     "system/audio.js",
@@ -27,17 +27,13 @@ var DEFAULT_SCRIPTS = [
     "system/tablet-users.js",
     "system/selectAudioDevice.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/firstPersonHMD.js",
     "system/tablet-ui/tabletUI.js"
 ];
+var DEFAULT_SCRIPTS_SEPARATE = [
+    "system/controllers/controllerScripts.js"
+];
 
 // add a menu item for debugging
 var MENU_CATEGORY = "Developer";
@@ -64,16 +60,24 @@ if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_I
     });
 }
 
-function runDefaultsTogether() {
-    for (var j in DEFAULT_SCRIPTS) {
-        Script.include(DEFAULT_SCRIPTS[j]);
+function loadSeparateDefaults() {
+    for (var i in DEFAULT_SCRIPTS_SEPARATE) {
+        Script.load(DEFAULT_SCRIPTS_SEPARATE[i]);
     }
 }
 
-function runDefaultsSeparately() {
-    for (var i in DEFAULT_SCRIPTS) {
-        Script.load(DEFAULT_SCRIPTS[i]);
+function runDefaultsTogether() {
+    for (var i in DEFAULT_SCRIPTS_COMBINED) {
+        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
diff --git a/scripts/system/controllers/controllerScripts.js b/scripts/system/controllers/controllerScripts.js
new file mode 100644
index 0000000000..df11a1e5be
--- /dev/null
+++ b/scripts/system/controllers/controllerScripts.js
@@ -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();
+}