From 3a9716a535b34c7a44aeb970f819b0d106ec2ee7 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 28 Nov 2023 21:37:52 +0100 Subject: [PATCH] No need to use the .set method of properties directly --- include/openspace/properties/triggerproperty.h | 5 +++++ modules/base/rendering/renderablemodel.cpp | 2 +- modules/base/rendering/screenspaceframebuffer.cpp | 2 +- .../digitaluniverse/rendering/renderableplanescloud.cpp | 2 +- modules/server/src/serverinterface.cpp | 2 +- modules/skybrowser/src/browser.cpp | 2 +- modules/space/translation/horizonstranslation.cpp | 2 +- modules/spout/spoutwrapper.cpp | 2 +- src/navigation/orbitalnavigator.cpp | 8 ++++---- src/properties/triggerproperty.cpp | 4 ++++ 10 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h index 6e5210cbd7..225663e965 100644 --- a/include/openspace/properties/triggerproperty.h +++ b/include/openspace/properties/triggerproperty.h @@ -69,6 +69,11 @@ public: */ void set(std::any value) override; + /** + * Triggers this TriggerProperty. + */ + void trigger(); + std::string jsonValue() const override; }; diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index c745d57273..1264099bd2 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -526,7 +526,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) if (p.blendingOption.has_value()) { const std::string blendingOpt = *p.blendingOption; - _blendingFuncOption.set(BlendingMapping[blendingOpt]); + _blendingFuncOption = BlendingMapping[blendingOpt]; } _originalRenderBin = renderBin(); diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index 5da3fffb18..8628def58c 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -82,7 +82,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution(); addProperty(_size); - _size.set(glm::vec4(0.f, 0.f, resolution.x, resolution.y)); + _size = glm::vec4(0.f, 0.f, resolution.x, resolution.y); } ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {} diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index ac884fe09f..fe16144353 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -238,7 +238,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary _renderOption.addOption(1, "Camera Position Normal"); _renderOption.addOption(2, "Screen center Position Normal"); addProperty(_renderOption); - //_renderOption.set(1); + //_renderOption = 1; if (p.unit.has_value()) { _unit = codegen::map(*p.unit); diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index 048adb7283..ce666a402f 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -163,7 +163,7 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config) for (std::string_view k : dict.keys()) { v.push_back(dict.value(k)); } - list.set(v); + list = v; } }; diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp index 2250c609cc..3dd9ae04a0 100644 --- a/modules/skybrowser/src/browser.cpp +++ b/modules/skybrowser/src/browser.cpp @@ -185,7 +185,7 @@ void Browser::updateBrowserSize() { } void Browser::reload() { - _reload.set(true); + _reload.trigger(); } void Browser::setRatio(float ratio) { diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp index 8065361403..f65ecfe5fd 100644 --- a/modules/space/translation/horizonstranslation.cpp +++ b/modules/space/translation/horizonstranslation.cpp @@ -91,7 +91,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary) std::vector files; files.push_back(file); - _horizonsTextFiles.set(files); + _horizonsTextFiles = files; } else if (std::holds_alternative>(p.horizonsTextFile)) { std::vector files = diff --git a/modules/spout/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp index 543a339fd0..ff51447a49 100644 --- a/modules/spout/spoutwrapper.cpp +++ b/modules/spout/spoutwrapper.cpp @@ -387,7 +387,7 @@ SpoutReceiverPropertyProxy::SpoutReceiverPropertyProxy(properties::PropertyOwner }); owner.addProperty(_updateSelection); - _updateSelection.set(0); + _updateSelection.trigger(); } SpoutReceiverPropertyProxy::~SpoutReceiverPropertyProxy() {} diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp index d4b663dae6..bfbf5df90c 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator.cpp @@ -1089,8 +1089,8 @@ void OrbitalNavigator::setFocusNode(const SceneGraphNode* focusNode, } void OrbitalNavigator::setFocusNode(const std::string& focusNode, bool) { - _anchor.set(focusNode); - _aim.set(std::string("")); + _anchor = focusNode; + _aim = std::string(""); } void OrbitalNavigator::setAnchorNode(const SceneGraphNode* anchorNode, @@ -1128,11 +1128,11 @@ void OrbitalNavigator::setAimNode(const SceneGraphNode* aimNode) { } void OrbitalNavigator::setAnchorNode(const std::string& anchorNode) { - _anchor.set(anchorNode); + _anchor = anchorNode; } void OrbitalNavigator::setAimNode(const std::string& aimNode) { - _aim.set(aimNode); + _aim = aimNode; } void OrbitalNavigator::updatePreviousAnchorState() { diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp index 9399c839ec..f2c738b352 100644 --- a/src/properties/triggerproperty.cpp +++ b/src/properties/triggerproperty.cpp @@ -42,6 +42,10 @@ void TriggerProperty::set(std::any) { notifyChangeListeners(); } +void TriggerProperty::trigger() { + notifyChangeListeners(); +} + std::string TriggerProperty::jsonValue() const { return "true"; }