Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 21:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tablet highlighting when using the Create and Shapes apps

Browse source
This commit is contained in:
David Rowe 2018-10-20 11:57:46 +13:00
parent eb179363f6
commit 71ec5f3612
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/controllers/controllerModules/inEditMode.js
View file

@ -158,11 +158,12 @@ Script.include("/~/system/libraries/utils.js");
} }
} }
var nearOverlay = getEnabledModuleByName(this.hand === RIGHT_HAND // Tablet highlight and grabbing.
? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay"); var tabletHighlight = getEnabledModuleByName(this.hand === RIGHT_HAND
if (nearOverlay) { ? "RightNearTabletHighlight" : "LeftNearTabletHighlight");
var nearOverlayReady = nearOverlay.isReady(controllerData); if (tabletHighlight) {
if (nearOverlayReady.active && HMD.tabletID && nearOverlay.grabbedThingID === HMD.tabletID) { var tabletHighlightReady = tabletHighlight.isReady(controllerData);
if (tabletHighlightReady.active) {
return this.exitModule(); return this.exitModule();
} }
} }

13
scripts/system/controllers/controllerModules/inVREditMode.js
View file

@ -101,13 +101,12 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
} }
} }
// Tablet grabbing. // Tablet highlight and grabbing.
var nearOverlay = getEnabledModuleByName(this.hand === RIGHT_HAND ? var tabletHighlight = getEnabledModuleByName(this.hand === RIGHT_HAND
"RightNearParentingGrabOverlay" : ? "RightNearTabletHighlight" : "LeftNearTabletHighlight");
"LeftNearParentingGrabOverlay"); if (tabletHighlight) {
if (nearOverlay) { var tabletHighlightReady = tabletHighlight.isReady(controllerData);
var nearOverlayReady = nearOverlay.isReady(controllerData); if (tabletHighlightReady.active) {
if (nearOverlayReady.active && HMD.tabletID && nearOverlay.grabbedThingID === HMD.tabletID) {
return this.exitModule(); return this.exitModule();
} }
} }