mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -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

6
modules/space/rendering/renderablerings.cpp
View File

@@ -182,7 +182,7 @@ bool RenderableRings::isReady() const {
}
void RenderableRings::initializeGL() {
_shader = global::renderEngine.buildRenderProgram(
_shader = global::renderEngine->buildRenderProgram(
"RingProgram",
absPath("${MODULE_SPACE}/shaders/rings_vs.glsl"),
absPath("${MODULE_SPACE}/shaders/rings_fs.glsl")
@@ -207,7 +207,7 @@ void RenderableRings::deinitializeGL() {
_textureFile = nullptr;
_texture = nullptr;
global::renderEngine.removeRenderProgram(_shader.get());
global::renderEngine->removeRenderProgram(_shader.get());
_shader = nullptr;
}
@@ -261,7 +261,7 @@ void RenderableRings::update(const UpdateData& data) {
_textureIsDirty = false;
}
_sunPosition = global::renderEngine.scene()->sceneGraphNode("Sun")->worldPosition() -
_sunPosition = global::renderEngine->scene()->sceneGraphNode("Sun")->worldPosition() -
data.modelTransform.translation;
}