diff --git a/scripts/default_startup.lua b/scripts/default_startup.lua index 6ef57e5c0e..9d7089981b 100644 --- a/scripts/default_startup.lua +++ b/scripts/default_startup.lua @@ -9,6 +9,10 @@ openspace.setInvertRoll(true); --openspace.time.setTime("2007 FEB 28 03:45:00") -- Io Capture! + +--openspace.time.setTime("2011 AUG 6 07:15:00") -- Dawn @ Vestaprojection +--openspace.time.setTime("2014 AUG 28 03:45:00") -- Rosetta Travels 67p in triangular shape + openspace.time.setDeltaTime(10) -- How many seconds pass per second of realtime, changeable in the GUI dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua')) -- Load the default keybindings diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 02b9cb4881..1594700989 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -539,18 +539,18 @@ namespace openspace { int i = 0; PrintText(i++, "Date: %s", Time::ref().currentTimeUTC().c_str()); - /* PrintText(i++, "Avg. Frametime: %.5f", sgct::Engine::instance()->getAvgDt()); PrintText(i++, "Drawtime: %.5f", sgct::Engine::instance()->getDrawTime()); PrintText(i++, "Frametime: %.5f", sgct::Engine::instance()->getDt()); + /* PrintText(i++, "Origin: (% .5f, % .5f, % .5f, % .5f)", origin[0], origin[1], origin[2], origin[3]); PrintText(i++, "Cam pos: (% .5f, % .5f, % .5f, % .5f)", position[0], position[1], position[2], position[3]); PrintText(i++, "View dir: (% .5f, % .5f, % .5f)", viewdirection[0], viewdirection[1], viewdirection[2]); PrintText(i++, "Cam->origin: (% .15f, % .4f)", pssl[0], pssl[1]); PrintText(i++, "Scaling: (% .5f, % .5f)", scaling[0], scaling[1]); */ - - if (openspace::ImageSequencer2::ref().isReady()){ + + if (openspace::ImageSequencer2::ref().isReady()) { double remaining = openspace::ImageSequencer2::ref().getNextCaptureTime() - currentTime; double t = 1.f - remaining / openspace::ImageSequencer2::ref().getIntervalLength(); std::string progress = "|"; @@ -983,7 +983,7 @@ void RenderEngine::changeViewPoint(std::string origin) { if (solarSystemBarycenterNode == nullptr || plutoBarycenterNode == nullptr || newHorizonsNode == nullptr || jupiterBarycenterNode == nullptr //|| dawnNode == nullptr - //|| vestaNode == nullptr + //|| vestaNode == nullptr ) { LERROR("Necessary nodes does not exist"); return; @@ -995,6 +995,10 @@ void RenderEngine::changeViewPoint(std::string origin) { solarSystemBarycenterNode->setParent(plutoBarycenterNode); newHorizonsNode->setParent(plutoBarycenterNode); + + //dawnNode->setParent(plutoBarycenterNode); + //vestaNode->setParent(plutoBarycenterNode); + //newHorizonsTrailNode->setParent(plutoBarycenterNode); ghoul::Dictionary solarDictionary = { @@ -1069,6 +1073,8 @@ void RenderEngine::changeViewPoint(std::string origin) { jupiterBarycenterNode->setParent(solarSystemBarycenterNode); newHorizonsNode->setParent(solarSystemBarycenterNode); //newHorizonsTrailNode->setParent(solarSystemBarycenterNode); + //dawnNode->setParent(solarSystemBarycenterNode); + //vestaNode->setParent(solarSystemBarycenterNode); ghoul::Dictionary plutoDictionary = { @@ -1144,6 +1150,10 @@ void RenderEngine::changeViewPoint(std::string origin) { newHorizonsNode->setParent(jupiterBarycenterNode); //newHorizonsTrailNode->setParent(jupiterBarycenterNode); + //dawnNode->setParent(jupiterBarycenterNode); + //vestaNode->setParent(jupiterBarycenterNode); + + ghoul::Dictionary solarDictionary = { { std::string("Type"), std::string("Spice") }, @@ -1157,7 +1167,7 @@ void RenderEngine::changeViewPoint(std::string origin) { { { std::string("Type"), std::string("Spice") }, { std::string("Body"), std::string("PlUTO BARYCENTER") }, - { std::string("Reference"), std::string("ECLIPJ2000") }, + { std::string("Reference"), std::string("GALACTIC") }, { std::string("Observer"), std::string("JUPITER BARYCENTER") }, { std::string("Kernels"), ghoul::Dictionary() } }; @@ -1211,11 +1221,22 @@ void RenderEngine::changeViewPoint(std::string origin) { return; } //if (origin == "Vesta") { + // + // vestaNode->setParent(scene()->sceneGraphNode("SolarSystem")); + // vestaNode->setEphemeris(new StaticEphemeris); + // + // solarSystemBarycenterNode->setParent(vestaNode); + // newHorizonsNode->setParent(vestaNode); + // + // dawnNode->setParent(vestaNode); + // plutoBarycenterNode->setParent(vestaNode); + // + // // ghoul::Dictionary plutoDictionary = // { // { std::string("Type"), std::string("Spice") }, // { std::string("Body"), std::string("PLUTO BARYCENTER") }, - // { std::string("Reference"), std::string("ECLIPJ2000") }, + // { std::string("Reference"), std::string("GALACTIC") }, // { std::string("Observer"), std::string("VESTA") }, // { std::string("Kernels"), ghoul::Dictionary() } // }; @@ -1223,7 +1244,7 @@ void RenderEngine::changeViewPoint(std::string origin) { // { // { std::string("Type"), std::string("Spice") }, // { std::string("Body"), std::string("SUN") }, - // { std::string("Reference"), std::string("ECLIPJ2000") }, + // { std::string("Reference"), std::string("GALACTIC") }, // { std::string("Observer"), std::string("VESTA") }, // { std::string("Kernels"), ghoul::Dictionary() } // }; @@ -1232,7 +1253,7 @@ void RenderEngine::changeViewPoint(std::string origin) { // { // { std::string("Type"), std::string("Spice") }, // { std::string("Body"), std::string("JUPITER BARYCENTER") }, - // { std::string("Reference"), std::string("ECLIPJ2000") }, + // { std::string("Reference"), std::string("GALACTIC") }, // { std::string("Observer"), std::string("VESTA") }, // { std::string("Kernels"), ghoul::Dictionary() } // };