From 0d6f4ecac0f8dc7e8565408dfc00f58dc31ba4b7 Mon Sep 17 00:00:00 2001 From: Malin E Date: Thu, 8 Sep 2022 10:08:39 +0200 Subject: [PATCH] Change name from SpeckLabels to LabelsComponent --- .../rendering/renderablebillboardscloud.cpp | 4 +-- .../rendering/renderablebillboardscloud.h | 4 +-- .../rendering/renderableplanescloud.cpp | 4 +-- .../rendering/renderableplanescloud.h | 4 +-- modules/space/CMakeLists.txt | 4 +-- .../{specklabels.cpp => labelscomponent.cpp} | 26 +++++++++---------- .../{specklabels.h => labelscomponent.h} | 12 ++++----- .../renderableconstellationsbase.cpp | 4 +-- .../rendering/renderableconstellationsbase.h | 4 +-- modules/space/spacemodule.cpp | 4 +-- 10 files changed, 35 insertions(+), 35 deletions(-) rename modules/space/{specklabels.cpp => labelscomponent.cpp} (91%) rename modules/space/{specklabels.h => labelscomponent.h} (91%) diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 437e5e3fc6..9c5557cc90 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -256,7 +256,7 @@ namespace { // [[codegen::verbatim(LabelsInfo.description)]] std::optional labels - [[codegen::reference("space_specklabels")]]; + [[codegen::reference("space_labelscomponent")]]; // [[codegen::verbatim(ColorOptionInfo.description)]] std::optional> colorOption; @@ -444,7 +444,7 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di _drawLabels = p.drawLabels.value_or(_drawLabels); addProperty(_drawLabels); - _labels = std::make_unique(*p.labels); + _labels = std::make_unique(*p.labels); _hasLabels = true; addPropertySubOwner(_labels.get()); } diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h index c70cff455b..4625da4738 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h @@ -27,7 +27,7 @@ #include -#include +#include #include #include #include @@ -136,7 +136,7 @@ private: speck::ColorMap _colorMap; // Everything related to the labels are handles by speck::SpeckLabels - std::unique_ptr _labels = nullptr; + std::unique_ptr _labels = nullptr; std::vector _colorRangeData; std::unordered_map _optionConversionMap; diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index 17922c46df..5f57993aec 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -143,7 +143,7 @@ namespace { // [[codegen::verbatim(LabelsInfo.description)]] std::optional labels - [[codegen::reference("space_specklabels")]]; + [[codegen::reference("space_labelscomponent")]]; // [[codegen::verbatim(TransformationMatrixInfo.description)]] std::optional transformationMatrix; @@ -239,7 +239,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary _scaleFactor.onChange([&]() { _dataIsDirty = true; }); if (p.labels.has_value()) { - _labels = std::make_unique(*p.labels); + _labels = std::make_unique(*p.labels); _hasLabels = true; addPropertySubOwner(_labels.get()); } diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h index a931ef7fcd..45e6d6e5a4 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.h +++ b/modules/digitaluniverse/rendering/renderableplanescloud.h @@ -27,7 +27,7 @@ #include -#include +#include #include #include #include @@ -115,7 +115,7 @@ private: speck::Dataset _dataset; // Everything related to the labels are handles by speck::SpeckLabels - std::unique_ptr _labels = nullptr; + std::unique_ptr _labels = nullptr; float _sluminosity = 1.f; diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt index 7c88d63ea9..73673fffd0 100644 --- a/modules/space/CMakeLists.txt +++ b/modules/space/CMakeLists.txt @@ -27,7 +27,7 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES horizonsfile.h kepler.h - specklabels.h + labelscomponent.h speckloader.h rendering/renderableconstellationsbase.h rendering/renderableconstellationbounds.h @@ -50,7 +50,7 @@ set(SOURCE_FILES horizonsfile.cpp kepler.cpp spacemodule_lua.inl - specklabels.cpp + labelscomponent.cpp speckloader.cpp rendering/renderableconstellationsbase.cpp rendering/renderableconstellationbounds.cpp diff --git a/modules/space/specklabels.cpp b/modules/space/labelscomponent.cpp similarity index 91% rename from modules/space/specklabels.cpp rename to modules/space/labelscomponent.cpp index e6e8d06c60..d3316650d4 100644 --- a/modules/space/specklabels.cpp +++ b/modules/space/labelscomponent.cpp @@ -22,7 +22,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#include +#include #include #include @@ -77,7 +77,7 @@ namespace { "Debug option for rendering of billboards and texts" }; - struct [[codegen::Dictionary(SpeckLabels)]] Parameters { + struct [[codegen::Dictionary(LabelsComponent)]] Parameters { // [[codegen::verbatim(FileInfo.description)]] std::filesystem::path file; @@ -104,16 +104,16 @@ namespace { }; std::optional unit; }; -#include "specklabels_codegen.cpp" +#include "labelscomponent_codegen.cpp" } // namespace namespace openspace::speck { -documentation::Documentation SpeckLabels::Documentation() { - return codegen::doc("space_specklabels"); +documentation::Documentation LabelsComponent::Documentation() { + return codegen::doc("space_labelscomponent"); } -SpeckLabels::SpeckLabels(const ghoul::Dictionary& dictionary) +LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary) : properties::PropertyOwner({ "Labels" }) , _opacity(OpacityInfo, 1.f, 0.f, 1.f) , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) @@ -164,15 +164,15 @@ SpeckLabels::SpeckLabels(const ghoul::Dictionary& dictionary) addProperty(_renderOption); } -speck::Labelset& SpeckLabels::labelSet() { +speck::Labelset& LabelsComponent::labelSet() { return _labelset; } -const speck::Labelset& SpeckLabels::labelSet() const { +const speck::Labelset& LabelsComponent::labelSet() const { return _labelset; } -void SpeckLabels::initialize() { +void LabelsComponent::initialize() { if (!_font) { constexpr int FontSize = 50; _font = global::fontManager->font( @@ -184,16 +184,16 @@ void SpeckLabels::initialize() { } } -void SpeckLabels::loadLabels() { - LINFOC("SpeckLabels", fmt::format("Loading Label file {}", _labelFile)); +void LabelsComponent::loadLabels() { + LINFOC("LabelsComponent", fmt::format("Loading Label file {}", _labelFile)); _labelset = speck::label::loadFileWithCache(_labelFile); } -bool SpeckLabels::isReady() const { +bool LabelsComponent::isReady() const { return !(_labelset.entries.empty()); } -void SpeckLabels::render(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix, +void LabelsComponent::render(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix, const glm::vec3& orthoRight, const glm::vec3& orthoUp, float fadeInVariable) { diff --git a/modules/space/specklabels.h b/modules/space/labelscomponent.h similarity index 91% rename from modules/space/specklabels.h rename to modules/space/labelscomponent.h index f59b9b806c..ed41c5c851 100644 --- a/modules/space/specklabels.h +++ b/modules/space/labelscomponent.h @@ -22,8 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ -#ifndef __OPENSPACE_MODULE_SPACE___SPECKLABELS___H__ -#define __OPENSPACE_MODULE_SPACE___SPECKLABELS___H__ +#ifndef __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__ +#define __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__ #include @@ -45,10 +45,10 @@ namespace documentation { struct Documentation; } namespace speck { -class SpeckLabels : public properties::PropertyOwner { +class LabelsComponent : public properties::PropertyOwner { public: - explicit SpeckLabels(const ghoul::Dictionary& dictionary); - ~SpeckLabels() override = default; + explicit LabelsComponent(const ghoul::Dictionary& dictionary); + ~LabelsComponent() override = default; speck::Labelset& labelSet(); const speck::Labelset& labelSet() const; @@ -86,4 +86,4 @@ private: } // namespace openspace -#endif // __OPENSPACE_MODULE_SPACE___SPECKLABELS___H__ +#endif // __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__ diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp index a715d17db3..0fea93bc6c 100644 --- a/modules/space/rendering/renderableconstellationsbase.cpp +++ b/modules/space/rendering/renderableconstellationsbase.cpp @@ -85,7 +85,7 @@ namespace { // [[codegen::verbatim(LabelsInfo.description)]] std::optional labels - [[codegen::reference("space_specklabels")]]; + [[codegen::reference("space_labelscomponent")]]; }; #include "renderableconstellationsbase_codegen.cpp" } // namespace @@ -122,7 +122,7 @@ RenderableConstellationsBase::RenderableConstellationsBase(const ghoul::Dictiona _drawLabels = p.drawLabels.value_or(_drawLabels); addProperty(_drawLabels); - _labels = std::make_unique(*p.labels); + _labels = std::make_unique(*p.labels); _hasLabels = true; addPropertySubOwner(_labels.get()); } diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h index a000a3fd7b..67f24929f4 100644 --- a/modules/space/rendering/renderableconstellationsbase.h +++ b/modules/space/rendering/renderableconstellationsbase.h @@ -27,7 +27,7 @@ #include -#include +#include #include #include #include @@ -106,7 +106,7 @@ private: properties::StringProperty _namesFilename; // Everything related to the labels are handles by speck::SpeckLabels - std::unique_ptr _labels = nullptr; + std::unique_ptr _labels = nullptr; }; } // namespace openspace diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index 7cd75c0e56..62da19b9b8 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -24,6 +24,7 @@ #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -129,7 +129,7 @@ std::vector SpaceModule::documentations() const { RenderableTravelSpeed::Documentation(), SpiceRotation::Documentation(), SpiceTranslation::Documentation(), - speck::SpeckLabels::Documentation(), + speck::LabelsComponent::Documentation(), GPTranslation::Documentation() }; }