Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 20:22:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse

Browse source 
fix paused interactions with mouse
This commit is contained in:
Howard Stearns 2016-06-13 11:28:47 -07:00 committed by GitHub
commit 357ccc17aa
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/away.js
View file

@ -176,9 +176,11 @@ function goAway() {
// tell the Reticle, we want to stop capturing the mouse until we come back
Reticle.allowMouseCapture = false;
if (HMD.active) {
Reticle.visible = false;
}
// Allow users to find their way to other applications, our menus, etc.
// For desktop, that means we want the reticle visible.
// For HMD, the hmd preview will show the system mouse because of allowMouseCapture,
// but we want to turn off our Reticle so that we don't get two in preview and a stuck one in headset.
Reticle.visible = !HMD.active;
wasHmdMounted = safeGetHMDMounted(); // always remember the correct state
avatarPosition = MyAvatar.position;

4
scripts/system/controllers/handControllerPointer.js
View file

@ -410,8 +410,8 @@ function update() {
if (!Menu.isOptionChecked("First Person")) {
return turnOffVisualization(); // What to do? menus can be behind hand!
}
if (!Window.hasFocus()) {
return turnOffVisualization(); // Don't mess with other apps
if (!Window.hasFocus() || !Reticle.allowMouseCapture) {
return turnOffVisualization(); // Don't mess with other apps or paused mouse activity
}
leftTrigger.update();
rightTrigger.update();