Added an OpenSpace ShaderCreator

- Global shader settings can now be added.
- ShaderCreator builds the shader and stores a generated shader file
with all included source.
- Small TransferFunction bugfix
This commit is contained in:
Jonas Strandstedt
2014-07-10 15:22:57 -04:00
parent 576710f1ef
commit 114af3fb5b
13 changed files with 355 additions and 55 deletions

View File

@@ -34,9 +34,15 @@
#include <ghoul/opencl/clprogram.h>
#include <ghoul/opencl/clkernel.h>
//#define FLARE_ONLY
// #define FLARE_ONLY
#include <openspace/flare/flare.h>
#include <openspace/util/shadercreator.h>
#define ABUFFER_SINGLE_LINKED 1
#define ABUFFER_FIXED 2
#define ABUFFER_DYNAMIC 3
#define ABUFFER_IMPLEMENTATION ABUFFER_SINGLE_LINKED
namespace openspace {
@@ -59,6 +65,7 @@ public:
ghoul::opencl::CLContext& clContext();
InteractionHandler& interactionHandler();
RenderEngine& renderEngine();
ShaderCreator& shaderBuilder();
// SGCT callbacks
bool initializeGL();
@@ -90,6 +97,7 @@ private:
ghoul::opencl::CLContext _context;
sgct::SharedVector<char> _synchronizationBuffer;
ShaderCreator _shaderBuilder;
};
#define OsEng (openspace::OpenSpaceEngine::ref())