removed camera parameter from screenspaceimage render function

This commit is contained in:
Michael Nilsson
2016-03-16 09:10:14 -04:00
parent 97a7de9f28
commit f95bb727d7
4 changed files with 4 additions and 5 deletions

View File

@@ -29,7 +29,6 @@
#include <openspace/properties/vectorproperty.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/util/camera.h>
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;

View File

@@ -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;

View File

@@ -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();
}
}

View File

@@ -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)