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

Add helper methods to quickly render boxes (finalizing and #closes 696)

Browse Source
This commit is contained in:
Alexander Bock
2018-09-02 02:18:40 -04:00
parent 9f57d80541
commit 24ef67afa0
8 changed files with 450 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/engine/openspaceengine.cpp
View File

@@ -44,6 +44,7 @@
#include <openspace/performance/performancemanager.h>
#include <openspace/rendering/dashboard.h>
#include <openspace/rendering/dashboarditem.h>
#include <openspace/rendering/helper.h>
#include <openspace/rendering/loadingscreen.h>
#include <openspace/rendering/luaconsole.h>
#include <openspace/rendering/renderable.h>
@@ -337,6 +338,8 @@ void OpenSpaceEngine::initializeGL() {
//glbinding::Binding::useCurrentContext();
glbinding::Binding::initialize(glfwGetProcAddress);
rendering::helper::initialize();
// clear the screen so the user doesn't have to see old buffer contents left on the
// graphics card
LDEBUG("Clearing all Windows");
@@ -767,21 +770,10 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
void OpenSpaceEngine::deinitialize() {
LTRACE("OpenSpaceEngine::deinitialize(begin)");
// We want to render an image informing the user that we are shutting down
global::renderEngine.renderEndscreen();
global::windowDelegate.swapBuffer();
for (const std::function<void()>& func : global::callback::deinitializeGL) {
func();
}
for (const std::function<void()>& func : global::callback::deinitialize) {
func();
}
global::openSpaceEngine.assetManager().deinitialize();
global::openSpaceEngine._scene = nullptr;
global::navigationHandler.deinitialize();
LTRACE("deinitialize(begin)");
@@ -794,7 +786,6 @@ void OpenSpaceEngine::deinitialize() {
);
}
global::deinitializeGL();
global::deinitialize();
FactoryManager::deinitialize();
@@ -812,6 +803,27 @@ void OpenSpaceEngine::deinitialize() {
LTRACE("OpenSpaceEngine::deinitialize(end)");
}
void OpenSpaceEngine::deinitializeGL() {
LTRACE("OpenSpaceEngine::deinitializeGL(begin)");
// We want to render an image informing the user that we are shutting down
global::renderEngine.renderEndscreen();
global::windowDelegate.swapBuffer();
global::openSpaceEngine.assetManager().deinitialize();
global::openSpaceEngine._scene = nullptr;
for (const std::function<void()>& func : global::callback::deinitializeGL) {
func();
}
global::deinitializeGL();
rendering::helper::deinitialize();
LTRACE("OpenSpaceEngine::deinitializeGL(end)");
}
void OpenSpaceEngine::writeStaticDocumentation() {
// If a LuaDocumentationFile was specified, generate it now
if (!global::configuration.documentation.lua.empty()) {