Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing legacy plugin

Browse source
This commit is contained in:
Bradley Austin Davis 2016-03-16 17:34:30 -07:00 committed by Brad Davis
parent b279ff9f7d
commit 25c8a3a0f3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
View file

@ -72,8 +72,8 @@ bool OculusLegacyDisplayPlugin::isSupported() const {
return result;
}
void OculusLegacyDisplayPlugin::activate() {
HmdDisplayPlugin::activate();
void OculusLegacyDisplayPlugin::internalActivate() {
Parent::internalActivate();
if (!(ovr_Initialize(nullptr))) {
Q_ASSERT(false);
@ -113,8 +113,8 @@ void OculusLegacyDisplayPlugin::activate() {
}
}
void OculusLegacyDisplayPlugin::deactivate() {
HmdDisplayPlugin::deactivate();
void OculusLegacyDisplayPlugin::internalDeactivate() {
Parent::internalDeactivate();
ovrHmd_Destroy(_hmd);
_hmd = nullptr;
ovr_Shutdown();
@ -128,7 +128,7 @@ void OculusLegacyDisplayPlugin::customizeContext() {
glewInit();
glGetError();
});
HmdDisplayPlugin::customizeContext();
Parent::customizeContext();
#if 0
ovrGLConfig config; memset(&config, 0, sizeof(ovrRenderAPIConfig));
auto& header = config.Config.Header;

7
plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
View file

@ -16,14 +16,12 @@
const float TARGET_RATE_OculusLegacy = 75.0f;
class OculusLegacyDisplayPlugin : public HmdDisplayPlugin {
using Parent = HmdDisplayPlugin;
public:
OculusLegacyDisplayPlugin();
virtual bool isSupported() const override;
virtual const QString& getName() const override { return NAME; }
virtual void activate() override;
virtual void deactivate() override;
virtual int getHmdScreen() const override;
// Stereo specific methods
@ -33,6 +31,9 @@ public:
virtual float getTargetFrameRate() override;
protected:
virtual void internalActivate() override;
virtual void internalDeactivate() override;
virtual void customizeContext() override;
void hmdPresent() override {}
bool isHmdMounted() const override { return true; }