mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into solarsystem2

Browse Source 
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
This commit is contained in:
Alexander Bock
2014-10-06 22:22:30 +02:00
parent bae710d245 62e0844671
commit 67f0fb3c08
59 changed files with 1449 additions and 2017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rendering/renderablepath.cpp
View File

@@ -51,7 +51,7 @@ namespace openspace{
double lightTime = 0.0;
double planetYear = 31536000;
_time = SM.convertStringToTdbSeconds("2005 jan 09 00:00:00");
SpiceManager::ref().getETfromDate("2005 jan 09 00:00:00", _time);
// -------------------------------------- ^ this has to be simulation start-time, not passed in here though --
double et = _time - planetYear;
@@ -72,7 +72,7 @@ namespace openspace{
_increment = planetYear / segments;
for (int i = 0; i < segments+1; i++){
SM.getTargetPscState("EARTH", et, "GALACTIC", "LT+S", "SUN", pscpos, pscvel, lightTime);
SpiceManager::ref().getTargetState("EARTH", "SUN", "GALACTIC", "LT+S", et, pscpos, pscvel, lightTime);
psc tmppos = glm::vec4(i, i, i, 7);
_varray.push_back(tmppos[0]);
@@ -222,7 +222,7 @@ void RenderablePath::update(const UpdateData& data){
double lightTime;
_time = data.time;
SM.getTargetPscState("EARTH", data.time, "GALACTIC", "LT+S", "SUN", _pscpos, _pscvel, lightTime);
SpiceManager::ref().getTargetState("EARTH", "SUN", "GALACTIC", "LT+S", data.time, _pscpos, _pscvel, lightTime);
}
void RenderablePath::loadTexture()