More work on RenderableVolumeExpert

- Added include directory support
- Added definitions support
- Added a volume helpers
- Fixed errors in kameleon wrapper
- Added ENLIL support in kameleonwrapper

include/openspace/rendering/renderablevolumeexpert.h

@@ -97,6 +97,8 @@ private:
     ghoul::opencl::CLWorkSize* _ws;
     ghoul::filesystem::File* _kernelSourceFile;
     std::vector<std::pair<ghoul::opencl::CLProgram::Option, bool> > _kernelOptions;
+    std::vector<std::string> _kernelIncludes;
+    std::vector<std::pair<std::string,std::string> > _kernelDefinitions;
     bool _programUpdateOnSave;
     
     // mutexes to prevent inconsistencies
@@ -107,6 +109,7 @@ private:
 	GLuint _screenQuad;
     
     VolumeRaycasterBox* _colorBoxRenderer;
+    glm::vec3 _boxScaling;
     
 };
 

include/openspace/util/kameleonwrapper.h

@@ -49,6 +49,7 @@ public:
 
 private:
 	ccmc::Model* _model;
+    Model _type;
 	ccmc::Interpolator* _interpolator;
 };