Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 14:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

allow farGrab module to run when stylus is visible

Browse source
This commit is contained in:
druiz17 2017-10-04 13:44:36 -07:00 committed by Seth Alves
parent d6f31369ee
commit 9de1ca4e1a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/system/controllers/controllerModules/tabletStylusInput.js
View file

@ -248,17 +248,20 @@ Script.include("/~/system/libraries/controllers.js");
} }
}; };
this.nearGrabWantsToRun = function(controllerData) { this.otherModuleNeedsToRun = function(controllerData) {
var moduleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay"; var grabOverlayModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay";
var module = getEnabledModuleByName(moduleName); var grabOverlayModule = getEnabledModuleByName(grabOverlayModuleName);
var ready = module ? module.isReady(controllerData) : makeRunningValues(false, [], []); var grabOverlayModuleReady = grabOverlayModule ? grabOverlayModule.isReady(controllerData) : makeRunningValues(false, [], []);
return ready.active; 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;
}; };
this.processStylus = function(controllerData) { this.processStylus = function(controllerData) {
this.updateStylusTip(); this.updateStylusTip();
if (!this.stylusTip.valid || this.overlayLaserActive(controllerData) || this.nearGrabWantsToRun(controllerData)) { if (!this.stylusTip.valid || this.overlayLaserActive(controllerData) || this.otherModuleNeedsToRun(controllerData)) {
this.pointFinger(false); this.pointFinger(false);
this.hideStylus(); this.hideStylus();
return false; return false;