mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 22:50:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to removal of Singleton

Browse Source
This commit is contained in:
Alexander Bock
2018-11-05 14:17:42 -05:00
parent a130b0b7a0
commit cf593bd060
13 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/engine/openspaceengine.cpp
View File

@@ -73,6 +73,7 @@
#include <ghoul/logging/consolelog.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/logging/visualstudiooutputlog.h>
#include <ghoul/misc/stringconversion.h>
#include <ghoul/opengl/debugcontext.h>
#include <ghoul/opengl/shaderpreprocessor.h>
#include <ghoul/opengl/texture.h>
@@ -223,7 +224,7 @@ void OpenSpaceEngine::initialize() {
ghoul::logging::LogManager::deinitialize();
}
ghoul::logging::LogLevel level = ghoul::logging::levelFromString(
ghoul::logging::LogLevel level = ghoul::from_string<ghoul::logging::LogLevel>(
global::configuration.logging.level
);
bool immediateFlush = global::configuration.logging.forceImmediateFlush;
@@ -550,8 +551,8 @@ void OpenSpaceEngine::initializeGL() {
if (global::configuration.isLoggingOpenGLCalls) {
using namespace ghoul::logging;
LogLevel level = levelFromString(global::configuration.logging.level);
if (level > LogLevel::Trace) {
LogLevel lvl = ghoul::from_string<LogLevel>(global::configuration.logging.level);
if (lvl > LogLevel::Trace) {
LWARNING(
"Logging OpenGL calls is enabled, but the selected log level does "
"not include TRACE, so no OpenGL logs will be printed");