From 4ece34db678dc81586b46718bd1214b8b4d43c31 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Sat, 23 Nov 2019 15:43:04 +0200
Subject: [PATCH] fix build and better method names
---
applications/gui/src/media_panel.cpp | 2 +-
applications/gui/src/screen.cpp | 6 +++++-
applications/gui/src/screen.hpp | 8 +++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/applications/gui/src/media_panel.cpp b/applications/gui/src/media_panel.cpp
index 5967bd320..142eb9c93 100644
--- a/applications/gui/src/media_panel.cpp
+++ b/applications/gui/src/media_panel.cpp
@@ -145,7 +145,7 @@ MediaPanel::MediaPanel(ftl::gui::Screen *screen) : nanogui::Window(screen, ""),
*/
#ifdef HAVE_OPENVR
- if (this->screen_->hasVR()) {
+ if (this->screen_->isHmdPresent()) {
auto button_vr = new Button(this, "VR");
button_vr->setFlags(Button::ToggleButton);
button_vr->setChangeCallback([this, button_vr](bool state) {
diff --git a/applications/gui/src/screen.cpp b/applications/gui/src/screen.cpp
index b864c8fe2..811d96cf8 100644
--- a/applications/gui/src/screen.cpp
+++ b/applications/gui/src/screen.cpp
@@ -68,7 +68,6 @@ ftl::gui::Screen::Screen(ftl::Configurable *proot, ftl::net::Universe *pnet, ftl
#ifdef HAVE_OPENVR
HMD_ = nullptr;
- has_vr_ = vr::VR_IsHmdPresent();
#endif
zoom_ = root_->value("zoom", 1.0f);
@@ -340,6 +339,11 @@ bool ftl::gui::Screen::switchVR(bool on) {
return isVR();
}
+
+bool ftl::gui::Screen::isHmdPresent() {
+ return vr::VR_IsHmdPresent();
+}
+
#endif
ftl::gui::Screen::~Screen() {
diff --git a/applications/gui/src/screen.hpp b/applications/gui/src/screen.hpp
index 69ce36ba4..9dbed7ead 100644
--- a/applications/gui/src/screen.hpp
+++ b/applications/gui/src/screen.hpp
@@ -48,19 +48,18 @@ class Screen : public nanogui::Screen {
// initialize OpenVR
bool initVR();
- // is VR available (HMD was found at initialization)
- bool hasVR() const { return has_vr_; }
-
// is VR mode on/off
bool isVR();
// toggle VR on/off
bool switchVR(bool mode);
+ bool isHmdPresent();
+
vr::IVRSystem* getVR() { return HMD_; }
#else
- bool hasVR() const { return false; }
+ bool isVR() { return false; }
#endif
nanogui::Theme *windowtheme;
@@ -103,7 +102,6 @@ class Screen : public nanogui::Screen {
bool show_two_images_ = false;
#ifdef HAVE_OPENVR
- bool has_vr_;
vr::IVRSystem *HMD_;
#endif
};
--
GitLab