Imported Raycasterbox into RenderableVolumeExpert

include/openspace/rendering/renderablevolumeexpert.h

@@ -27,6 +27,7 @@
 
 // open space includes
 #include <openspace/rendering/renderablevolume.h>
+#include <openspace/rendering/volumeraycasterbox.h>
 
 // ghoul includes
 #include <ghoul/opengl/programobject.h>
@@ -39,14 +40,18 @@
 #include <ghoul/io/rawvolumereader.h>
 #include <ghoul/filesystem/file.h>
 
-#include <sgct.h>
-
 #ifdef __APPLE__
     #include <memory>
 #else
     #include <mutex>
 #endif
 
+namespace ghoul {
+    namespace opencl {
+        class CLWorkSize;
+    }
+}
+
 namespace openspace {
 
 class RenderableVolumeExpert: public RenderableVolume {
@@ -73,8 +78,6 @@ private:
     std::vector<ghoul::RawVolumeReader::ReadHints> _volumeHints;
     
     // Textures
-	ghoul::opengl::Texture* _backTexture;
-	ghoul::opengl::Texture* _frontTexture;
 	ghoul::opengl::Texture* _output;
 	std::vector<ghoul::opengl::Texture*> _volumes;
 	std::vector<ghoul::opengl::Texture*> _transferFunctions;
@@ -92,6 +95,7 @@ private:
     ghoul::opencl::CLCommandQueue _commands;
     ghoul::opencl::CLProgram _program;
     ghoul::opencl::CLKernel _kernel;
+    ghoul::opencl::CLWorkSize* _ws;
     ghoul::filesystem::File* _kernelSourceFile;
     std::vector<std::pair<ghoul::opencl::CLProgram::Option, bool> > _kernelOptions;
     bool _programUpdateOnSave;
@@ -100,12 +104,12 @@ private:
     std::mutex* _kernelLock;
     std::mutex* _textureLock;
     
-	ghoul::opengl::FramebufferObject* _fbo;
-	ghoul::opengl::ProgramObject *_fboProgram;
 	ghoul::opengl::ProgramObject *_quadProgram;
     sgct_utils::SGCTBox* _boundingBox;
 	GLuint _screenQuad;
     
+    VolumeRaycasterBox* _colorBoxRenderer;
+    
 };
 
 } // namespace openspace

include/openspace/rendering/volumeraycasterbox.h

@@ -0,0 +1,60 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014                                                                    *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef VOLUMERAYCASTERBOX_H_
+#define VOLUMERAYCASTERBOX_H_
+
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/framebufferobject.h>
+#include <ghoul/opengl/texture.h>
+
+namespace sgct_utils {
+    class SGCTBox;
+}
+
+namespace openspace {
+
+class VolumeRaycasterBox {
+public:
+	VolumeRaycasterBox();
+	~VolumeRaycasterBox();
+    bool initialize();
+	void render(glm::mat4 MVP);
+    
+	ghoul::opengl::Texture* backFace();
+	ghoul::opengl::Texture* frontFace();
+    glm::size2_t dimensions();
+
+private:
+	ghoul::opengl::FramebufferObject* _fbo;
+	ghoul::opengl::Texture *_backTexture, *_frontTexture;
+	ghoul::opengl::ProgramObject *_boxProgram;
+	sgct_utils::SGCTBox* _boundingBox;
+	GLint _MVPLocation;
+    
+    glm::size2_t _dimensions;
+};
+
+} /* namespace openspace */
+#endif /* VOLUMERAYCASTERBOX_H_ */