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

adjust when stylus input is active

Browse source
This commit is contained in:
Seth Alves 2019-11-04 10:18:09 -08:00
parent 4f7252a0d8
commit 07034721c7
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/controllers/controllerModules/stylusInput.js
View file

@ -52,10 +52,6 @@ Script.include("/~/system/libraries/controllers.js");
this.disable = false; this.disable = false;
this.otherModuleNeedsToRun = function(controllerData) { this.otherModuleNeedsToRun = function(controllerData) {
// var grabOverlayModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay";
// var grabOverlayModule = getEnabledModuleByName(grabOverlayModuleName);
// var grabOverlayModuleReady = grabOverlayModule ? grabOverlayModule.isReady(controllerData) : makeRunningValues(false, [], []);
var grabEntityModuleName = this.hand === RIGHT_HAND ? "RightNearGrabEntity" : "LeftNearGrabEntity"; var grabEntityModuleName = this.hand === RIGHT_HAND ? "RightNearGrabEntity" : "LeftNearGrabEntity";
var grabEntityModule = getEnabledModuleByName(grabEntityModuleName); var grabEntityModule = getEnabledModuleByName(grabEntityModuleName);
var grabEntityModuleReady = grabEntityModule ? grabEntityModule.isReady(controllerData) : makeRunningValues(false, [], []); var grabEntityModuleReady = grabEntityModule ? grabEntityModule.isReady(controllerData) : makeRunningValues(false, [], []);
@ -70,8 +66,7 @@ Script.include("/~/system/libraries/controllers.js");
var nearTabletHighlightModuleReady = nearTabletHighlightModule ? var nearTabletHighlightModuleReady = nearTabletHighlightModule ?
nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []); nearTabletHighlightModule.isReady(controllerData) : makeRunningValues(false, [], []);
return /* grabOverlayModuleReady.active || */ farGrabModuleReady.active || grabEntityModuleReady.active return farGrabModuleReady.active || grabEntityModuleReady.active;
/* || nearTabletHighlightModuleReady.active */ ;
}; };
this.overlayLaserActive = function(controllerData) { this.overlayLaserActive = function(controllerData) {

2
scripts/system/controllers/controllerModules/trackedHandTablet.js
View file

@ -39,7 +39,7 @@ Script.include("/~/system/libraries/controllers.js");
this.gestureCompleted = true; this.gestureCompleted = true;
} else if (leftTipDistance > this.touchOffAboveDistance || rightTipDistance > this.touchOffAboveDistance) { } else if (leftTipDistance > this.touchOffAboveDistance || rightTipDistance > this.touchOffAboveDistance) {
this.gestureCompleted = false; this.gestureCompleted = false;
} } // else don't change gestureCompleted
} else { } else {
this.gestureCompleted = false; this.gestureCompleted = false;
} }

6
scripts/system/controllers/controllerModules/trackedHandWalk.js
View file

@ -46,7 +46,7 @@ Script.include("/~/system/libraries/controllers.js");
this.controlPoint = this.getControlPoint(); this.controlPoint = this.getControlPoint();
} else if (this.walkingForward && indexTipDistance > this.touchOffAboveDistance) { } else if (this.walkingForward && indexTipDistance > this.touchOffAboveDistance) {
this.walkingForward = false; this.walkingForward = false;
} } // else don't change walkingForward
} }
if (this.leftThumbPos && this.rightThumbPos) { if (this.leftThumbPos && this.rightThumbPos) {
@ -56,7 +56,7 @@ Script.include("/~/system/libraries/controllers.js");
this.controlPoint = this.getControlPoint(); this.controlPoint = this.getControlPoint();
} else if (this.walkingBackward && thumbTipDistance > this.touchOffAboveDistance) { } else if (this.walkingBackward && thumbTipDistance > this.touchOffAboveDistance) {
this.walkingBackward = false; this.walkingBackward = false;
} } // else don't change this.walkingBackward
} }
if ((this.walkingForward || this.walkingBackward) && !this.mappingEnabled) { if ((this.walkingForward || this.walkingBackward) && !this.mappingEnabled) {
@ -65,7 +65,7 @@ Script.include("/~/system/libraries/controllers.js");
} else if (!(this.walkingForward || this.walkingBackward) && this.mappingEnabled) { } else if (!(this.walkingForward || this.walkingBackward) && this.mappingEnabled) {
this.inputMapping.disable(); this.inputMapping.disable();
this.mappingEnabled = false; this.mappingEnabled = false;
} } // else don't change mappingEnabled
}; };
this.leftIndexChanged = function (pose) { this.leftIndexChanged = function (pose) {