mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with antialiased abuffer

Browse Source
This commit is contained in:
Emil Axelsson
2016-02-03 17:47:29 +01:00
parent abffcf4175 35765881f7
commit a6a9537b6c
81 changed files with 2375 additions and 3142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/base/rendering/renderablemodel.cpp
View File

@@ -26,6 +26,7 @@
// ie after I see model on screen)
// open space includes
#include <openspace/rendering/renderengine.h>
#include <modules/base/rendering/renderablemodel.h>
#include <modules/base/rendering/modelgeometry.h>
#include <openspace/engine/configurationmanager.h>
@@ -126,9 +127,12 @@ bool RenderableModel::initialize() {
bool completeSuccess = true;
if (_programObject == nullptr) {
// NH shader
_programObject = ghoul::opengl::ProgramObject::Build("ModelProgram",
RenderEngine& renderEngine = OsEng.renderEngine();
_programObject = renderEngine.buildRenderProgram("ModelProgram",
"${MODULE_BASE}/shaders/model_vs.glsl",
"${MODULE_BASE}/shaders/model_fs.glsl");
if (!_programObject)
return false;
}
@@ -151,7 +155,13 @@ bool RenderableModel::deinitialize() {
}
_texture = nullptr;
_programObject = nullptr;
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine.removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}