mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 04:44:11 +02:00
Change variable names
This commit is contained in:
parent
aced56d934
commit
a1bd83e8aa
3 changed files with 13 additions and 13 deletions
|
@ -270,11 +270,11 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
|
|||
}
|
||||
|
||||
void Application::setMouseCaptureVR(bool value) {
|
||||
_defaultMouseLock.set(value);
|
||||
getApplicationCompositor().setMouseLockCompositVR(value);
|
||||
_defaultMouseCaptureVR.set(value);
|
||||
getApplicationCompositor().setEnableMouseCaptureVR(value);
|
||||
}
|
||||
bool Application::getMouseCaptureVR() {
|
||||
return _defaultMouseLock.get();
|
||||
return _defaultMouseCaptureVR.get();
|
||||
}
|
||||
|
||||
void Application::setShowGraphicsIcon(bool value) {
|
||||
|
|
|
@ -188,7 +188,7 @@ static bool isWindowActive() {
|
|||
}
|
||||
|
||||
bool CompositorHelper::shouldCaptureMouse() const {
|
||||
if (!_allowMouseCaptureVR) {
|
||||
if (!_allowMouseCapture) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ bool CompositorHelper::shouldCaptureMouse() const {
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!_mouseLockComposit) {
|
||||
if (!_enableMouseCaptureVR) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -214,14 +214,14 @@ bool CompositorHelper::shouldCaptureMouse() const {
|
|||
}
|
||||
|
||||
void CompositorHelper::setAllowMouseCapture(bool capture) {
|
||||
if (capture != _allowMouseCaptureVR) {
|
||||
_allowMouseCaptureVR = capture;
|
||||
if (capture != _allowMouseCapture) {
|
||||
_allowMouseCapture = capture;
|
||||
emit allowMouseCaptureChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void CompositorHelper::setMouseLockCompositVR(bool capture) {
|
||||
_mouseLockComposit = capture;
|
||||
void CompositorHelper::setEnableMouseCaptureVR(bool capture) {
|
||||
_enableMouseCaptureVR = capture;
|
||||
}
|
||||
|
||||
void CompositorHelper::handleLeaveEvent() {
|
||||
|
|
|
@ -104,9 +104,9 @@ public:
|
|||
|
||||
bool shouldCaptureMouse() const;
|
||||
|
||||
bool getAllowMouseCapture() const { return _allowMouseCaptureVR; }
|
||||
bool getAllowMouseCapture() const { return _allowMouseCapture; }
|
||||
void setAllowMouseCapture(bool capture);
|
||||
void setMouseLockCompositVR(bool capture);
|
||||
void setEnableMouseCaptureVR(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;
|
||||
|
@ -169,8 +169,8 @@ private:
|
|||
|
||||
bool _reticleOverQml { false };
|
||||
|
||||
std::atomic<bool> _allowMouseCaptureVR{ true };
|
||||
std::atomic<bool> _mouseLockComposit{ false };
|
||||
std::atomic<bool> _allowMouseCapture{ true };
|
||||
std::atomic<bool> _enableMouseCaptureVR{ false };
|
||||
|
||||
bool _fakeMouseEvent { false };
|
||||
|
||||
|
|
Loading…
Reference in a new issue