From 4bbf2ff482d7255e4dddb8675762845eec77b261 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 17 Nov 2017 11:32:02 -0800 Subject: [PATCH] near grab entity while stylus is showing --- .../controllers/controllerModules/tabletStylusInput.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/system/controllers/controllerModules/tabletStylusInput.js b/scripts/system/controllers/controllerModules/tabletStylusInput.js index 46b630d023..ca2dbe5ccf 100644 --- a/scripts/system/controllers/controllerModules/tabletStylusInput.js +++ b/scripts/system/controllers/controllerModules/tabletStylusInput.js @@ -270,11 +270,14 @@ Script.include("/~/system/libraries/controllers.js"); this.otherModuleNeedsToRun = function(controllerData) { var grabOverlayModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay"; var grabOverlayModule = getEnabledModuleByName(grabOverlayModuleName); + var grabEntityModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabEntity" : "LeftNearParentingGrabEntity"; + var grabEntityModule = getEnabledModuleByName(grabEntityModuleName); var grabOverlayModuleReady = grabOverlayModule ? grabOverlayModule.isReady(controllerData) : makeRunningValues(false, [], []); + var grabEntityModuleReady = grabEntityModule ? grabEntityModule.isReady(controllerData) : makeRunningValues(false, [], []); var farGrabModuleName = this.hand === RIGHT_HAND ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity"; var farGrabModule = getEnabledModuleByName(farGrabModuleName); var farGrabModuleReady = farGrabModule ? farGrabModule.isReady(controllerData) : makeRunningValues(false, [], []); - return grabOverlayModuleReady.active || farGrabModuleReady.active; + return grabOverlayModuleReady.active || farGrabModuleReady.active || grabEntityModuleReady.active; }; this.processStylus = function(controllerData) {