Create ScrenSpaceImage at runtime for testing purposes

include/openspace/rendering/screenspacerenderable.h

@@ -33,6 +33,9 @@ namespace openspace {
 
 class ScreenSpaceRenderable : public properties::PropertyOwner {
 public:
+	ScreenSpaceRenderable();
+	~ScreenSpaceRenderable();
+
 	virtual void render() = 0;
 	virtual bool initialize() = 0;
 	virtual bool deinitialize() = 0;

modules/base/CMakeLists.txt

@@ -38,6 +38,7 @@ set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/wavefrontgeometry.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/dynamicephemeris.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.h
@@ -58,6 +59,7 @@ set(SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/wavefrontgeometry.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/dynamicephemeris.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.cpp

modules/base/rendering/screenspaceimage.cpp

@@ -24,9 +24,15 @@
  #include <modules/base/rendering/screenspaceimage.h>
 
  namespace openspace {
+ 	ScreenSpaceImage::ScreenSpaceImage()
+ 		:ScreenSpaceRenderable()
+ 	{}
+
+ 	ScreenSpaceImage::~ScreenSpaceImage(){}
+
 
 	void ScreenSpaceImage::render(){
-		return;
+		
 	}
 	bool ScreenSpaceImage::initialize(){
 			

modules/base/rendering/screenspaceimage.h

@@ -21,13 +21,19 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
- #include <openspace/rendering/screenspacerenderable.h>
- #include <ghoul/opengl/texture.h>
+#ifndef __SCREENSPACEIMAGE_H__
+#define __SCREENSPACEIMAGE_H__
+
+#include <openspace/rendering/screenspacerenderable.h>
+#include <ghoul/opengl/texture.h>
 namespace openspace {
 
 class ScreenSpaceImage : public ScreenSpaceRenderable {
 
 public:
+	ScreenSpaceImage();
+	~ScreenSpaceImage();
+
 	void render() override;
 	bool initialize() override;
 	bool deinitialize() override;
@@ -35,5 +41,5 @@ public:
 private:
 	std::unique_ptr<ghoul::opengl::Texture>  _imageHandle; // The image to render
 };
-
-}
+} //namespace openspace
+#endif //__SCREENSPACEIMAGE_H__

src/CMakeLists.txt

@@ -63,6 +63,7 @@ set(OPENSPACE_SOURCE
     ${OPENSPACE_BASE_DIR}/src/rendering/renderable.cpp
     ${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp
     ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
+    ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/ephemeris.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/scene.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/scene_lua.inl
@@ -132,6 +133,7 @@ set(OPENSPACE_HEADER
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderer.h
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h
+    ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/ephemeris.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenegraph.h

src/rendering/renderengine.cpp

@@ -32,6 +32,8 @@
 #include <openspace/rendering/abufferrenderer.h>
 #include <openspace/rendering/framebufferrenderer.h>
 
+#include <modules/base/rendering/screenspaceimage.h>
+
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/scene/scene.h>
@@ -204,7 +206,8 @@ bool RenderEngine::initialize() {
   
     ghoul::io::TextureReader::ref().addReader(std::make_shared<ghoul::io::TextureReaderCMAP>());
 
-
+    std::shared_ptr<ScreenSpaceImage> s = std::make_shared<ScreenSpaceImage>();
+    registerScreenSpaceRenderable(s);
 	return true;
 }
 

src/rendering/screenspacerenderable.cpp

@@ -21,6 +21,18 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
- 
+#include <openspace/rendering/screenspacerenderable.h>
+
 namespace openspace {
+		ScreenSpaceRenderable::ScreenSpaceRenderable()
+			: _enabled("enabled", "Is Enabled", true)
+			, _position("position", "Position", glm::vec3(0,0,0))
+			, _size("size", "Size" , glm::vec2(1,1))
+		{
+			addProperty(_enabled);
+			addProperty(_position);
+			addProperty(_size);
+		}
+
+		ScreenSpaceRenderable::~ScreenSpaceRenderable(){}
 }