mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals handling (#1352)

Browse Source 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
This commit is contained in:
Alexander Bock
2020-10-21 22:30:05 +02:00
committed by GitHub
parent 1525a0490d
commit efffc25ce0
164 changed files with 1484 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/debugging/rendering/debugrenderer.cpp
View File

@@ -42,7 +42,7 @@ namespace openspace {
DebugRenderer* DebugRenderer::_reference = nullptr;
DebugRenderer::DebugRenderer() {
_programObject = global::renderEngine.buildRenderProgram(
_programObject = global::renderEngine->buildRenderProgram(
"BasicDebugShader",
absPath("${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl"),
absPath("${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl")

4
modules/debugging/rendering/renderabledebugplane.cpp
View File

@@ -187,7 +187,7 @@ void RenderableDebugPlane::initializeGL() {
createPlane();
if (!_shader) {
_shader = global::renderEngine.buildRenderProgram("PlaneProgram",
_shader = global::renderEngine->buildRenderProgram("PlaneProgram",
absPath("${MODULE_BASE}/shaders/plane_vs.glsl"),
absPath("${MODULE_BASE}/shaders/plane_fs.glsl")
);
@@ -202,7 +202,7 @@ void RenderableDebugPlane::deinitializeGL() {
_vertexPositionBuffer = 0;
if (_shader) {
global::renderEngine.removeRenderProgram(_shader.get());
global::renderEngine->removeRenderProgram(_shader.get());
_shader = nullptr;
}
}