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

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

19
modules/base/rendering/screenspaceframebuffer.cpp
View File

@@ -65,12 +65,21 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
"ScreenSpaceFramebuffer"
);
_id = id();
if (_id == 0) {
setName("ScreenSpaceFramebuffer");
int iIdentifier = 0;
if (_identifier.empty()) {
iIdentifier = id();
if (iIdentifier == 0) {
setIdentifier("ScreenSpaceFramebuffer");
}
else {
setIdentifier("ScreenSpaceFramebuffer" + std::to_string(iIdentifier));
}
}
else {
setName("ScreenSpaceFramebuffer " + std::to_string(_id));
if (_guiName.empty()) {
// Adding an extra space to the user-facing name as it looks nicer
setGuiName("ScreenSpaceFramebuffer " + std::to_string(iIdentifier));
}
glm::vec2 resolution = OsEng.windowWrapper().currentWindowResolution();