mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 20:39:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename RenderableLabels to RenderableLabel

Browse Source 
* Since it only creates one label and not several
This commit is contained in:
Malin E
2022-08-31 17:02:35 +02:00
parent 47b36e5036
commit 14347cfaba
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/CMakeLists.txt
+2 -2
View File
@@ -44,7 +44,7 @@ set(HEADER_FILES
rendering/grids/renderablesphericalgrid.h
rendering/renderablecartesianaxes.h
rendering/renderabledisc.h
rendering/renderablelabels.h
rendering/renderablelabel.h
rendering/renderablemodel.h
rendering/renderablenodeline.h
rendering/renderableplane.h
@@ -98,7 +98,7 @@ set(SOURCE_FILES
rendering/grids/renderablesphericalgrid.cpp
rendering/renderablecartesianaxes.cpp
rendering/renderabledisc.cpp
rendering/renderablelabels.cpp
rendering/renderablelabel.cpp
rendering/renderablemodel.cpp
rendering/renderablenodeline.cpp
rendering/renderableplane.cpp
modules/base/basemodule.cpp
+3 -3
View File
@@ -43,7 +43,7 @@
#include <modules/base/rendering/grids/renderablesphericalgrid.h>
#include <modules/base/rendering/renderablecartesianaxes.h>
#include <modules/base/rendering/renderabledisc.h>
#include <modules/base/rendering/renderablelabels.h>
#include <modules/base/rendering/renderablelabel.h>
#include <modules/base/rendering/renderablemodel.h>
#include <modules/base/rendering/renderablenodeline.h>
#include <modules/base/rendering/renderablesphere.h>
@@ -129,7 +129,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
fRenderable->registerClass<RenderableCartesianAxes>("RenderableCartesianAxes");
fRenderable->registerClass<RenderableDisc>("RenderableDisc");
fRenderable->registerClass<RenderableGrid>("RenderableGrid");
fRenderable->registerClass<RenderableLabels>("RenderableLabels");
fRenderable->registerClass<RenderableLabel>("RenderableLabel");
fRenderable->registerClass<RenderableModel>("RenderableModel");
fRenderable->registerClass<RenderableNodeLine>("RenderableNodeLine");
fRenderable->registerClass<RenderablePlaneImageLocal>("RenderablePlaneImageLocal");
@@ -212,7 +212,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
RenderableCartesianAxes::Documentation(),
RenderableDisc::Documentation(),
RenderableGrid::Documentation(),
RenderableLabels::Documentation(),
RenderableLabel::Documentation(),
RenderableModel::Documentation(),
RenderableNodeLine::Documentation(),
RenderablePlane::Documentation(),
modules/base/rendering/renderablelabels.cpp → modules/base/rendering/renderablelabel.cpp
+15 -15
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/base/rendering/renderablelabels.h>
#include <modules/base/rendering/renderablelabel.h>
#include <modules/base/basemodule.h>
#include <openspace/documentation/documentation.h>
@@ -166,7 +166,7 @@ namespace {
"Distance unit for fade-in/-out distance calculations. Defaults to \"au\""
};
struct [[codegen::Dictionary(RenderableLabels)]] Parameters {
struct [[codegen::Dictionary(RenderableLabel)]] Parameters {
enum class [[codegen::map(BlendMode)]] BlendMode {
Normal,
Additive
@@ -228,16 +228,16 @@ namespace {
// [[codegen::verbatim(FadeWidthsInfo.description)]]
std::optional<glm::vec2> fadeWidths;
};
#include "renderablelabels_codegen.cpp"
#include "renderablelabel_codegen.cpp"
} // namespace
namespace openspace {
documentation::Documentation RenderableLabels::Documentation() {
documentation::Documentation RenderableLabel::Documentation() {
return codegen::doc<Parameters>("base_renderable_labels");
}
RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
: Renderable(dictionary)
, _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
, _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -357,17 +357,17 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
addProperty(_fadeWidths);
}
bool RenderableLabels::isReady() const {
bool RenderableLabel::isReady() const {
return true;
}
void RenderableLabels::initialize() {
void RenderableLabel::initialize() {
ZoneScoped
setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
}
void RenderableLabels::initializeGL() {
void RenderableLabel::initializeGL() {
if (_font == nullptr) {
_font = global::fontManager->font(
"Mono",
@@ -378,9 +378,9 @@ void RenderableLabels::initializeGL() {
}
}
void RenderableLabels::deinitializeGL() {}
void RenderableLabel::deinitializeGL() {}
void RenderableLabels::render(const RenderData& data, RendererTasks&) {
void RenderableLabel::render(const RenderData& data, RendererTasks&) {
glDepthMask(true);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
@@ -421,11 +421,11 @@ void RenderableLabels::render(const RenderData& data, RendererTasks&) {
}
void RenderableLabels::setLabelText(const std::string & newText) {
void RenderableLabel::setLabelText(const std::string & newText) {
_text = newText;
}
void RenderableLabels::renderLabels(const RenderData& data,
void RenderableLabel::renderLabels(const RenderData& data,
const glm::dmat4& modelViewProjectionMatrix,
const glm::dvec3& orthoRight,
const glm::dvec3& orthoUp, float fadeInVariable)
@@ -463,7 +463,7 @@ void RenderableLabels::renderLabels(const RenderData& data,
);
}
float RenderableLabels::computeFadeFactor(float distanceNodeToCamera) const {
float RenderableLabel::computeFadeFactor(float distanceNodeToCamera) const {
float distanceUnit = unit(_fadeUnitOption);
float x = distanceNodeToCamera;
@@ -487,7 +487,7 @@ float RenderableLabels::computeFadeFactor(float distanceNodeToCamera) const {
}
}
float RenderableLabels::unit(int unit) const {
float RenderableLabel::unit(int unit) const {
switch (static_cast<Unit>(unit)) {
case Meter: return 1.f;
case Kilometer: return 1e3f;
@@ -505,7 +505,7 @@ float RenderableLabels::unit(int unit) const {
}
}
std::string_view RenderableLabels::toString(int unit) const {
std::string_view RenderableLabel::toString(int unit) const {
switch (static_cast<Unit>(unit)) {
case Meter: return MeterUnit;
case Kilometer: return KilometerUnit;
modules/base/rendering/renderablelabels.h → modules/base/rendering/renderablelabel.h
+5 -5
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_BASE___RENDERABLELABELS___H__
#define __OPENSPACE_MODULE_BASE___RENDERABLELABELS___H__
#ifndef __OPENSPACE_MODULE_BASE___RenderableLabel___H__
#define __OPENSPACE_MODULE_BASE___RenderableLabel___H__
#include <openspace/rendering/renderable.h>
@@ -54,9 +54,9 @@ namespace documentation { struct Documentation; }
struct LinePoint;
class RenderableLabels : public Renderable {
class RenderableLabel : public Renderable {
public:
RenderableLabels(const ghoul::Dictionary& dictionary);
RenderableLabel(const ghoul::Dictionary& dictionary);
void initialize() override;
void initializeGL() override;
@@ -111,4 +111,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___RENDERABLELABELS___H__
#endif // __OPENSPACE_MODULE_BASE___RenderableLabel___H__