mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-08 22:38:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

solved merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-11 15:09:07 -05:00
parent c746338553 f01299fe69
commit 7dfdb2083e
7 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/rendering/screenspacerenderable.h
View File

@@ -35,8 +35,7 @@ namespace openspace {
class ScreenSpaceRenderable : public properties::PropertyOwner {
public:
ScreenSpaceRenderable();
ScreenSpaceRenderable(std::string texturePath);
~ScreenSpaceRenderable();
virtual void render(Camera* camera) = 0;