Jonas Strandstedt 5427dbdeb2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp

2014-09-26 17:17:18 +02:00

..

planets

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

stars

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

renderable.h

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

2014-09-26 17:17:18 +02:00

renderablebody.h

Restructuring for OpenSpace tests

2014-03-19 14:57:10 -04:00

renderablefieldlines.h

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

renderablesphericalgrid.h

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

renderablevolume.h

Added functionality for getting the model barycenter in kameleonwrapper and moving the raycasting box by an offset. Also cleaned up renderablevolumegl a bit

2014-07-07 14:26:22 -04:00

renderablevolumecl.h

Merge branch 'develop' into spicesolarsystem

2014-09-25 13:54:42 +02:00

renderablevolumeexpert.h

Merge branch 'develop' into spicesolarsystem

2014-09-25 13:54:42 +02:00

renderablevolumegl.h

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

renderengine.h

Replaced RuntimeData with separate, temporary structs that are passed around

2014-09-26 13:29:01 +02:00

volumeraycasterbox.h

Added ID for sampler

2014-06-24 15:29:31 -04:00

volumeraycastersinglepass.h

Moved from VolumeRaycaster to RenderableVolume

2014-04-18 09:58:44 -04:00