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

More CR comments; rename function

Browse source
This commit is contained in:
Zach Fox 2017-06-15 13:25:16 -07:00
parent 1088d248e3
commit d7a9354b37
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -706,7 +706,7 @@ bool OpenGLDisplayPlugin::setDisplayTexture(const QString& name) {
// Note: it is the caller's responsibility to keep the network texture in cache. // Note: it is the caller's responsibility to keep the network texture in cache.
if (name.isEmpty()) { if (name.isEmpty()) {
_displayTexture.reset(); _displayTexture.reset();
clearPreviewFlag(); onDisplayTextureReset();
return true; return true;
} }
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
View file

@ -58,7 +58,7 @@ public:
} }
virtual bool setDisplayTexture(const QString& name) override; virtual bool setDisplayTexture(const QString& name) override;
virtual bool clearPreviewFlag() override { return false; }; virtual bool onDisplayTextureReset() { return false; };
QImage getScreenshot(float aspectRatio = 0.0f) const override; QImage getScreenshot(float aspectRatio = 0.0f) const override;
float presentRate() const override; float presentRate() const override;

2
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
View file

@ -46,7 +46,7 @@ public:
float stutterRate() const override; float stutterRate() const override;
virtual bool clearPreviewFlag() override { _clearPreviewFlag = true; return true; }; virtual bool onDisplayTextureReset() override { _clearPreviewFlag = true; return true; };
protected: protected:
virtual void hmdPresent() = 0; virtual void hmdPresent() = 0;

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

@ -186,7 +186,6 @@ public:
// Set the texture to display on the monitor and return true, if allowed. Empty string resets. // Set the texture to display on the monitor and return true, if allowed. Empty string resets.
virtual bool setDisplayTexture(const QString& name) { return false; } virtual bool setDisplayTexture(const QString& name) { return false; }
virtual bool clearPreviewFlag() { return false; };
virtual float devicePixelRatio() { return 1.0f; } virtual float devicePixelRatio() { return 1.0f; }
// Rate at which we render frames // Rate at which we render frames