From f95bb727d7716be127296a75799a83a12348eed6 Mon Sep 17 00:00:00 2001 From: Michael Nilsson Date: Wed, 16 Mar 2016 09:10:14 -0400 Subject: [PATCH] removed camera parameter from screenspaceimage render function --- include/openspace/rendering/screenspacerenderable.h | 3 +-- modules/base/rendering/screenspaceimage.h | 2 +- src/rendering/renderengine.cpp | 2 +- src/rendering/screenspacerenderable.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h index 3bd089318d..6337489e51 100644 --- a/include/openspace/rendering/screenspacerenderable.h +++ b/include/openspace/rendering/screenspacerenderable.h @@ -29,7 +29,6 @@ #include #include #include -#include namespace openspace { @@ -38,7 +37,7 @@ public: ScreenSpaceRenderable(std::string texturePath); ~ScreenSpaceRenderable(); - virtual void render(Camera* camera) = 0; + virtual void render() = 0; virtual bool initialize() = 0; virtual bool deinitialize() = 0; virtual void update() = 0; diff --git a/modules/base/rendering/screenspaceimage.h b/modules/base/rendering/screenspaceimage.h index 25b675a294..04c478e387 100644 --- a/modules/base/rendering/screenspaceimage.h +++ b/modules/base/rendering/screenspaceimage.h @@ -34,7 +34,7 @@ public: ScreenSpaceImage(std::string texturePath); ~ScreenSpaceImage(); - void render(Camera* camera) override; + void render() override; bool initialize() override; bool deinitialize() override; void update() override; diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 24285cdb90..c4731af940 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -399,7 +399,7 @@ void RenderEngine::render(const glm::mat4 &projectionMatrix, const glm::mat4 &vi for (auto s : _screenSpaceRenderables) { if(s->isEnabled()) - s->render(_mainCamera); + s->render(); } } diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index e9c1544c1d..73380d48aa 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -28,7 +28,7 @@ namespace openspace { ScreenSpaceRenderable::ScreenSpaceRenderable(std::string texturePath) : _enabled("enabled", "Is Enabled", true) , _flatScreen("flatScreen", "Flat Screen", false) - , _position("position", "Position", glm::vec3(0,0,-2),glm::vec3(-2,-2, -1),glm::vec3(2, 2, 0)) + , _position("position", "Position", glm::vec3(0),glm::vec3(-4),glm::vec3(4)) , _scale("scale", "Scale" , 0.5, 0, 1) , _texturePath("texturePath", "Texture path", texturePath) , _quad(0)