Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-30 20:50:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix list of tablet IDs ray cast checks in edit.js

Browse source
This commit is contained in:
David Back 2018-03-16 16:57:54 -07:00 committed by Zach Fox
parent 0934a7d467
commit 3f2a49d243
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/edit.js
View file

@ -776,10 +776,13 @@ function findClickedEntity(event) {
} }
var pickRay = Camera.computePickRay(event.x, event.y); var pickRay = Camera.computePickRay(event.x, event.y);
var overlayResult = Overlays.findRayIntersection(pickRay, true, getMainTabletIDs()); var tabletIDs = getMainTabletIDs();
if (tabletIDs.length > 0) {
var overlayResult = Overlays.findRayIntersection(pickRay, true, tabletIDs);
if (overlayResult.intersects) { if (overlayResult.intersects) {
return null; return null;
} }
}
var entityResult = Entities.findRayIntersection(pickRay, true); // want precision picking var entityResult = Entities.findRayIntersection(pickRay, true); // want precision picking
var iconResult = entityIconOverlayManager.findRayIntersection(pickRay); var iconResult = entityIconOverlayManager.findRayIntersection(pickRay);
@ -967,9 +970,14 @@ function mouseReleaseEvent(event) {
function wasTabletClicked(event) { function wasTabletClicked(event) {
var rayPick = Camera.computePickRay(event.x, event.y); var rayPick = Camera.computePickRay(event.x, event.y);
var tabletIDs = getMainTabletIDs();
if (tabletIDs.length === 0) {
return false;
} else {
var result = Overlays.findRayIntersection(rayPick, true, getMainTabletIDs()); var result = Overlays.findRayIntersection(rayPick, true, getMainTabletIDs());
return result.intersects; return result.intersects;
} }
}
function mouseClickEvent(event) { function mouseClickEvent(event) {
var wantDebug = false; var wantDebug = false;