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

Merged.

Browse Source
This commit is contained in:
Jonathas Costa
2017-11-09 15:46:46 -05:00
parent 215807405c e26e5c7f15
commit 929bd9ae05
423 changed files with 5962 additions and 2561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rendering/framebufferrenderer.cpp
View File

@@ -93,7 +93,7 @@ void FramebufferRenderer::initialize() {
size, -size, 0.0f, 1.0f,
size, size, 0.0f, 1.0f
};
glGenVertexArrays(1, &_screenQuad);
glBindVertexArray(_screenQuad);
@@ -875,7 +875,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
OsEng.renderEngine().performanceManager()
);
}
if (!_scene || !_camera) {
return;
}
@@ -948,7 +948,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
raycastProgram->activate();
}
}
if (raycastProgram) {
raycaster->preRaycast(_raycastData[raycaster], *raycastProgram);