Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 21:06:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8600 from howard-stearns/no-edit-selection-when-over-ui

Browse source 
don't do hand-controller edit object-selection when pointed at a HUD element
This commit is contained in:
Howard Stearns 2016-09-15 16:17:59 -07:00 committed by GitHub
commit 7a4bcc4fff
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/libraries/entitySelectionTool.js
View file

@ -1022,6 +1022,9 @@ SelectionDisplay = (function() {
// No switching while the other is already triggered, so no need to release. // No switching while the other is already triggered, so no need to release.
activeHand = (activeHand === Controller.Standard.RightHand) ? Controller.Standard.LeftHand : Controller.Standard.RightHand; activeHand = (activeHand === Controller.Standard.RightHand) ? Controller.Standard.LeftHand : Controller.Standard.RightHand;
} }
if (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)) {
return;
}
var eventResult = that.mousePressEvent({}); var eventResult = that.mousePressEvent({});
if (!eventResult || (eventResult === 'selectionBox')) { if (!eventResult || (eventResult === 'selectionBox')) {
var pickRay = controllerComputePickRay(); var pickRay = controllerComputePickRay();