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

Merge branch 'master' into feature/loadingscreen-refactor

Browse Source
This commit is contained in:
Alexander Bock
2017-11-09 22:49:07 -06:00
committed by GitHub
parent 0015cbb6f6 afa1d6d33e
commit 7e4bb0b2c6
246 changed files with 4256 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/engine/openspaceengine.cpp
View File

@@ -910,7 +910,7 @@ void OpenSpaceEngine::configureLogging() {
ConfigurationManager::KeyLogging + '.' + ConfigurationManager::PartLogLevel;
const std::string KeyLogImmediateFlush =
ConfigurationManager::KeyLogging + '.' + ConfigurationManager::PartImmediateFlush;
const std::string KeyLogs =
const std::string KeyLogs =
ConfigurationManager::KeyLogging + '.' + ConfigurationManager::PartLogs;
if (configurationManager().hasKeyAndValue<std::string>(KeyLogLevel)) {
@@ -1087,7 +1087,7 @@ void OpenSpaceEngine::initializeGL() {
// The ordering of the KeyCheckOpenGLState and KeyLogEachOpenGLCall are important as
// the callback mask in glbinding is stateful for each context, and since
// KeyLogEachOpenGLCall is more specific, we want it to be able to overwrite the
// KeyLogEachOpenGLCall is more specific, we want it to be able to overwrite the
// state from KeyCheckOpenGLState
if (_configurationManager->hasKey(ConfigurationManager::KeyCheckOpenGLState)) {
const bool val = _configurationManager->value<bool>(
@@ -1292,18 +1292,11 @@ void OpenSpaceEngine::render(const glm::mat4& sceneMatrix,
func();
}
if (isGuiWindow && _shutdown.inShutdown) {
_renderEngine->renderShutdownInformation(_shutdown.timer, _shutdown.waitTime);
}
LTRACE("OpenSpaceEngine::render(end)");
}
void OpenSpaceEngine::postDraw() {
LTRACE("OpenSpaceEngine::postDraw(begin)");
_renderEngine->postDraw();
void OpenSpaceEngine::drawOverlays() {
LTRACE("OpenSpaceEngine::drawOverlays(begin)");
const bool isGuiWindow =
_windowWrapper->hasGuiWindow() ? _windowWrapper->isGuiWindow() : true;
@@ -1319,6 +1312,18 @@ void OpenSpaceEngine::postDraw() {
_console->render();
}
for (const auto& func : _moduleCallbacks.draw2D) {
func();
}
LTRACE("OpenSpaceEngine::drawOverlays(end)");
}
void OpenSpaceEngine::postDraw() {
LTRACE("OpenSpaceEngine::postDraw(begin)");
_renderEngine->postDraw();
for (const auto& func : _moduleCallbacks.postDraw) {
func();
}
@@ -1328,6 +1333,7 @@ void OpenSpaceEngine::postDraw() {
_isFirstRenderingFirstFrame = false;
}
LTRACE("OpenSpaceEngine::postDraw(end)");
}
@@ -1508,6 +1514,9 @@ void OpenSpaceEngine::registerModuleCallback(OpenSpaceEngine::CallbackOption opt
case CallbackOption::Render:
_moduleCallbacks.render.push_back(std::move(function));
break;
case CallbackOption::Draw2D:
_moduleCallbacks.draw2D.push_back(std::move(function));
break;
case CallbackOption::PostDraw:
_moduleCallbacks.postDraw.push_back(std::move(function));
break;