Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 20:56:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code cleanup to use web laser if laser is not pointing at grabbable entity

Browse source
This commit is contained in:
Wayne Chen 2018-07-17 16:44:49 -07:00
parent eb7bde1bfc
commit 30ca5a8cbd
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,25 +64,15 @@ Script.include("/~/system/libraries/controllers.js");
// we are searching for an entity that is not a web entity. We want to be able to // we are searching for an entity that is not a web entity. We want to be able to
// grab a non-web entity if the ray-pick intersects one. // grab a non-web entity if the ray-pick intersects one.
var intersection = controllerData.rayPicks[this.hand]; var intersection = controllerData.rayPicks[this.hand];
if(intersection.type === Picks.INTERSECTED_ENTITY) { if (intersection.type === Picks.INTERSECTED_ENTITY) {
// is pointing at an entity. // is pointing at an entity.
var entityProperty = Entities.getEntityProperties(intersection.objectID); var entityProperty = Entities.getEntityProperties(intersection.objectID);
var entityType = entityProperty.type; var entityType = entityProperty.type;
var isGrabbable = entityIsGrabbable(entityProperty); var isGrabbable = entityIsGrabbable(entityProperty);
return (isGrabbable && triggerPressed && entityType !== "Web"); return (isGrabbable && triggerPressed && entityType !== "Web");
} else if (intersection.type === Picks.INTERSECTED_OVERLAY) {
var objectID = intersection.objectID;
if ((HMD.tabletID && objectID === HMD.tabletID) ||
(HMD.tabletScreenID && objectID === HMD.tabletScreenID) ||
(HMD.homeButtonID && objectID === HMD.homeButtonID)) {
return true;
} else {
var overlayType = Overlays.getOverlayType(objectID);
return overlayType === "web3d" || triggerPressed;
}
} }
return false; return false;
} };
this.isPointingAtTriggerable = function(controllerData, triggerPressed) { this.isPointingAtTriggerable = function(controllerData, triggerPressed) {
// allow pointing at tablet, unlocked web entities, or web overlays automatically without pressing trigger, // allow pointing at tablet, unlocked web entities, or web overlays automatically without pressing trigger,
@ -137,8 +127,8 @@ Script.include("/~/system/libraries/controllers.js");
var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE && var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE &&
controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE; controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
var allowThisModule = !otherModuleRunning || isTriggerPressed; var allowThisModule = !otherModuleRunning || isTriggerPressed;
if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) { if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed) &&
//this.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) { !this.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) {
this.updateAllwaysOn(); this.updateAllwaysOn();
if (isTriggerPressed) { if (isTriggerPressed) {
this.dominantHandOverride = true; // Override dominant hand. this.dominantHandOverride = true; // Override dominant hand.
@ -159,8 +149,8 @@ Script.include("/~/system/libraries/controllers.js");
var allowThisModule = !otherModuleRunning && !grabModuleNeedsToRun; var allowThisModule = !otherModuleRunning && !grabModuleNeedsToRun;
var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE; var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE;
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.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) { !this.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) {
this.running = true; this.running = true;
return makeRunningValues(true, [], []); return makeRunningValues(true, [], []);
} }