mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05: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
modules/exoplanets/rendering/renderableorbitdisc.cpp
+5 -5
View File
@@ -157,7 +157,7 @@ bool RenderableOrbitDisc::isReady() const {
}
void RenderableOrbitDisc::initializeGL() {
_shader = global::renderEngine.buildRenderProgram(
_shader = global::renderEngine->buildRenderProgram(
"OrbitdiscProgram",
absPath("${BASE}/modules/exoplanets/shaders/orbitdisc_vs.glsl"),
absPath("${BASE}/modules/exoplanets/shaders/orbitdisc_fs.glsl")
@@ -189,7 +189,7 @@ void RenderableOrbitDisc::deinitializeGL() {
_textureFile = nullptr;
_texture = nullptr;
global::renderEngine.removeRenderProgram(_shader.get());
global::renderEngine->removeRenderProgram(_shader.get());
_shader = nullptr;
}
@@ -228,9 +228,9 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
_shader->deactivate();
// Restores GL State
global::renderEngine.openglStateCache().resetBlendState();
global::renderEngine.openglStateCache().resetDepthState();
global::renderEngine.openglStateCache().resetPolygonAndClippingState();
global::renderEngine->openglStateCache().resetBlendState();
global::renderEngine->openglStateCache().resetDepthState();
global::renderEngine->openglStateCache().resetPolygonAndClippingState();
}
void RenderableOrbitDisc::update(const UpdateData& data) {