History

Fix advanced movement being disabled

Ryan Huffman committed 10 years ago

Commit a5e3fa41 parent b8399261 file · +6 −2Browse files

Showing the changes to scripts/system/controllers/toggleAdvancedMovementForHandControllers.js (1 of 1 file). Show all

Unified · Split

scripts/system/controllers/toggleAdvancedMovementForHandControllers.js+6−2
@@ -55,7 +55,9 @@ function registerBasicMapping() { · 54 unmodified lines
55 mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random();55 mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random();
56 basicMapping = Controller.newMapping(mappingName);56 basicMapping = Controller.newMapping(mappingName);
57 basicMapping.from(Controller.Standard.LY).to(function(value) {57 basicMapping.from(Controller.Standard.LY).to(function(value) {
58 return;58 if (isDisabled) {
59 return;
60 }
59 var stick = Controller.getValue(Controller.Standard.LS);61 var stick = Controller.getValue(Controller.Standard.LS);
60 if (value === 1 && Controller.Hardware.OculusTouch !== undefined) {62 if (value === 1 && Controller.Hardware.OculusTouch !== undefined) {
61 rotate180();63 rotate180();
@@ -72,7 +74,9 @@ function registerBasicMapping() { · 10 unmodified lines
72 });74 });
73 basicMapping.from(Controller.Standard.LX).to(Controller.Standard.RX);75 basicMapping.from(Controller.Standard.LX).to(Controller.Standard.RX);
74 basicMapping.from(Controller.Standard.RY).to(function(value) {76 basicMapping.from(Controller.Standard.RY).to(function(value) {
75 return;77 if (isDisabled) {
78 return;
79 }
76 var stick = Controller.getValue(Controller.Standard.RS);80 var stick = Controller.getValue(Controller.Standard.RS);
77 if (value === 1 && Controller.Hardware.OculusTouch !== undefined) {81 if (value === 1 && Controller.Hardware.OculusTouch !== undefined) {
78 rotate180();82 rotate180();