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

Always add Gui properties for SceneGraphNodes; Initialize GuiPath with /

Browse Source
This commit is contained in:
Alexander Bock
2023-01-26 21:16:46 +01:00
parent f1e2765da9
commit 00a63e528f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scene/scenegraphnode.cpp
View File

@@ -301,24 +301,24 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
if (p.gui->name.has_value()) {
result->setGuiName(*p.gui->name);
result->_guiDisplayName = result->guiName();
result->addProperty(result->_guiDisplayName);
}
result->addProperty(result->_guiDisplayName);
if (p.gui->description.has_value()) {
result->setDescription(*p.gui->description);
result->_guiDescription = result->description();
result->addProperty(result->_guiDescription);
}
result->addProperty(result->_guiDescription);
if (p.gui->hidden.has_value()) {
result->_guiHidden = *p.gui->hidden;
result->addProperty(result->_guiHidden);
}
result->addProperty(result->_guiHidden);
if (p.gui->path.has_value()) {
result->_guiPath = *p.gui->path;
result->addProperty(result->_guiPath);
}
result->addProperty(result->_guiPath);
}
result->_boundingSphere = p.boundingSphere.value_or(result->_boundingSphere);
@@ -485,7 +485,7 @@ ghoul::opengl::ProgramObject* SceneGraphNode::_debugSphereProgram = nullptr;
SceneGraphNode::SceneGraphNode()
: properties::PropertyOwner({ "" })
, _guiHidden(GuiHiddenInfo)
, _guiPath(GuiPathInfo)
, _guiPath(GuiPathInfo, "/")
, _guiDisplayName(GuiNameInfo)
, _guiDescription(GuiDescriptionInfo)
, _transform {