mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-12 14:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only show screenspace renderables on the non-gui windows (closes #854)

Browse Source
This commit is contained in:
Alexander Bock
2019-05-11 16:40:11 +02:00
parent a012f8109a
commit 3fbc317294
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/renderengine.cpp
+25 -22
View File
@@ -596,32 +596,35 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
++_frameNumber;
std::vector<ScreenSpaceRenderable*> ssrs;
ssrs.reserve(global::screenSpaceRenderables.size());
for (const std::unique_ptr<ScreenSpaceRenderable>& ssr :
global::screenSpaceRenderables)
{
if (ssr->isEnabled() && ssr->isReady()) {
ssrs.push_back(ssr.get());
if (masterEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
std::vector<ScreenSpaceRenderable*> ssrs;
ssrs.reserve(global::screenSpaceRenderables.size());
for (const std::unique_ptr<ScreenSpaceRenderable>& ssr :
global::screenSpaceRenderables)
{
if (ssr->isEnabled() && ssr->isReady()) {
ssrs.push_back(ssr.get());
}
}
}
std::sort(
ssrs.begin(),
ssrs.end(),
[](ScreenSpaceRenderable* lhs, ScreenSpaceRenderable* rhs) {
// Render back to front.
return lhs->depth() > rhs->depth();
std::sort(
ssrs.begin(),
ssrs.end(),
[](ScreenSpaceRenderable* lhs, ScreenSpaceRenderable* rhs) {
// Render back to front.
return lhs->depth() > rhs->depth();
}
);
glDisable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
for (ScreenSpaceRenderable* ssr : ssrs) {
ssr->render();
}
);
glDisable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
for (ScreenSpaceRenderable* ssr : ssrs) {
ssr->render();
glDisable(GL_BLEND);
}
glDisable(GL_BLEND);
LTRACE("RenderEngine::render(end)");
}