mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-15 08:21:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/cleanup (#837)

Browse Source 
* Style guide fixes
* Various cleanups
* Update SGCT
This commit is contained in:
Alexander Bock
2019-05-03 13:27:43 +02:00
committed by GitHub
parent 6a6db9aa78
commit 595cbc4bcf
39 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/openspaceengine.cpp
View File

@@ -155,10 +155,9 @@ void OpenSpaceEngine::registerPathTokens() {
LTRACE("OpenSpaceEngine::initialize(begin)");
// Registering Path tokens. If the BASE path is set, it is the only one that will
// overwrite the default path of the cfg directory
for (const std::pair<std::string, std::string>& path :
global::configuration.pathTokens)
{
// overwrite the default path of the cfg directory
using T = std::string;
for (const std::pair<const T, T>& path : global::configuration.pathTokens) {
std::string fullKey = ghoul::filesystem::FileSystem::TokenOpeningBraces +
path.first +
ghoul::filesystem::FileSystem::TokenClosingBraces;
@@ -881,7 +880,8 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
void OpenSpaceEngine::loadFonts() {
global::fontManager.initialize();
for (const std::pair<std::string, std::string>& font : global::configuration.fonts) {
using T = std::string;
for (const std::pair<const T, T>& font : global::configuration.fonts) {
std::string key = font.first;
std::string fontName = absPath(font.second);