61f2f51cb0
Compile fixes of SpiceManager for Mac
2014-08-19 12:14:34 +02:00
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
8d2e86447c
Require renderables to derive from PropertyOwner and use dictionary-constructor
2014-05-03 18:44:39 +02:00
59c92ca073
Merge branch 'develop' into kameleon
...
Conflicts:
src/rendering/renderablevolume.cpp
src/rendering/renderablevolumeexpert.cpp
2014-04-24 12:14:02 -04:00
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
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
b259c64655
Merge work and bugfixes
2014-04-14 11:40:53 -04:00
909350faaa
Develop merge
2014-04-11 15:45:53 -04:00
2599268fd3
Merge branch 'develop' into OpenCLWrapper
...
Conflicts:
ext/ghoul
src/engine/openspaceengine.cpp
2014-04-07 14:38:21 -04:00
b47ae90919
Updated OpenSpace to be self contained
...
- Added openspace.cfg that sets runtime variables
- Added relatively small tsp file to openspace-data
- Removed unused TextureAtlas
2014-04-07 09:58:14 -04:00
143c7926c6
Removed flare ShaderProgram and Texture files
...
- Removed the last references of ShaderProgram
- Removed the last references of Texture
2014-03-28 16:43:24 -04:00
d548e34052
Removed the use of flare texture and shader classes
2014-03-28 16:24:36 -04:00
6d00b52240
A lot of intermediate changes
...
- Compiles and runs on Linux and OS X
- Produces weird results on OS X
2014-03-27 13:38:58 -04:00
b41219b404
Volumeraycaster now also extends renderable. Also has some interaction and cluster syncing now.
2014-03-21 15:23:59 -04:00
8a76520295
Flare now extends renderable
2014-03-20 15:36:23 -04:00
146044045c
Fixed syncing issue
2014-03-20 12:43:27 -04:00
53e3d0090c
Cleanup in openspaceengine, added comments to volumeraycaster
2014-03-20 11:16:54 -04:00
658ae13d96
Added flare to OpenSpace
2014-03-19 16:41:12 -04:00
Alexander Bock