From d7a9354b370098d8032d339be2a7e86fd47b07e1 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 15 Jun 2017 13:25:16 -0700 Subject: [PATCH] More CR comments; rename function --- .../display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp | 2 +- .../display-plugins/src/display-plugins/OpenGLDisplayPlugin.h | 2 +- .../display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h | 2 +- libraries/plugins/src/plugins/DisplayPlugin.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 92afa8ef22..67bbb452ca 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -706,7 +706,7 @@ bool OpenGLDisplayPlugin::setDisplayTexture(const QString& name) { // Note: it is the caller's responsibility to keep the network texture in cache. if (name.isEmpty()) { _displayTexture.reset(); - clearPreviewFlag(); + onDisplayTextureReset(); return true; } auto textureCache = DependencyManager::get(); diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h index aa047b4538..7e7889ff47 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h @@ -58,7 +58,7 @@ public: } 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; float presentRate() const override; diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h index 58ef109525..055328ee21 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h @@ -46,7 +46,7 @@ public: float stutterRate() const override; - virtual bool clearPreviewFlag() override { _clearPreviewFlag = true; return true; }; + virtual bool onDisplayTextureReset() override { _clearPreviewFlag = true; return true; }; protected: virtual void hmdPresent() = 0; diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h index bce6c0c33a..7bfdbddbc5 100644 --- a/libraries/plugins/src/plugins/DisplayPlugin.h +++ b/libraries/plugins/src/plugins/DisplayPlugin.h @@ -186,7 +186,6 @@ public: // 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 clearPreviewFlag() { return false; }; virtual float devicePixelRatio() { return 1.0f; } // Rate at which we render frames