Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7925 from sethalves/overlay-or-grab-not-both

Browse source 
fix mouse-grab moving both an overlay and an entity at the same time
This commit is contained in:
Brad Hefta-Gaub 2016-05-19 17:38:32 -07:00
commit 8ff7af28be
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/grab.js
View file

@ -320,6 +320,11 @@ Grabber.prototype.pressEvent = function(event) {
return; return;
} }
if (Overlays.getOverlayAtPoint(Reticle.position) > 0) {
// the mouse is pointing at an overlay; don't look for entities underneath the overlay.
return;
}
var pickRay = Camera.computePickRay(event.x, event.y); var pickRay = Camera.computePickRay(event.x, event.y);
var pickResults = Entities.findRayIntersection(pickRay, true); // accurate picking var pickResults = Entities.findRayIntersection(pickRay, true); // accurate picking
if (!pickResults.intersects) { if (!pickResults.intersects) {