mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-22 11:18:22 -05:00
Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)
This commit is contained in:
@@ -176,7 +176,7 @@ bool RenderableModel::deinitialize() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void RenderableModel::render(const RenderData& data) {
|
||||
void RenderableModel::render(const RenderData& data, RendererTasks&) {
|
||||
_programObject->activate();
|
||||
|
||||
// Fading
|
||||
|
||||
@@ -56,7 +56,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;
|
||||
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
@@ -173,7 +173,7 @@ bool RenderablePlane::deinitialize() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void RenderablePlane::render(const RenderData& data) {
|
||||
void RenderablePlane::render(const RenderData& data, RendererTasks&) {
|
||||
_shader->activate();
|
||||
//if (_projectionListener){
|
||||
// //get parent node-texture and set with correct dimensions
|
||||
|
||||
@@ -58,7 +58,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;
|
||||
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
@@ -181,7 +181,7 @@ bool RenderableSphere::deinitialize() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void RenderableSphere::render(const RenderData& data) {
|
||||
void RenderableSphere::render(const RenderData& data, RendererTasks&) {
|
||||
glm::mat4 transform = glm::mat4(1.0);
|
||||
|
||||
transform = glm::rotate(transform, static_cast<float>(M_PI_2), glm::vec3(1, 0, 0));
|
||||
|
||||
@@ -54,7 +54,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;
|
||||
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
@@ -197,7 +197,7 @@ bool RenderableSphericalGrid::initialize(){
|
||||
return completeSuccess;
|
||||
}
|
||||
|
||||
void RenderableSphericalGrid::render(const RenderData& data){
|
||||
void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
|
||||
_gridProgram->activate();
|
||||
|
||||
glm::mat4 transform;
|
||||
|
||||
@@ -43,7 +43,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;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -217,7 +217,7 @@ bool RenderableTrail::isReady() const {
|
||||
return _programObject != nullptr;
|
||||
}
|
||||
|
||||
void RenderableTrail::render(const RenderData & data) {
|
||||
void RenderableTrail::render(const RenderData& data, RendererTasks&) {
|
||||
_programObject->activate();
|
||||
|
||||
glm::dmat4 modelTransform =
|
||||
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
* \c _floatingRenderInformation using the provided \p data
|
||||
* \param data The data that is necessary to render this Renderable
|
||||
*/
|
||||
void render(const RenderData& data) override;
|
||||
void render(const RenderData& data, RendererTasks& rendererTask) override;
|
||||
|
||||
protected:
|
||||
explicit RenderableTrail(const ghoul::Dictionary& dictionary);
|
||||
|
||||
Reference in New Issue
Block a user