mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)

Browse Source
This commit is contained in:
Alexander Bock
2017-07-18 15:47:48 -04:00
parent 0963184293
commit 008ab4e613
47 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fieldlines/rendering/renderablefieldlines.cpp
+1 -1
View File
@@ -239,7 +239,7 @@ bool RenderableFieldlines::deinitialize() {
return true;
}
void RenderableFieldlines::render(const RenderData& data) {
void RenderableFieldlines::render(const RenderData& data, RendererTasks&) {
_program->activate();
_program->setUniform("modelViewProjection", data.camera.viewProjectionMatrix());
_program->setUniform("modelTransform", glm::mat4(1.0));
modules/fieldlines/rendering/renderablefieldlines.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
bool isReady() const override;
void render(const RenderData& data) override;
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
private: