Issue/453 (#556)

* 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
+13 -13
View File
@@ -49,18 +49,18 @@ OpenSpaceModule::OpenSpaceModule(std::string name)
void OpenSpaceModule::initialize(const ModuleEngine* moduleEngine,
const ghoul::Dictionary& configuration)
{
std::string upperName = name();
std::string upperIdentifier = identifier();
std::transform(
upperName.begin(),
upperName.end(),
upperName.begin(),
upperIdentifier.begin(),
upperIdentifier.end(),
upperIdentifier.begin(),
[](char v) { return static_cast<char>(toupper(v)); }
);
std::string moduleToken =
ghoul::filesystem::FileSystem::TokenOpeningBraces +
std::string(ModuleBaseToken) +
upperName +
upperIdentifier +
ghoul::filesystem::FileSystem::TokenClosingBraces;
std::string path = modulePath();
@@ -92,21 +92,21 @@ ghoul::systemcapabilities::Version OpenSpaceModule::requiredOpenGLVersion() cons
}
std::string OpenSpaceModule::modulePath() const {
std::string moduleName = name();
std::string moduleIdentifier = identifier();
std::transform(
moduleName.begin(),
moduleName.end(),
moduleName.begin(),
moduleIdentifier.begin(),
moduleIdentifier.end(),
moduleIdentifier.begin(),
[](char v) { return static_cast<char>(tolower(v)); }
);
// First try the internal module directory
if (FileSys.directoryExists(absPath("${MODULES}/" + moduleName))) {
return absPath("${MODULES}/" + moduleName);
if (FileSys.directoryExists(absPath("${MODULES}/" + moduleIdentifier))) {
return absPath("${MODULES}/" + moduleIdentifier);
}
else { // Otherwise, it might be one of the external directories
for (const char* dir : ModulePaths) {
const std::string path = std::string(dir) + '/' + moduleName;
const std::string path = std::string(dir) + '/' + moduleIdentifier;
if (FileSys.directoryExists(absPath(path))) {
return absPath(path);
}
@@ -115,7 +115,7 @@ std::string OpenSpaceModule::modulePath() const {
// If we got this far, neither the internal module nor any of the external modules fit
throw ghoul::RuntimeError(
"Could not resolve path for module '" + name() + "'",
"Could not resolve path for module '" + identifier() + "'",
"OpenSpaceModule"
);
}