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

oculus sdk initialization done in activate/deactivate, not init/deinit

Browse source
This commit is contained in:
Sam Gondelman 2015-07-24 17:44:20 -07:00
parent f801471dd7
commit 0aee95fe38
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp
View file

@ -47,7 +47,7 @@ bool Oculus_0_5_DisplayPlugin::isSupported() const {
return result; return result;
} }
void Oculus_0_5_DisplayPlugin::init() { void Oculus_0_5_DisplayPlugin::activate(PluginContainer * container) {
if (!OVR_SUCCESS(ovr_Initialize(nullptr))) { if (!OVR_SUCCESS(ovr_Initialize(nullptr))) {
Q_ASSERT(false); Q_ASSERT(false);
qFatal("Failed to Initialize SDK"); qFatal("Failed to Initialize SDK");
@ -56,15 +56,7 @@ void Oculus_0_5_DisplayPlugin::init() {
if (!_hmd) { if (!_hmd) {
qFatal("Failed to acquire HMD"); qFatal("Failed to acquire HMD");
} }
}
void Oculus_0_5_DisplayPlugin::deinit() {
ovrHmd_Destroy(_hmd);
_hmd = nullptr;
ovr_Shutdown();
}
void Oculus_0_5_DisplayPlugin::activate(PluginContainer * container) {
OculusBaseDisplayPlugin::activate(container); OculusBaseDisplayPlugin::activate(container);
_window->makeCurrent(); _window->makeCurrent();
@ -112,6 +104,10 @@ void Oculus_0_5_DisplayPlugin::deactivate(PluginContainer* container) {
_hmdWindow = nullptr; _hmdWindow = nullptr;
OculusBaseDisplayPlugin::deactivate(container); OculusBaseDisplayPlugin::deactivate(container);
ovrHmd_Destroy(_hmd);
_hmd = nullptr;
ovr_Shutdown();
} }
void Oculus_0_5_DisplayPlugin::preRender() { void Oculus_0_5_DisplayPlugin::preRender() {

2
libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.h
View file

@ -25,8 +25,6 @@ public:
virtual bool isSupported() const override; virtual bool isSupported() const override;
virtual const QString & getName() const override; virtual const QString & getName() const override;
virtual void init() override;
virtual void deinit() override;
virtual void activate(PluginContainer * container) override; virtual void activate(PluginContainer * container) override;
virtual void deactivate(PluginContainer* container) override; virtual void deactivate(PluginContainer* container) override;