Collection of a number of changes (#2286)

* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
This commit is contained in:
Alexander Bock
2022-10-30 12:54:14 +01:00
committed by GitHub
parent 3862e1f449
commit 6249fa6d89
129 changed files with 467 additions and 761 deletions
@@ -93,9 +93,7 @@ void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
}
if (_property) {
std::string value;
_property->getStringValue(value);
std::string value = _property->stringValue();
RenderFont(
*_font,
penPosition,
@@ -67,20 +67,6 @@ SceneGraphLightSource::SceneGraphLightSource()
, _sceneGraphNodeReference(NodeInfo, "")
{
addProperty(_intensity);
addProperty(_sceneGraphNodeReference);
}
SceneGraphLightSource::SceneGraphLightSource(const ghoul::Dictionary& dictionary)
: LightSource(dictionary)
, _intensity(IntensityInfo, 1.f, 0.f, 1.f)
, _sceneGraphNodeReference(NodeInfo, "")
{
const Parameters p = codegen::bake<Parameters>(dictionary);
_intensity = p.intensity.value_or(_intensity);
addProperty(_intensity);
_sceneGraphNodeReference = p.node;
_sceneGraphNodeReference.onChange([this]() {
_sceneGraphNode =
global::renderEngine->scene()->sceneGraphNode(_sceneGraphNodeReference);
@@ -88,6 +74,14 @@ SceneGraphLightSource::SceneGraphLightSource(const ghoul::Dictionary& dictionary
addProperty(_sceneGraphNodeReference);
}
SceneGraphLightSource::SceneGraphLightSource(const ghoul::Dictionary& dictionary)
: SceneGraphLightSource()
{
const Parameters p = codegen::bake<Parameters>(dictionary);
_intensity = p.intensity.value_or(_intensity);
_sceneGraphNodeReference = p.node;
}
bool SceneGraphLightSource::initialize() {
ZoneScoped
@@ -83,7 +83,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
_size.set(glm::vec4(0.f, 0.f, resolution.x, resolution.y));
}
ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {} // NOLINT
ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {}
bool ScreenSpaceFramebuffer::initializeGL() {
ScreenSpaceRenderable::initializeGL();
@@ -83,7 +83,7 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
addProperty(_texturePath);
}
ScreenSpaceImageOnline::~ScreenSpaceImageOnline() {} // NOLINT
ScreenSpaceImageOnline::~ScreenSpaceImageOnline() {}
bool ScreenSpaceImageOnline::deinitializeGL() {
_texture = nullptr;