mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-03 01:59:35 -06:00
8042111ffe
Conflicts: include/openspace/rendering/renderable.h include/openspace/rendering/renderablevolumecl.h include/openspace/rendering/renderablevolumeexpert.h include/openspace/rendering/renderablevolumegl.h include/openspace/rendering/renderengine.h include/openspace/scenegraph/ephemeris.h include/openspace/scenegraph/scenegraph.h include/openspace/scenegraph/spiceephemeris.h include/openspace/scenegraph/staticephemeris.h include/openspace/util/constants.h include/openspace/util/time.h src/engine/openspaceengine.cpp src/interaction/interactionhandler.cpp src/rendering/planets/renderableplanet.cpp src/rendering/renderablevolumecl.cpp src/rendering/renderablevolumeexpert.cpp src/rendering/renderablevolumegl.cpp src/rendering/renderengine.cpp src/rendering/stars/renderablestars.cpp src/scenegraph/spiceephemeris.cpp src/scenegraph/staticephemeris.cpp src/util/factorymanager.cpp src/util/spicemanager.cpp src/util/time.cpp