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

refactor abuffer and add msaa support. volumes temporarily disabled.

Browse Source
This commit is contained in:
Emil Axelsson
2016-02-02 11:30:27 +01:00
parent 4f7ab5321f
commit d4ff8119d1
79 changed files with 2354 additions and 3106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,9 +144,12 @@ bool RenderablePlane::initialize() {
if (_shader == nullptr) {
// Plane Program
_shader = ghoul::opengl::ProgramObject::Build("PlaneProgram",
RenderEngine* renderEngine = OsEng.renderEngine();
_shader = renderEngine->buildRenderProgram("PlaneProgram",
"${MODULE_BASE}/shaders/plane_vs.glsl",
"${MODULE_BASE}/shaders/plane_fs.glsl");
"${MODULE_BASE}/shaders/plane_fs.glsl"
);
if (!_shader)
return false;
}
@@ -173,8 +176,11 @@ bool RenderablePlane::deinitialize() {
delete _textureFile;
_textureFile = nullptr;
delete _shader;
_shader = nullptr;
RenderEngine* renderEngine = OsEng.renderEngine();
if (_shader) {
renderEngine->removeRenderProgram(_shader);
_shader = nullptr;
}
return true;
}