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

Issue/453 (#556)

Browse Source 
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
This commit is contained in:
Alexander Bock
2018-03-16 09:21:29 -04:00
committed by GitHub
parent 7a93a4fa37
commit db7ae7e384
234 changed files with 2921 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/spout/renderableplanespout.cpp
View File

@@ -99,19 +99,25 @@ RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
"RenderablePlaneSpout"
);
if (dictionary.hasKey(KeyName)) {
setName(dictionary.value<std::string>(KeyName));
}
else {
int iIdentifier = 0;
if (_identifier.empty()) {
static int id = 0;
if (id == 0) {
setName("ScreenSpaceSpout");
iIdentifier = id;
if (iIdentifier == 0) {
setIdentifier("ScreenSpaceSpout");
}
else {
setName("ScreenSpaceSpout " + std::to_string(id));
setIdentifier("ScreenSpaceSpout" + std::to_string(iIdentifier));
}
++id;
}
if (_guiName.empty()) {
// Adding an extra space to the user-facing name as it looks nicer
setGuiName("ScreenSpaceSpout " + std::to_string(iIdentifier));
}
_isSpoutDirty = true;
if (dictionary.hasKey(NameInfo.identifier)) {