mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-13 15:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename GuiGrouping to GuiPath

Browse Source 
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
This commit is contained in:
Alexander Bock
2017-10-13 13:08:59 -04:00
parent ebd506975c
commit bb5f4d4381
57 changed files with 600 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scene/scenegraphnode.cpp
View File

@@ -56,7 +56,7 @@
namespace {
const char* _loggerCat = "SceneGraphNode";
const char* KeyRenderable = "Renderable";
const char* KeyGuiGrouping = "GuiGrouping";
const char* KeyGuiPath = "GuiPath";
const char* keyTransformTranslation = "Transform.Translation";
const char* keyTransformRotation = "Transform.Rotation";
@@ -160,8 +160,8 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(const ghoul
}
}
if (dictionary.hasKey(KeyGuiGrouping)) {
result->_guiGroup = dictionary.value<std::string>(KeyGuiGrouping);
if (dictionary.hasKey(KeyGuiPath)) {
result->_guiPath = dictionary.value<std::string>(KeyGuiPath);
}
LDEBUG("Successfully created SceneGraphNode '"
@@ -531,8 +531,8 @@ double SceneGraphNode::worldScale() const {
return _worldScaleCached;
}
const std::string& SceneGraphNode::guiGroup() const {
return _guiGroup;
const std::string& SceneGraphNode::guiPath() const {
return _guiPath;
}
glm::dvec3 SceneGraphNode::calculateWorldPosition() const {

2
src/scene/scenegraphnode_doc.inl
View File

@@ -100,7 +100,7 @@ documentation::Documentation SceneGraphNode::Documentation() {
"corresponding to a 'Translation', a 'Rotation', and a 'Scale'."
},
{
"GuiGrouping",
"GuiPath",
new StringVerifier,
Optional::Yes,
"If this value is specified, this '/' separated URI specifies the location "