Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all
Unified · Split
| @@ -270,11 +270,14 @@ Script.include("/~/system/libraries/controllers.js"); · 269 unmodified lines | ||
| 270 | 270 | this.otherModuleNeedsToRun = function(controllerData) { |
| 271 | 271 | var grabOverlayModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay"; |
| 272 | 272 | var grabOverlayModule = getEnabledModuleByName(grabOverlayModuleName); |
| 273 | + var grabEntityModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabEntity" : "LeftNearParentingGrabEntity"; | |
| 274 | + var grabEntityModule = getEnabledModuleByName(grabEntityModuleName); | |
| 273 | 275 | var grabOverlayModuleReady = grabOverlayModule ? grabOverlayModule.isReady(controllerData) : makeRunningValues(false, [], []); |
| 276 | + var grabEntityModuleReady = grabEntityModule ? grabEntityModule.isReady(controllerData) : makeRunningValues(false, [], []); | |
| 274 | 277 | var farGrabModuleName = this.hand === RIGHT_HAND ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity"; |
| 275 | 278 | var farGrabModule = getEnabledModuleByName(farGrabModuleName); |
| 276 | 279 | var farGrabModuleReady = farGrabModule ? farGrabModule.isReady(controllerData) : makeRunningValues(false, [], []); |
| 277 | − return grabOverlayModuleReady.active || farGrabModuleReady.active; | |
| 280 | + return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active; | |
| 278 | 281 | }; |
| 279 | 282 | |
| 280 | 283 | this.processStylus = function(controllerData) { |