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

Merge branch 'feature/render-bins' into feature/rosetta

Browse Source 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
This commit is contained in:
Alexander Bock
2016-08-29 15:53:59 +02:00
parent 67f1a389d2 47583327ec
commit ae6ade497b
24 changed files with 154 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/base/rendering/renderabletrail.cpp
View File

@@ -124,6 +124,7 @@ bool RenderableTrail::initialize() {
"${MODULE_BASE}/shaders/ephemeris_vs.glsl",
"${MODULE_BASE}/shaders/ephemeris_fs.glsl");
setRenderBin(Renderable::RenderBin::Overlay);
if (!_programObject)
return false;
@@ -192,6 +193,14 @@ void RenderableTrail::render(const RenderData& data) {
// _programObject->setUniform("forceFade", _distanceFade);
//}
bool usingFramebufferRenderer =
OsEng.renderEngine().rendererImplementation() == RenderEngine::RendererImplementation::Framebuffer;
if (usingFramebufferRenderer) {
glDepthMask(false);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
}
glLineWidth(_lineWidth);
glBindVertexArray(_vaoID);
@@ -207,6 +216,12 @@ void RenderableTrail::render(const RenderData& data) {
glBindVertexArray(0);
}
if (usingFramebufferRenderer) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDepthMask(true);
}
_programObject->deactivate();
}