mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05: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
modules/newhorizons/rendering/renderablemodelprojection.cpp
+13 -4
View File
@@ -34,6 +34,7 @@
#include <openspace/util/spicemanager.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include "imgui.h"
#define _USE_MATH_DEFINES
@@ -186,9 +187,11 @@ bool RenderableModelProjection::initialize() {
bool completeSuccess = true;
if (_programObject == nullptr) {
_programObject = ghoul::opengl::ProgramObject::Build("ModelShader",
"${MODULES}/newhorizons/shaders/modelShader_vs.glsl",
"${MODULES}/newhorizons/shaders/modelShader_fs.glsl");
RenderEngine* renderEngine = OsEng.renderEngine();
_programObject = renderEngine->buildRenderProgram("ModelShader",
"${MODULES}/newhorizons/shaders/modelShader_vs.glsl",
"${MODULES}/newhorizons/shaders/modelShader_fs.glsl");
if (!_programObject)
return false;
}
@@ -290,6 +293,12 @@ bool RenderableModelProjection::deinitialize() {
glDeleteBuffers(1, &_vbo);
RenderEngine* renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine->removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}
@@ -527,4 +536,4 @@ void RenderableModelProjection::loadProjectionTexture() {
}
} // namespace openspace
} // namespace openspace