Cleaning up abuffer classes

Make ABuffer type selectable in openspace.cfg
This commit is contained in:
Alexander Bock
2015-05-19 00:47:47 +02:00
parent 79673d5f53
commit abdd1af2a9
7 changed files with 105 additions and 60 deletions
+9 -12
View File
@@ -33,19 +33,19 @@ class ABufferFixed: public ABuffer {
public:
ABufferFixed();
virtual ~ABufferFixed();
virtual bool initialize();
~ABufferFixed();
bool initialize() override;
virtual void clear();
virtual void preRender();
virtual void postRender();
void clear() override;
void preRender() override;
void postRender() override;
std::vector<fragmentData> pixelData() override;
std::vector<fragmentData> pixelData();
protected:
virtual bool reinitializeInternal();
virtual bool reinitializeInternal() override;
private:
GLuint *_data;
GLuint _anchorPointerTexture;
GLuint _anchorPointerTextureInitializer;
@@ -53,11 +53,8 @@ private:
GLuint _atomicCounterTexture;
GLuint _fragmentBuffer;
GLuint _fragmentTexture;
}; // ABufferFixed
} // openspace
#endif // __ABUFFERFIXED_H__
+2 -1
View File
@@ -51,7 +51,7 @@ public:
RenderEngine();
~RenderEngine();
bool initialize();
bool initialize(const std::string& renderingMethod);
void setSceneGraph(Scene* sceneGraph);
Scene* scene();
@@ -113,6 +113,7 @@ private:
Camera* _mainCamera;
Scene* _sceneGraph;
ABuffer* _abuffer;
int _abufferImplementation;
ScreenLog* _log;
bool _showInfo;