mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged Master into ATM.

Browse Source
This commit is contained in:
Jonathas Costa
2017-06-02 19:02:29 -04:00
parent 1dbb65059c 994ba32f44
commit 0965ec95ba
145 changed files with 3700 additions and 2044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rendering/framebufferrenderer.cpp
View File

@@ -531,7 +531,8 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
ghoul::opengl::ProgramObject* raycastProgram = nullptr;
if (cameraIsInside) {
if (raycastProgram == _insideRaycastPrograms[raycaster].get()) {
raycastProgram = _insideRaycastPrograms[raycaster].get();
if (raycastProgram) {
raycastProgram->activate();
raycastProgram->setUniform("cameraPosInRaycaster", cameraPosition);
} else {
@@ -540,7 +541,8 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
raycastProgram->setUniform("cameraPosInRaycaster", cameraPosition);
}
} else {
if (raycastProgram == _raycastPrograms[raycaster].get()) {
raycastProgram = _raycastPrograms[raycaster].get();
if (raycastProgram) {
raycastProgram->activate();
} else {
raycastProgram = _raycastPrograms[raycaster].get();