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

Add check to see if hudRayPick intersects.

Browse source
This commit is contained in:
armored-dragon 2025-03-24 16:24:36 -05:00
parent cba6f29f77
commit ce787d5803
No known key found for this signature in database
GPG key ID: C7207ACC3382AD8B
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/controllerModules/farGrabEntity.js
View file

@ -357,11 +357,14 @@ Script.include("/~/system/libraries/controllers.js");
}; };
this.notPointingAtEntity = function (controllerData) { this.notPointingAtEntity = function (controllerData) {
if (!hudRayPick.intersects) return;
var intersection = controllerData.rayPicks[this.hand]; var intersection = controllerData.rayPicks[this.hand];
var entityProperty = Entities.getEntityProperties(intersection.objectID, "type"); var entityProperty = Entities.getEntityProperties(intersection.objectID, "type");
var entityType = entityProperty.type; var entityType = entityProperty.type;
var hudRayPick = controllerData.hudRayPicks[this.hand]; var hudRayPick = controllerData.hudRayPicks[this.hand];
var point2d = this.calculateNewReticlePosition(hudRayPick.intersection); var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
if ((intersection.type === Picks.INTERSECTED_ENTITY && entityType === "Web") || if ((intersection.type === Picks.INTERSECTED_ENTITY && entityType === "Web") ||
intersection.type === Picks.INTERSECTED_OVERLAY || Window.isPointOnDesktopWindow(point2d)) { intersection.type === Picks.INTERSECTED_OVERLAY || Window.isPointOnDesktopWindow(point2d)) {
return true; return true;