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

Merged master into atm.

Browse Source
This commit is contained in:
Jonathas Costa
2017-08-16 12:00:28 -04:00
parent f95411b1cc 904ea5b447
commit 2d0da72a50
702 changed files with 6580 additions and 6798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rendering/framebufferrenderer.cpp
View File

@@ -102,7 +102,7 @@ void FramebufferRenderer::initialize() {
GL_FLOAT,
GL_FALSE,
sizeof(GLfloat) * 4,
reinterpret_cast<void*>(0)
nullptr
);
glEnableVertexAttribArray(0);
@@ -573,7 +573,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
Time time = OsEng.timeManager().time();
RenderData data = { *_camera, psc(), time, doPerformanceMeasurements, 0 };
RenderData data = { *_camera, psc(), time, doPerformanceMeasurements, 0, {} };
RendererTasks tasks;
// Capture standard fbo
@@ -655,7 +655,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
raycastProgram->setUniform("mainDepthTexture", mainDepthTextureUnit);
raycastProgram->setUniform("nAaSamples", _nAaSamples);
raycastProgram->setUniform("windowSize", glm::vec2(_resolution));
raycastProgram->setUniform("windowSize", _resolution);
glDisable(GL_DEPTH_TEST);