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

Updating Ghoul repository

Browse Source 
Updating SGCT repository
Removing compiler warnings
This commit is contained in:
Alexander Bock
2017-03-10 09:32:16 -05:00
parent dbceb169f7
commit bcf92804b6
39 changed files with 201 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rendering/framebufferrenderer.cpp
View File

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