Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better check for if oculus is running

Browse source
This commit is contained in:
Wayne Chen 2019-01-14 09:00:26 -08:00
parent ca0916886a
commit 7e674ba3c4
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/LoginDialog.cpp
View file

@ -106,8 +106,8 @@ bool LoginDialog::isSteamRunning() const {
} }
bool LoginDialog::isOculusRunning() const { bool LoginDialog::isOculusRunning() const {
auto oculusPlatform = PluginManager::getInstance()->getOculusPlatformPlugin(); auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin();
return (oculusPlatform != nullptr); return (oculusPlatformPlugin && oculusPlatformPlugin->isRunning());
} }
void LoginDialog::dismissLoginDialog() { void LoginDialog::dismissLoginDialog() {

2
libraries/plugins/src/plugins/OculusPlatformPlugin.h
View file

@ -19,6 +19,8 @@ public:
virtual const QString getName() const = 0; virtual const QString getName() const = 0;
virtual const bool isRunning() const = 0;
virtual void requestNonceAndUserID(NonceUserIDCallback callback) = 0; virtual void requestNonceAndUserID(NonceUserIDCallback callback) = 0;
virtual void handleOVREvents() = 0; virtual void handleOVREvents() = 0;

4
plugins/oculus/src/OculusPlatformPlugin.cpp
View file

@ -24,6 +24,10 @@ OculusAPIPlugin::~OculusAPIPlugin() {
hifi::ovr::releaseRenderSession(_session); hifi::ovr::releaseRenderSession(_session);
} }
const bool OculusAPIPlugin::isRunning() const {
return (qApp->property(hifi::properties::OCULUS_STORE).toBool());
}
void OculusAPIPlugin::requestNonceAndUserID(NonceUserIDCallback callback) { void OculusAPIPlugin::requestNonceAndUserID(NonceUserIDCallback callback) {
_nonceUserIDCallback = callback; _nonceUserIDCallback = callback;
ovr_User_GetUserProof(); ovr_User_GetUserProof();

2
plugins/oculus/src/OculusPlatformPlugin.h
View file

@ -20,6 +20,8 @@ public:
virtual ~OculusAPIPlugin(); virtual ~OculusAPIPlugin();
const QString getName() const { return NAME; } const QString getName() const { return NAME; }
const bool isRunning() const;
virtual void requestNonceAndUserID(NonceUserIDCallback callback); virtual void requestNonceAndUserID(NonceUserIDCallback callback);
virtual void handleOVREvents(); virtual void handleOVREvents();