mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change name from SpeckLabels to LabelsComponent

Browse Source
This commit is contained in:
Malin E
2022-09-08 10:08:39 +02:00
parent 6478f0a92c
commit 0d6f4ecac0
10 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/space/rendering/renderableconstellationsbase.cpp
View File

@@ -85,7 +85,7 @@ namespace {
// [[codegen::verbatim(LabelsInfo.description)]]
std::optional<ghoul::Dictionary> 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<speck::SpeckLabels>(*p.labels);
_labels = std::make_unique<speck::LabelsComponent>(*p.labels);
_hasLabels = true;
addPropertySubOwner(_labels.get());
}

4
modules/space/rendering/renderableconstellationsbase.h
View File

@@ -27,7 +27,7 @@
#include <openspace/rendering/renderable.h>
#include <modules/space/specklabels.h>
#include <modules/space/labelscomponent.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/selectionproperty.h>
#include <openspace/properties/vector/vec3property.h>
@@ -106,7 +106,7 @@ private:
properties::StringProperty _namesFilename;
// Everything related to the labels are handles by speck::SpeckLabels
std::unique_ptr<speck::SpeckLabels> _labels = nullptr;
std::unique_ptr<speck::LabelsComponent> _labels = nullptr;
};
} // namespace openspace