Fix for Flare

- Fixed timestep error in Flare
- Added option to compile openspace with Flare only
This commit is contained in:
Jonas Strandstedt
2014-05-22 12:57:54 -04:00
parent 6abdb37003
commit 472869e1db
6 changed files with 49 additions and 6 deletions

View File

@@ -34,6 +34,8 @@
#include <ghoul/opencl/clprogram.h>
#include <ghoul/opencl/clkernel.h>
#define FLARE_ONLY
#include <openspace/flare/flare.h>
namespace openspace {
@@ -81,6 +83,9 @@ private:
ghoul::Dictionary* _configurationManager;
InteractionHandler* _interactionHandler;
RenderEngine* _renderEngine;
#ifdef FLARE_ONLY
Flare* _flare;
#endif
// ScriptEngine* _scriptEngine;
ghoul::opencl::CLContext _context;