From d610171441cc736de0942e44f31fe02a2fe39fbe Mon Sep 17 00:00:00 2001
From: Sebastian Piwell <sebastian.piwell@gmail.com>
Date: Thu, 31 Mar 2016 15:54:29 -0400
Subject: [PATCH] for simple testing

---
 include/openspace/rendering/renderengine.h        | 3 +--
 modules/base/rendering/screenspaceframebuffer.cpp | 2 ++
 modules/base/rendering/screenspaceframebuffer.h   | 1 +
 src/rendering/renderengine.cpp                    | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 7dab585aee..3ed2fe0d8f 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -148,8 +148,7 @@ public:
         unsigned int _size;
         int _node;
     } _onScreenInformation;
-
-    std::shared_ptr<ScreenSpaceRenderable> ssr;
+    
 private:
     void setRenderer(std::unique_ptr<Renderer> renderer);
     RendererImplementation rendererFromString(const std::string& method);
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 18a24f71aa..1d11e7fde0 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -45,6 +45,8 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer()
 	addProperty(_size);
 	OsEng.gui()._property.registerProperty(&_size);
 	_size.set(glm::vec4(0, 0, resolution.x,resolution.y));
+
+	_scale.setValue(1.0f);
 }
 
 ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer(){}
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index d1a382a7e7..25b98b6c2f 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -50,6 +50,7 @@ public:
 	void setSize(glm::vec4);
 	void addRenderFunction(std::shared_ptr<std::function<void()>> renderFunction);
 	void removeAllRenderFunctions();
+	
 private:
 	void createFragmentbuffer();
 	static int id();
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 991325387a..664b9a61ee 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -218,11 +218,11 @@ bool RenderEngine::initialize() {
 
     std::shared_ptr<ScreenSpaceFramebuffer> ssfb = std::make_shared<ScreenSpaceFramebuffer>();
     ssfb->addRenderFunction(std::make_shared<std::function<void()>>([this](){renderInformation();}));
-    ssfb->addRenderFunction(std::make_shared<std::function<void()>>([this](){ssr->render();}));
+    ssfb->setSize(glm::vec4(0,400,400,800));
     registerScreenSpaceRenderable(ssfb);
 
 
-    ssr = std::make_shared<ScreenSpaceImage>("${OPENSPACE_DATA}/test2.jpg");
+    std::shared_ptr<ScreenSpaceRenderable>ssr = std::make_shared<ScreenSpaceImage>("${OPENSPACE_DATA}/test2.jpg");
     registerScreenSpaceRenderable(ssr);
 
 	return true;