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

isVSynchronized, and proper override declarations.

Browse source
This commit is contained in:
Howard Stearns 2015-12-03 11:28:26 -08:00
parent ed86a88083
commit a989b926b0
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
View file

@ -113,6 +113,9 @@ bool Basic2DWindowOpenGLDisplayPlugin::isThrottled() const {
return shouldThrottle; return shouldThrottle;
} }
bool Basic2DWindowOpenGLDisplayPlugin::isVSynchronized() const {
return (_framerateTarget == 0) && (!_vsyncAction || _vsyncAction->isChecked());
}
void Basic2DWindowOpenGLDisplayPlugin::updateFramerate() { void Basic2DWindowOpenGLDisplayPlugin::updateFramerate() {
QAction* checkedFramerate{ nullptr }; QAction* checkedFramerate{ nullptr };
@ -141,10 +144,8 @@ void Basic2DWindowOpenGLDisplayPlugin::updateFramerate() {
_inverseFrameRate = _framerateTarget ? 1.0f / (float) _framerateTarget : 1.0f / TARGET_FRAMERATE_Basic2DWindowOpenGL; // not truncated _inverseFrameRate = _framerateTarget ? 1.0f / (float) _framerateTarget : 1.0f / TARGET_FRAMERATE_Basic2DWindowOpenGL; // not truncated
int newInterval = getDesiredInterval(); int newInterval = getDesiredInterval();
if (_framerateTarget) { // For any target other than vsync, we have little hope of achieving it with timer alone: // Note: when not isVSynchronized, we are often not likely to hit target with a newInterval timer.
const int ALLOWANCE_FOR_DISPLAY_FINISHFRAME_AND_TIMER = 3; // ideally a windowed average of qApp->getLastPaintWait and then some, but not worth the complexity // We could try subtracting an allowance for qApp->getLastPaintWait() and qt timer machinery, but that starts getting complicated.
newInterval -= ALLOWANCE_FOR_DISPLAY_FINISHFRAME_AND_TIMER; // Otherwise, any controller expecting us to hit "target" will always be disappointed.
}
qDebug() << newInterval; qDebug() << newInterval;
_timer.start(newInterval); _timer.start(newInterval);
} }

5
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
View file

@ -18,8 +18,8 @@ class Basic2DWindowOpenGLDisplayPlugin : public WindowOpenGLDisplayPlugin {
public: public:
virtual const QString & getName() const override; virtual const QString & getName() const override;
virtual float getTargetFrameRate() { return _framerateTarget ? (float) _framerateTarget : TARGET_FRAMERATE_Basic2DWindowOpenGL; } virtual float getTargetFrameRate() override { return _framerateTarget ? (float) _framerateTarget : TARGET_FRAMERATE_Basic2DWindowOpenGL; }
virtual float getTargetFramePeriod() { return _inverseFrameRate; } virtual float getTargetFramePeriod() override { return _inverseFrameRate; }
virtual void activate() override; virtual void activate() override;
virtual void deactivate() override; virtual void deactivate() override;
@ -27,6 +27,7 @@ public:
virtual void display(GLuint sceneTexture, const glm::uvec2& sceneSize) override; virtual void display(GLuint sceneTexture, const glm::uvec2& sceneSize) override;
virtual bool isThrottled() const override; virtual bool isThrottled() const override;
virtual bool isVSynchronized() const override;
protected: protected:
int getDesiredInterval() const; int getDesiredInterval() const;

4
libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.h
View file

@ -22,8 +22,8 @@ public:
virtual const QString & getName() const override; virtual const QString & getName() const override;
virtual bool isHmd() const override { return true; } virtual bool isHmd() const override { return true; }
virtual float getTargetFrameRate() { return TARGET_RATE_OpenVr; } virtual float getTargetFrameRate() override { return TARGET_RATE_OpenVr; }
virtual float getTargetFramePeriod() { return 1.0f / TARGET_RATE_OpenVr; } virtual float getTargetFramePeriod() override { return 1.0f / TARGET_RATE_OpenVr; }
virtual void activate() override; virtual void activate() override;
virtual void deactivate() override; virtual void deactivate() override;

1
libraries/plugins/src/plugins/DisplayPlugin.h
View file

@ -57,6 +57,7 @@ public:
/// By default, all HMDs are stereo /// By default, all HMDs are stereo
virtual bool isStereo() const { return isHmd(); } virtual bool isStereo() const { return isHmd(); }
virtual bool isThrottled() const { return false; } virtual bool isThrottled() const { return false; }
virtual bool isVSynchronized() const { return true; } // false when throttled or run by non vsync timer
virtual float getTargetFrameRate() { return 0.0f; } virtual float getTargetFrameRate() { return 0.0f; }
virtual float getTargetFramePeriod() { return 0.0f; } virtual float getTargetFramePeriod() { return 0.0f; }

4
plugins/oculus/src/OculusDisplayPlugin.h
View file

@ -20,8 +20,8 @@ public:
virtual void deactivate() override; virtual void deactivate() override;
virtual const QString & getName() const override; virtual const QString & getName() const override;
virtual float getTargetFrameRate() { return TARGET_RATE_Oculus; } virtual float getTargetFrameRate() override { return TARGET_RATE_Oculus; }
virtual float getTargetFramePeriod() { return 1.0f / TARGET_RATE_Oculus; } virtual float getTargetFramePeriod() override { return 1.0f / TARGET_RATE_Oculus; }
protected: protected:
virtual void display(GLuint finalTexture, const glm::uvec2& sceneSize) override; virtual void display(GLuint finalTexture, const glm::uvec2& sceneSize) override;

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

@ -27,8 +27,8 @@ public:
virtual bool eventFilter(QObject* receiver, QEvent* event) override; virtual bool eventFilter(QObject* receiver, QEvent* event) override;
virtual int getHmdScreen() const override; virtual int getHmdScreen() const override;
virtual float getTargetFrameRate() { return TARGET_RATE_OculusLegacy; } virtual float getTargetFrameRate() override { return TARGET_RATE_OculusLegacy; }
virtual float getTargetFramePeriod() { return 1.0f / TARGET_RATE_OculusLegacy; } virtual float getTargetFramePeriod() override { return 1.0f / TARGET_RATE_OculusLegacy; }
// Stereo specific methods // Stereo specific methods
virtual bool isHmd() const override { return true; } virtual bool isHmd() const override { return true; }