From 00a153c730d66dc0a8129ab656c4c64a7bf52a6d Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Mon, 29 Apr 2019 16:39:34 -0700 Subject: [PATCH 1/5] moving work location --- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 0dd8b3f268..f4f2bdabff 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -681,11 +682,14 @@ void OpenGLDisplayPlugin::compositeLayers() { compositeExtra(); } - // Draw the pointer last so it's on top of everything - auto compositorHelper = DependencyManager::get(); - if (compositorHelper->getReticleVisible()) { - PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount()) + auto& cursorManager = Cursor::Manager::instance(); + if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE ) { + auto compositorHelper = DependencyManager::get(); + // Draw the pointer last so it's on top of everything + if (compositorHelper->getReticleVisible()) { + PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount()) compositePointer(); + } } } From 7d2b75673cc715b23dece347e6700321680aa713 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Mon, 29 Apr 2019 16:42:49 -0700 Subject: [PATCH 2/5] fixed syntax for cursor --- interface/src/Application.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2fdf7b6960..928d5db6cd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5042,7 +5042,10 @@ void Application::idle() { } #endif - checkChangeCursor(); + + if((displayPlugin && displayPlugin->isHmd()) || _preferredCursor.get() == Cursor::Manager::ICON_NAMES[Cursor::Icon::RETICLE]){ + checkChangeCursor(); + } #if !defined(DISABLE_QML) auto stats = Stats::getInstance(); From 978108b3ba452a73553cd57369c6f206ac31b751 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 30 Apr 2019 11:34:11 -0700 Subject: [PATCH 3/5] found a more simplified way to stop rendering the mouse unless its the Reticle cursor --- interface/src/Application.cpp | 7 ++----- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 928d5db6cd..bd69934b27 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3591,7 +3591,7 @@ void Application::setPreferAvatarFingerOverStylus(bool value) { void Application::setPreferredCursor(const QString& cursorName) { qCDebug(interfaceapp) << "setPreferredCursor" << cursorName; - _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName); + _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get())); } @@ -5041,11 +5041,8 @@ void Application::idle() { } } #endif - - if((displayPlugin && displayPlugin->isHmd()) || _preferredCursor.get() == Cursor::Manager::ICON_NAMES[Cursor::Icon::RETICLE]){ - checkChangeCursor(); - } + checkChangeCursor(); #if !defined(DISABLE_QML) auto stats = Stats::getInstance(); diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index f4f2bdabff..1e742bb8a8 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -683,7 +683,7 @@ void OpenGLDisplayPlugin::compositeLayers() { } auto& cursorManager = Cursor::Manager::instance(); - if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE ) { + if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE) { auto compositorHelper = DependencyManager::get(); // Draw the pointer last so it's on top of everything if (compositorHelper->getReticleVisible()) { From df3049cb4487d9d3491e2e04a5f680cf0095e97a Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 30 Apr 2019 11:49:33 -0700 Subject: [PATCH 4/5] simplified way to switch to system cursor if non hmd mode --- interface/src/Application.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index bd69934b27..9a2d320329 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3591,7 +3591,14 @@ void Application::setPreferAvatarFingerOverStylus(bool value) { void Application::setPreferredCursor(const QString& cursorName) { qCDebug(interfaceapp) << "setPreferredCursor" << cursorName; - _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); + + if (_displayPlugin && _displayPlugin->isHmd()) { + _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName); + } + else { + _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); + } + showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get())); } From 49cecdee6efe3c630a91bf5e144a0042eacb20fc Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 30 Apr 2019 11:52:37 -0700 Subject: [PATCH 5/5] fixing spacing --- .../display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 1e742bb8a8..bb94195f85 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -682,7 +682,7 @@ void OpenGLDisplayPlugin::compositeLayers() { compositeExtra(); } - auto& cursorManager = Cursor::Manager::instance(); + auto& cursorManager = Cursor::Manager::instance(); if (isHmd() || cursorManager.getCursor()->getIcon() == Cursor::RETICLE) { auto compositorHelper = DependencyManager::get(); // Draw the pointer last so it's on top of everything