diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp index 54e99f7565..2b0ace8bcc 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp @@ -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; diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h index 4fe9ed081e..f7d1be0244 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h @@ -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; }