Showing the changes to scripts/system/controllers/controllerScripts.js (1 of 64 files). Show all
Unified · Split
| @@ -9,6 +9,8 @@ · 8 unmodified lines | |||
| 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | // | 10 | // |
| 11 | 11 | ||
| 12 | /* global Script, Menu */ | ||
| 13 | |||
| 12 | var CONTOLLER_SCRIPTS = [ | 14 | var CONTOLLER_SCRIPTS = [ |
| 13 | "squeezeHands.js", | 15 | "squeezeHands.js", |
| 14 | "controllerDisplayManager.js", | 16 | "controllerDisplayManager.js", |
| @@ -19,8 +21,8 @@ var CONTOLLER_SCRIPTS = [ · 4 unmodified lines | |||
| 19 | "controllerModules/nearParentGrabEntity.js", | 21 | "controllerModules/nearParentGrabEntity.js", |
| 20 | "controllerModules/nearParentGrabOverlay.js", | 22 | "controllerModules/nearParentGrabOverlay.js", |
| 21 | "controllerModules/nearActionGrabEntity.js", | 23 | "controllerModules/nearActionGrabEntity.js", |
| 22 | // "controllerModules/farActionGrabEntity.js", | 24 | "controllerModules/farActionGrabEntityDynOnly.js", |
| 23 | // "controllerModules/farParentGrabEntity.js", | 25 | "controllerModules/farParentGrabEntity.js", |
| 24 | "controllerModules/stylusInput.js", | 26 | "controllerModules/stylusInput.js", |
| 25 | "controllerModules/equipEntity.js", | 27 | "controllerModules/equipEntity.js", |
| 26 | "controllerModules/nearTrigger.js", | 28 | "controllerModules/nearTrigger.js", |
| @@ -38,25 +40,22 @@ var CONTOLLER_SCRIPTS = [ · 11 unmodified lines | |||
| 38 | "controllerModules/mouseHighlightEntities.js" | 40 | "controllerModules/mouseHighlightEntities.js" |
| 39 | ]; | 41 | ]; |
| 40 | 42 | ||
| 41 | if (Settings.getValue("useFarGrabJoints", false)) { | ||
| 42 | CONTOLLER_SCRIPTS.push("controllerModules/farActionGrabEntityDynOnly.js"); | ||
| 43 | CONTOLLER_SCRIPTS.push("controllerModules/farParentGrabEntity.js"); | ||
| 44 | } else { | ||
| 45 | CONTOLLER_SCRIPTS.push("controllerModules/farActionGrabEntity.js"); | ||
| 46 | } | ||
| 47 | |||
| 48 | var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; | 43 | var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; |
| 49 | 44 | ||
| 50 | 45 | ||
| 51 | function runDefaultsTogether() { | 46 | function runDefaultsTogether() { |
| 52 | for (var j in CONTOLLER_SCRIPTS) { | 47 | for (var j in CONTOLLER_SCRIPTS) { |
| 53 | Script.include(CONTOLLER_SCRIPTS[j]); | 48 | if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) { |
| 49 | Script.include(CONTOLLER_SCRIPTS[j]); | ||
| 50 | } | ||
| 54 | } | 51 | } |
| 55 | } | 52 | } |
| 56 | 53 | ||
| 57 | function runDefaultsSeparately() { | 54 | function runDefaultsSeparately() { |
| 58 | for (var i in CONTOLLER_SCRIPTS) { | 55 | for (var i in CONTOLLER_SCRIPTS) { |
| 59 | Script.load(CONTOLLER_SCRIPTS[i]); | 56 | if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) { |
| 57 | Script.load(CONTOLLER_SCRIPTS[i]); | ||
| 58 | } | ||
| 60 | } | 59 | } |
| 61 | } | 60 | } |
| 62 | 61 | ||