From 099bcc2c9b2afdde112008ea3dda657885784811 Mon Sep 17 00:00:00 2001 From: michal Date: Thu, 16 Oct 2014 16:13:54 -0400 Subject: [PATCH] changing renderabletrail class to work for planetocentric --- include/openspace/rendering/renderabletrail.h | 1 + openspace-data | 2 +- scripts/default_startup.lua | 2 +- src/rendering/renderabletrail.cpp | 15 +++++++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/openspace/rendering/renderabletrail.h b/include/openspace/rendering/renderabletrail.h index 15fb191094..30376ff880 100644 --- a/include/openspace/rendering/renderabletrail.h +++ b/include/openspace/rendering/renderabletrail.h @@ -58,6 +58,7 @@ public: std::string _target; std::string _observer; std::string _frame; + std::string _orbitVariety; // color glm::vec3 _c; double _r, _g, _b; diff --git a/openspace-data b/openspace-data index 26b896ed47..588e958d81 160000 --- a/openspace-data +++ b/openspace-data @@ -1 +1 @@ -Subproject commit 26b896ed47ced54d24245d8947b8b2f47551740a +Subproject commit 588e958d81514daedb6f2fd9096832f0dc76ef69 diff --git a/scripts/default_startup.lua b/scripts/default_startup.lua index cb4071ff30..11f4afa199 100644 --- a/scripts/default_startup.lua +++ b/scripts/default_startup.lua @@ -3,6 +3,6 @@ openspace.time.setTime("2007-02-26T17:00:00") --openspace.time.setTime("2006-08-22T20:00:00") --openspace.time.setDeltaTime(200000.0) -openspace.time.setDeltaTime(200000.0) +openspace.time.setDeltaTime(20000.0) --openspace.time.setDeltaTime(30000.0) -- print(openspace.time.currentTimeUTC()) diff --git a/src/rendering/renderabletrail.cpp b/src/rendering/renderabletrail.cpp index 1ef78428ff..76b8ef6710 100644 --- a/src/rendering/renderabletrail.cpp +++ b/src/rendering/renderabletrail.cpp @@ -38,6 +38,7 @@ namespace { const std::string keyBody = "Body"; const std::string keyObserver = "Observer"; const std::string keyFrame = "Frame"; + const std::string keyOrbitVariety = "OrbitVariety"; const std::string keyPathModule = "ModulePath"; const std::string keyColor = "RGB"; const std::string keyTropicalOrbitPeriod = "TropicalOrbitPeriod"; @@ -65,6 +66,12 @@ namespace openspace{ assert(dictionary.getValue(keyDayLength , _day));//not used now, will be though. // values in modfiles set from here // http://nssdc.gsfc.nasa.gov/planetary/factsheet/marsfact.html + + if (!dictionary.getValue(keyOrbitVariety, _orbitVariety)){ + _orbitVariety = "heliocentric"; + } + if (_target == "IO") + std::cout << _target << " has orbit variety : " << _orbitVariety << std::endl; //white is default col if (!dictionary.getValue(keyColor, _c)){ @@ -230,17 +237,17 @@ void RenderableTrail::render(const RenderData& data){ updateTrail(); - + /* glBindVertexArray(_vaoID); glDrawArrays(_mode, 0, _vtotal); glBindVertexArray(0); - /* + */ glPointSize(2.f); glBindVertexArray(_vaoID); glDrawArrays(GL_POINTS, 0, _vtotal); glBindVertexArray(0); - */ + _programObject->deactivate(); } @@ -249,7 +256,7 @@ void RenderableTrail::update(const UpdateData& data){ _time = data.time; _delta = data.delta; - SpiceManager::ref().getTargetState(_target, _observer, _frame, "NONE", data.time+_increment, _pscpos, _pscvel, lightTime); + SpiceManager::ref().getTargetState(_target, _observer, _frame, "NONE", data.time + _increment, _pscpos, _pscvel, lightTime); } void RenderableTrail::loadTexture()