History

Fixed grabbing in VR

ksuprynowicz committed 3 years ago

Commit 85262df1 parent 6f92cf06 files · +22 −10Browse files

Showing the changes to scripts/system/controllers/controllerScripts.js (1 of 6 files). Show all

Unified · Split

scripts/system/controllers/controllerScripts.js+5−1
@@ -11,13 +11,15 @@ · 10 unmodified lines
11 11
12/* global Script, Menu */12/* global Script, Menu */
13 13
14Script.include("controllerDispatcher.js");
15
14var CONTOLLER_SCRIPTS = [16var CONTOLLER_SCRIPTS = [
15 "squeezeHands.js",17 "squeezeHands.js",
16 "controllerDisplayManager.js",18 "controllerDisplayManager.js",
17 "grab.js",19 "grab.js",
18 //"toggleAdvancedMovementForHandControllers.js",20 //"toggleAdvancedMovementForHandControllers.js",
19 "handTouch.js",21 "handTouch.js",
20 "controllerDispatcher.js",22 //"controllerDispatcher.js",
21 "controllerModules/nearParentGrabOverlay.js",23 "controllerModules/nearParentGrabOverlay.js",
22 "controllerModules/stylusInput.js",24 "controllerModules/stylusInput.js",
23 "controllerModules/equipEntity.js",25 "controllerModules/equipEntity.js",
@@ -44,6 +46,7 @@ var DEBUG_MENU_ITEM = "Debug defaultScripts.js"; · 20 unmodified lines
44function runDefaultsTogether() {46function runDefaultsTogether() {
45 for (var j in CONTOLLER_SCRIPTS) {47 for (var j in CONTOLLER_SCRIPTS) {
46 if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) {48 if (CONTOLLER_SCRIPTS.hasOwnProperty(j)) {
49 print("including " + CONTOLLER_SCRIPTS[j]);
47 Script.include(CONTOLLER_SCRIPTS[j]);50 Script.include(CONTOLLER_SCRIPTS[j]);
48 }51 }
49 }52 }
@@ -52,6 +55,7 @@ function runDefaultsTogether() { · 2 unmodified lines
52function runDefaultsSeparately() {55function runDefaultsSeparately() {
53 for (var i in CONTOLLER_SCRIPTS) {56 for (var i in CONTOLLER_SCRIPTS) {
54 if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) {57 if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) {
58 print("loading " + CONTOLLER_SCRIPTS[j]);
55 Script.load(CONTOLLER_SCRIPTS[i]);59 Script.load(CONTOLLER_SCRIPTS[i]);
56 }60 }
57 }61 }