Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:39:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding comment for possible solution - still WIP

Browse source
This commit is contained in:
Wayne Chen 2018-07-24 10:04:51 -07:00
parent e4a5be668a
commit c0dfbac480
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,7 @@ Script.include("/~/system/libraries/controllers.js");
var allowThisModule = !otherModuleRunning || isTriggerPressed; var allowThisModule = !otherModuleRunning || isTriggerPressed;
if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed) && if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed) &&
!this.isPointingAtNearGrabbableEntity(controllerData, isTriggerPressed)) { !this.isPointingAtNearGrabbableEntity(controllerData, isTriggerPressed)) {
//(controllerData.nearbyEntityProperties[this.hand] !== [])) {
this.updateAllwaysOn(); this.updateAllwaysOn();
if (isTriggerPressed) { if (isTriggerPressed) {
this.dominantHandOverride = true; // Override dominant hand. this.dominantHandOverride = true; // Override dominant hand.
@ -146,6 +147,7 @@ Script.include("/~/system/libraries/controllers.js");
var laserOn = isTriggerPressed || this.parameters.handLaser.allwaysOn; var laserOn = isTriggerPressed || this.parameters.handLaser.allwaysOn;
if (allowThisModule && (laserOn && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) && if (allowThisModule && (laserOn && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) &&
!this.isPointingAtNearGrabbableEntity(controllerData, isTriggerPressed)) { !this.isPointingAtNearGrabbableEntity(controllerData, isTriggerPressed)) {
//(controllerData.nearbyEntityProperties[this.hand] !== [])) {
this.running = true; this.running = true;
return makeRunningValues(true, [], []); return makeRunningValues(true, [], []);
} }