Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars ...

Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp

2014-09-24 15:39:22 +02:00

..

planets

Misc work

2014-05-05 18:04:53 +02:00

stars

code optimization, cleanup.

2014-08-30 21:33:30 -04:00

renderable.h

Fix a bug in TemplateProperty preventing new bool values to be set

2014-09-18 08:46:46 +02:00

renderablebody.h

Restructuring for OpenSpace tests

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

renderablefieldlines.h

Fieldline and seedpoint color now in RGBA instead of RGB

2014-07-03 14:42:43 -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

More code cleanup, force inclusion of swizzling for GLM

2014-09-19 17:44:33 +02:00

renderablevolumeexpert.h

More code cleanup, force inclusion of swizzling for GLM

2014-09-19 17:44:33 +02:00

renderablevolumegl.h

More code cleanup, force inclusion of swizzling for GLM

2014-09-19 17:44:33 +02:00

renderengine.h

Started work on Samplers having IDs

2014-06-24 14:45:08 -04: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