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

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-05-24 16:53:34 -04:00
parent 554cbcf32a 788d5f4b04
commit 0cd56d776c
72 changed files with 1457 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rendering/framebufferrenderer.cpp
View File

@@ -29,6 +29,7 @@
#include <string>
#include <openspace/scene/scene.h>
#include <openspace/util/camera.h>
#include <openspace/util/timemanager.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderable.h>
#include <openspace/rendering/deferredcaster.h>
@@ -486,7 +487,9 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
RenderData data = { *_camera, psc(), doPerformanceMeasurements, 0 };
Time time = OsEng.timeManager().time();
RenderData data = { *_camera, psc(), time, doPerformanceMeasurements, 0 };
RendererTasks tasks;
// Capture standard fbo