mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge with feature/screenspacerenderable

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-31 15:58:54 -04:00
parent 3967e513d2 d610171441
commit e729723b06
8 changed files with 57 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderengine.h
+1 -2
View File
@@ -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);
include/openspace/rendering/screenspacerenderable.h
-1
View File
@@ -102,7 +102,6 @@ protected:
properties::FloatProperty _scale;
properties::FloatProperty _alpha;
GLuint _quad;
GLuint _vertexPositionBuffer;
const std::string _rendererPath;