8 Commits

Author	SHA1	Message	Date
Jonas Strandstedt	472869e1db	Fix for Flare ... - Fixed timestep error in Flare - Added option to compile openspace with Flare only	2014-05-22 12:57:54 -04:00
Alexander Bock	6c15bebfff	Merge remote-tracking branch 'origin/kameleon' into properties	2014-05-02 16:59:50 +02:00
Alexander Bock	43e510fded	Fixed for Win32 compatability ... Renamed OpenCL qualifiers due to conflict with "ERROR" macros Removed boost::timer and boost::system dependencies Added fixed for Windows path handling	2014-05-02 10:48:16 +02:00
Hans-Christian Helltegen	1de2d2fea1	Merge branch 'develop' into VolumeRaycasterAsRenderable ... Conflicts: config/sgct/single.xml include/openspace/engine/openspaceengine.h include/openspace/flare/flare.h include/openspace/rendering/volumeraycastersinglepass.h src/engine/openspaceengine.cpp src/flare/flare.cpp src/rendering/volumeraycaster.cpp	2014-04-23 10:28:41 -04:00
Jonas Strandstedt	30bda3fc97	Flare and Volumes in scenegraph ... - Added new volumeraycaster classes - Fixed many small warnings in OpenSpace - Linked to updated Ghoul and Openspace-data - TODO cleanup in volumeraycaster classes - TODO Add an advanced volumeraycaster class to use during development	2014-04-14 16:41:57 -04:00
Hans-Christian Helltegen	b259c64655	Merge work and bugfixes	2014-04-14 11:40:53 -04:00
Hans-Christian Helltegen	909350faaa	Develop merge	2014-04-11 15:45:53 -04:00
Jonas Strandstedt	2599268fd3	Merge branch 'develop' into OpenCLWrapper ... Conflicts: ext/ghoul src/engine/openspaceengine.cpp	2014-04-07 14:38:21 -04:00