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

Update renderable to codegen change

Browse Source
This commit is contained in:
Emma Broman
2021-02-10 11:15:48 +01:00
parent bc151f62b3
commit dafa7157eb
1 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
modules/softwareintegration/rendering/renderablepointscloud.cpp
View File

@@ -29,19 +29,16 @@
#include <openspace/rendering/renderengine.h>
#include <openspace/util/distanceconstants.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/filesystem/cachemanager.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/openglstatecache.h>
#include <ghoul/opengl/programobject.h>
#include <fstream>
#include <optional>
namespace {
constexpr const char* _loggerCat = "PointsCloud";
constexpr int8_t CurrentCacheVersion = 1;
constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
"Color",
"Color",
@@ -65,42 +62,29 @@ namespace {
"Data",
"Data to use for the positions of the points, given in Parsec."
};
struct [[codegen::Dictionary(RenderablePointsCloud)]] Parameters {
// [[codegen::verbatim(ColorInfo.description)]]
std::optional<glm::vec3> color;
// [[codegen::verbatim(SizeInfo.description)]]
std::optional<float> size;
// [[codegen::verbatim(ToggleVisibilityInfo.description)]]
std::optional<bool> toggleVisiblity;
// [[codegen::verbatim(DataInfo.description)]]
std::vector<glm::vec3> data;
};
#include "renderablepointscloud_codegen.cpp"
} // namespace
namespace openspace {
documentation::Documentation RenderablePointsCloud::Documentation() {
using namespace documentation;
return {
"RenderablePointsCloud",
"softwareintegration_renderable_pointscloud",
{
{
ColorInfo.identifier,
new DoubleVector3Verifier,
Optional::Yes,
ColorInfo.description
},
{
SizeInfo.identifier,
new DoubleVerifier,
Optional::Yes,
SizeInfo.description
},
{
ToggleVisibilityInfo.identifier,
new BoolVerifier,
Optional::Yes,
ToggleVisibilityInfo.description
},
{
DataInfo.identifier,
new Vector3ListVerifier<double>,
Optional::No,
DataInfo.description
}
}
};
documentation::Documentation doc = codegen::doc<Parameters>();
doc.id = "softwareintegration_renderable_pointscloud";
return doc;
}
RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary)
@@ -109,15 +93,9 @@ RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary
, _size(SizeInfo, 1.f, 0.f, 150.f)
, _isVisible(ToggleVisibilityInfo, true)
{
documentation::testSpecificationAndThrow(
Documentation(),
dictionary,
"RenderablePointsCloud"
);
const Parameters p = codegen::bake<Parameters>(dictionary);
if (dictionary.hasKey(ColorInfo.identifier)) {
_color = dictionary.value<glm::dvec3>(ColorInfo.identifier);
}
_color = p.color.value_or(_color);
_color.setViewOption(properties::Property::ViewOptions::Color);
addProperty(_color);
@@ -127,17 +105,13 @@ RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary
_pointData.push_back(d.value<glm::dvec3>(key));
}
addProperty(_opacity);
if (dictionary.hasKey(SizeInfo.identifier)) {
_size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
}
_size = p.size.value_or(_size);
addProperty(_size);
if (dictionary.hasKey(ToggleVisibilityInfo.identifier)) {
_isVisible = dictionary.value<bool>(ToggleVisibilityInfo.identifier);
}
_isVisible = p.toggleVisiblity.value_or(_isVisible);
addProperty(_isVisible);
addProperty(_opacity);
}
bool RenderablePointsCloud::isReady() const {