Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all
Unified · Split
| @@ -7,7 +7,7 @@ · 6 unmodified lines | |||
| 7 | 7 | ||
| 8 | /* global Script, MyAvatar, Controller, Uuid, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule, | 8 | /* global Script, MyAvatar, Controller, Uuid, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule, |
| 9 | makeRunningValues, Vec3, makeDispatcherModuleParameters, Overlays, HMD, Settings, getEnabledModuleByName, Pointers, | 9 | makeRunningValues, Vec3, makeDispatcherModuleParameters, Overlays, HMD, Settings, getEnabledModuleByName, Pointers, |
| 10 | Picks, PickType | 10 | Picks, PickType, Keyboard |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | Script.include("/~/system/libraries/controllerDispatcherUtils.js"); | 13 | Script.include("/~/system/libraries/controllerDispatcherUtils.js"); |
| @@ -64,8 +64,8 @@ Script.include("/~/system/libraries/controllers.js"); · 50 unmodified lines | |||
| 64 | var nearTabletHighlightModuleName = | 64 | var nearTabletHighlightModuleName = |
| 65 | this.hand === RIGHT_HAND ? "RightNearTabletHighlight" : "LeftNearTabletHighlight"; | 65 | this.hand === RIGHT_HAND ? "RightNearTabletHighlight" : "LeftNearTabletHighlight"; |
| 66 | var nearTabletHighlightModule = getEnabledModuleByName(nearTabletHighlightModuleName); | 66 | var nearTabletHighlightModule = getEnabledModuleByName(nearTabletHighlightModuleName); |
| 67 | var nearTabletHighlightModuleReady = nearTabletHighlightModule | 67 | var nearTabletHighlightModuleReady = nearTabletHighlightModule ? |
| 68 | ? nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []); | 68 | nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []); |
| 69 | return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active | 69 | return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active |
| 70 | /* || nearTabletHighlightModuleReady.active */ ; | 70 | /* || nearTabletHighlightModuleReady.active */ ; |
| 71 | }; | 71 | }; |
| @@ -129,7 +129,7 @@ Script.include("/~/system/libraries/controllers.js"); · 57 unmodified lines | |||
| 129 | } | 129 | } |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | const WEB_DISPLAY_STYLUS_DISTANCE = (Keyboard.raised && Keyboard.preferMalletsOverLasers) ? 0.2 : 0.5; | 132 | var WEB_DISPLAY_STYLUS_DISTANCE = (Keyboard.raised && Keyboard.preferMalletsOverLasers) ? 0.2 : 0.5; |
| 133 | var nearStylusTarget = isNearStylusTarget(stylusTargets, WEB_DISPLAY_STYLUS_DISTANCE * sensorScaleFactor); | 133 | var nearStylusTarget = isNearStylusTarget(stylusTargets, WEB_DISPLAY_STYLUS_DISTANCE * sensorScaleFactor); |
| 134 | 134 | ||
| 135 | if (nearStylusTarget.length !== 0) { | 135 | if (nearStylusTarget.length !== 0) { |