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

..

camera.h

Added geometry shader for halos and separate shader for points. Parsecs->m conversion works and added test-data to datafolder.

2014-08-28 23:04:27 -04:00

constants.h

Merge branch 'develop' into stars

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

factorymanager.h

Updated ghoul version; more code cleanup

2014-05-10 15:17:10 +02:00

factorymanager.inl

Created classes for PlanetGeometry

2014-05-05 17:28:46 +02:00

geometry.h

Restructuring for OpenSpace tests

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

kameleonwrapper.h

Added missing file

2014-07-18 14:00:09 -04:00

planet.h

Renamed pss to PowerScaledScalar

2014-05-11 18:34:57 +02:00

powerscaledcoordinate.h

Added copy constructor to PowercaledCoordinate class

2014-05-13 22:05:34 +02:00

powerscaledscalar.h

Renamed pss to PowerScaledScalar

2014-05-11 18:34:57 +02:00

powerscaledsphere.h

WIP: intermediary commit, will attempt to run HC's code on this machine.

2014-08-25 17:37:23 -04:00

shadercreator.h

Merge branch 'develop' into stars

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

sphere.h

Restructuring for OpenSpace tests

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

spice.h

Restructuring for OpenSpace tests

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

spicemanager.h

Renamed methods in SpiceManager

2014-09-13 18:02:39 +02:00

time.h

Added missing documentation

2014-09-14 17:40:19 +02:00

vbo_template.h

Flare and Volumes in scenegraph

2014-04-14 16:41:57 -04:00

vbo.h

Restructuring for OpenSpace tests

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