2 Commits

Author	SHA1	Message	Date
Anton Arbring	d3bf8eb7f7	Merge branch 'timeadjustments' into NewHorizonsMerge ... Conflicts: CMakeLists.txt include/openspace/rendering/model/modelgeometry.h include/openspace/rendering/model/wavefrontgeometry.h include/openspace/rendering/planets/renderableplanetprojection.h include/openspace/util/imagesequencer.h scripts/default_startup.lua src/abuffer/abuffer.cpp src/rendering/model/renderablemodel.cpp src/rendering/model/wavefrontgeometry.cpp src/rendering/planets/renderableplanet.cpp src/rendering/planets/renderableplanetprojection.cpp src/rendering/renderablefov.cpp src/rendering/renderabletrail.cpp src/rendering/renderengine.cpp src/scene/scene.cpp src/scene/spiceephemeris.cpp src/util/imagesequencer.cpp	2015-04-23 22:51:55 -04:00
Anton Arbring	6cc21b3be7	Added image plane projection + shaders and dynamic ephemeris. ... The plane projection is now hard coded to target until it can be returned from imagesequencer. The dynamic ephemeris is not used for this at the moment but will come in handy later on.	2015-04-17 22:09:35 -04:00