From 00cc4fc0f142139dee3ef34fa2238bff258742fa Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Tue, 3 May 2022 10:51:00 -0400 Subject: [PATCH] Cleanup - remove unused variables and highlight --- modules/skybrowser/include/targetbrowserpair.h | 8 +------- modules/skybrowser/include/wwtcommunicator.h | 3 --- modules/skybrowser/skybrowsermodule.cpp | 4 ---- modules/skybrowser/skybrowsermodule.h | 2 -- modules/skybrowser/src/screenspaceskybrowser.cpp | 13 ++++--------- modules/skybrowser/src/targetbrowserpair.cpp | 12 ------------ modules/skybrowser/src/wwtcommunicator.cpp | 8 -------- 7 files changed, 5 insertions(+), 45 deletions(-) diff --git a/modules/skybrowser/include/targetbrowserpair.h b/modules/skybrowser/include/targetbrowserpair.h index de93a35a83..bab9985cc2 100644 --- a/modules/skybrowser/include/targetbrowserpair.h +++ b/modules/skybrowser/include/targetbrowserpair.h @@ -46,9 +46,7 @@ public: // Target & Browser void initialize(); - // Highlighting - void removeHighlight(const glm::ivec3& color); - void highlight(const glm::ivec3& color); + // Animation void startAnimation(glm::dvec3 coordsEnd, double fovEnd); void incrementallyAnimateToCoordinate(); @@ -126,10 +124,6 @@ private: // Dragging glm::dvec3 _startTargetPosition = glm::dvec3(0.0); - - glm::dvec2 _equatorialAim = glm::dvec2(0.0); - glm::ivec3 _borderColor = glm::ivec3(255); - glm::vec2 _dimensions = glm::vec2(0.5f); }; } // namespace openspace diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h index 7b75832c97..9966b09a68 100644 --- a/modules/skybrowser/include/wwtcommunicator.h +++ b/modules/skybrowser/include/wwtcommunicator.h @@ -67,9 +67,6 @@ public: void setBorderColor(glm::ivec3 color); void setTargetRoll(double roll); - void highlight(const glm::ivec3& addition) const; - // The removal parameter decides what will be removed from the border color - void removeHighlight(const glm::ivec3& removal) const; void updateBorderColor() const; void updateAim() const; diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index 0dfaa533b5..7b92e96b6f 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -454,10 +454,6 @@ std::string SkyBrowserModule::selectedTargetId() const { return found ? found->targetRenderableId() : ""; } -glm::ivec3 SkyBrowserModule::highlight() const { - return _highlightAddition; -} - int SkyBrowserModule::uniqueIdentifierCounter() const { return _uniqueIdentifierCounter; } diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h index b680c60b40..3c4c468ae5 100644 --- a/modules/skybrowser/skybrowsermodule.h +++ b/modules/skybrowser/skybrowsermodule.h @@ -58,7 +58,6 @@ public: const std::unique_ptr& getWwtDataHandler() const; std::string selectedBrowserId() const; std::string selectedTargetId() const; - glm::ivec3 highlight() const; int uniqueIdentifierCounter() const; void setSelectedBrowser(const std::string& id); @@ -110,7 +109,6 @@ private: properties::DoubleProperty _browserAnimationSpeed; properties::DoubleProperty _spaceCraftAnimationTime; properties::StringProperty _wwtImageCollectionUrl; - glm::ivec3 _highlightAddition = glm::ivec3(35); // Highlight object when mouse hovers // The browsers and targets std::vector> _targetsBrowsers; diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp index 92eb1db53d..a70895fbc8 100644 --- a/modules/skybrowser/src/screenspaceskybrowser.cpp +++ b/modules/skybrowser/src/screenspaceskybrowser.cpp @@ -79,7 +79,7 @@ namespace { #include "screenspaceskybrowser_codegen.cpp" - glm::ivec3 randomBorderColor(glm::ivec3 highlight) { + glm::ivec3 randomBorderColor() { // Generate a random border color with sufficient lightness and a n std::random_device rd; // Hue is in the unit degrees [0, 360] @@ -88,13 +88,8 @@ namespace { // Value in saturation are in the unit percent [0,1] float value = 0.9f; // Brightness float saturation = 0.5f; - glm::ivec3 rgbColor; - glm::ivec3 highlighted; - do { - glm::vec3 hsvColor = glm::vec3(hue(rd), saturation, value); - rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f); - highlighted = rgbColor + highlight; - } while (highlighted.x < 255 && highlighted.y < 255 && highlighted.z < 255); + glm::vec3 hsvColor = glm::vec3(hue(rd), saturation, value); + glm::ivec3 rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f); return rgbColor; } @@ -125,7 +120,7 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary if (global::windowDelegate->isMaster()) { SkyBrowserModule* module = global::moduleEngine->module(); - _borderColor = randomBorderColor(module->highlight()); + _borderColor = randomBorderColor(); } _scale = _size.y * 0.5f; diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp index 300e2c1778..02b96caca0 100644 --- a/modules/skybrowser/src/targetbrowserpair.cpp +++ b/modules/skybrowser/src/targetbrowserpair.cpp @@ -63,16 +63,6 @@ void TargetBrowserPair::setImageOrder(int i, int order) { _browser->setImageOrder(i, order); } -void TargetBrowserPair::removeHighlight(const glm::ivec3& color) { - _targetRenderable->removeHighlight(color); - _browser->removeHighlight(color); -} - -void TargetBrowserPair::highlight(const glm::ivec3& color) { - _browser->highlight(color); - _targetRenderable->highlight(color); -} - void TargetBrowserPair::aimTargetGalactic(glm::dvec3 direction) { std::string id = _targetNode->identifier(); glm::dvec3 positionCelestial = glm::normalize(direction) * @@ -280,7 +270,6 @@ void TargetBrowserPair::setVerticalFov(double vfov) { } void TargetBrowserPair::setEquatorialAim(const glm::dvec2& aim) { - _equatorialAim = aim; aimTargetGalactic( skybrowser::equatorialToGalactic(skybrowser::sphericalToCartesian(aim)) ); @@ -288,7 +277,6 @@ void TargetBrowserPair::setEquatorialAim(const glm::dvec2& aim) { } void TargetBrowserPair::setBorderColor(const glm::ivec3& color) { - _borderColor = color; _targetRenderable->setColor(color); _browser->setBorderColor(color); } diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp index 88436bc348..20f52730d3 100644 --- a/modules/skybrowser/src/wwtcommunicator.cpp +++ b/modules/skybrowser/src/wwtcommunicator.cpp @@ -119,14 +119,6 @@ void WwtCommunicator::setBorderColor(glm::ivec3 color) { _borderColorIsDirty = true; } -void WwtCommunicator::highlight(const glm::ivec3& addition) const { - setWebpageBorderColor(_borderColor + addition); -} - -void WwtCommunicator::removeHighlight(const glm::ivec3& removal) const { - setWebpageBorderColor(_borderColor - removal); -} - void WwtCommunicator::updateBorderColor() const { setWebpageBorderColor(_borderColor); }