OS X now doesn't crash for volumes

- Fixed a few warnings

include/openspace/abuffer/abuffer.h

@@ -25,23 +25,25 @@
 #ifndef __ABUFFER_H__
 #define __ABUFFER_H__
 
-#include <openspace/abuffer/abuffer_i.h>
-
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/glm.h>
 
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/filesystem/file.h>
+#include <string>
+#include <vector>
 
 namespace ghoul {
+    namespace filesystem {
+        class File;
+    }
 	namespace opengl {
+        class ProgramObject;
 		class Texture;
 	}
 }
 
 namespace openspace {
 
-class ABuffer: public ABuffer_I {
+class ABuffer {
 public:
 
 	static const int MAX_LAYERS = 32;
@@ -49,6 +51,7 @@ public:
 	ABuffer();
 	virtual ~ABuffer();
 	virtual void resolve();
+    virtual bool initialize() = 0;
 	virtual bool reinitialize();
 
 	void addVolume(const std::string& tag,ghoul::opengl::Texture* volume);
@@ -56,6 +59,10 @@ public:
 	int addSamplerfile(const std::string& filename);
 
 	void invalidateABuffer();
+    
+    virtual void clear() = 0;
+    virtual void preRender() = 0;
+    virtual void postRender() = 0;
 
 protected:
 	virtual std::string settings() = 0;

include/openspace/abuffer/abufferframebuffer.h

@@ -22,23 +22,31 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __ABUFFER_I_H__
-#define __ABUFFER_I_H__
+#ifndef __ABUFFERFRAMEBUFFER_H__
+#define __ABUFFERFRAMEBUFFER_H__
+
+#include <openspace/abuffer/abuffer.h>
 
 namespace openspace {
-
-class ABuffer_I {
+    
+class ABufferFramebuffer: public ABuffer {
 public:
-	virtual ~ABuffer_I() {};
-	virtual bool initialize() = 0;
-	virtual bool reinitialize() = 0;
+    
+    ABufferFramebuffer();
+    virtual ~ABufferFramebuffer();
+    virtual bool initialize();
+    
+    virtual void clear();
+    virtual void preRender();
+    virtual void postRender();
+    
+    virtual std::string settings();
+protected:
+    virtual bool reinitializeInternal();
+    
+private:
+    
+}; 		// ABufferSingleLinked
+} 		// openspace
 
-	virtual void clear() = 0;
-	virtual void preRender() = 0;
-	virtual void postRender() = 0;
-	virtual void resolve() = 0;
-
-};		// ABuffer_I
-}		// openspace
-
-#endif 	// __ABUFFER_I_H__
+#endif 	// __ABUFFERSINGLELINKED_H__