Alexander Bock 67f0fb3c08 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp

2014-10-06 22:22:30 +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

renderableephemeris.h

got renderable ephemeris working for larger deltas, problems with leap years though

2014-10-02 11:00:43 -04:00

renderablefieldlines.h

Replaced RuntimeData with separate, temporary structs that are passed around

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

renderablepath.h

added some new classes for ephemeris rendering..

2014-10-06 15:30:13 -04:00

renderablesphericalgrid.h

Replaced RuntimeData with separate, temporary structs that are passed around

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

renderabletrail.h

Renderableehpemeris still as it is, will be repurposed though.

2014-10-03 18:56:16 -04: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

renderablewavefrontobject.h

added some new classes for ephemeris rendering..

2014-10-06 15:30:13 -04:00

renderengine.h

Added Lua method to print a screenshot

2014-10-05 17:31:47 +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