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

Stop mouse capturing when in vr

Browse source
This commit is contained in:
OfficialR3ido101 2025-02-21 13:52:53 +00:00 committed by Karol Suprynowicz
parent 18b6e744a3
commit d343fea626
6 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -225,6 +225,7 @@ Application::Application(
_hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
_preferStylusOverLaserSetting("preferStylusOverLaser", DEFAULT_PREFER_STYLUS_OVER_LASER),
_preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
_defaultMouseLock("defaultMouseLock", DEFAULT_MOUSE_LOCK),
_showGraphicsIconSetting("showGraphicsIcon", DEFAULT_SHOW_GRAPHICS_ICON),
_constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
_awayStateWhenFocusLostInVREnabled("awayStateWhenFocusLostInVREnabled", DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED),

4
interface/src/Application.h
View file

@ -188,6 +188,9 @@ public:
void setPreferStylusOverLaser(bool value) { _preferStylusOverLaserSetting.set(value); }
bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); }
void setPreferAvatarFingerOverStylus(bool value) { _preferAvatarFingerOverStylusSetting.set(value); }
void setMouseLock(bool value);
bool getMouseLock();
bool getShowGraphicsIcon() { return _showGraphicsIconSetting.get(); }
void setShowGraphicsIcon(bool value);
@ -791,6 +794,7 @@ private:
Setting::Handle<bool> _hmdTabletBecomesToolbarSetting;
Setting::Handle<bool> _preferStylusOverLaserSetting;
Setting::Handle<bool> _preferAvatarFingerOverStylusSetting;
Setting::Handle<bool> _defaultMouseLock;
Setting::Handle<bool> _showGraphicsIconSetting;
Setting::Handle<bool> _constrainToolbarPosition;
Setting::Handle<bool> _awayStateWhenFocusLostInVREnabled;

8
interface/src/Application_UI.cpp
View file

@ -269,6 +269,14 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
updateSystemTabletMode();
}
void Application::setMouseLock(bool value) {
_defaultMouseLock.set(value);
getApplicationCompositor().setMouseLockComposit(value);
}
bool Application::getMouseLock() {
return _defaultMouseLock.get();
}
void Application::setShowGraphicsIcon(bool value) {
_showGraphicsIconSetting.set(value);
DependencyManager::get<MessagesClient>()->sendLocalMessage("Overte-ShowGraphicsIconChanged", "");

10
interface/src/ui/PreferencesDialog.cpp
View file

@ -32,6 +32,8 @@
void setupPreferences() {
auto preferences = DependencyManager::get<Preferences>();
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
static const QString AVATAR_BASICS { "Avatar Basics" };
{
auto getter = [myAvatar]()->QString { return myAvatar->getDisplayName(); };
@ -142,6 +144,14 @@ void setupPreferences() {
preferences->addPreference(new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter));
}
//static const QString TEST{ "TEST SECTION" };
{
auto getter = []() -> bool { return qApp->getMouseLock(); };
auto setter = [](bool value) { qApp->setMouseLock(value); };
auto preference = new CheckPreference(UI_CATEGORY, "3D mouse cursor in VR", getter, setter);
preferences->addPreference(preference);
}
{
auto getter = []()->bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); };
auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); };

8
libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
View file

@ -195,6 +195,10 @@ bool CompositorHelper::shouldCaptureMouse() const {
if (!isHMD()) {
return false;
}
if (!_mouseLockComposit) {
return false;
}
if (!isWindowActive()) {
@ -216,6 +220,10 @@ void CompositorHelper::setAllowMouseCapture(bool capture) {
}
}
void CompositorHelper::setMouseLockComposit(bool capture) {
_mouseLockComposit = capture;
}
void CompositorHelper::handleLeaveEvent() {
if (shouldCaptureMouse()) {

4
libraries/display-plugins/src/display-plugins/CompositorHelper.h
View file

@ -106,6 +106,7 @@ public:
bool getAllowMouseCapture() const { return _allowMouseCapture; }
void setAllowMouseCapture(bool capture);
void setMouseLockComposit(bool capture);
/// if the reticle is pointing to a system overlay (a dialog box for example) then the function returns true otherwise false
bool getReticleOverDesktop() const;
@ -168,7 +169,8 @@ private:
bool _reticleOverQml { false };
std::atomic<bool> _allowMouseCapture { true };
std::atomic<bool> _allowMouseCapture{ true };
std::atomic<bool> _mouseLockComposit{ false };
bool _fakeMouseEvent { false };