From f82a0d14ad3ea19f4bf9ff5d9aa172f00d87e94d Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 5 Jun 2020 16:42:31 -0400 Subject: [PATCH] aded time range to voyager rotations; disabled spice exceptions by default; updated space module to read spiceexpection value; --- .../scene/solarsystem/missions/voyager/voyager1.asset | 7 ++++++- .../scene/solarsystem/missions/voyager/voyager2.asset | 7 ++++++- modules/space/spacemodule.cpp | 6 +++++- openspace.cfg | 3 +++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index f206b8a6b4..c5a8ae6b0c 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -61,7 +61,12 @@ local Voyager1 = { Rotation = { Type = "SpiceRotation", SourceFrame = "VG1_SC_BUS", - DestinationFrame = "GALACTIC" + DestinationFrame = "GALACTIC", + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1977-SEP-05 14:10:11.786", + End = "2027-DEC-27" + } } }, GUI = { diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 36f3d74089..f1a87c9e13 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -64,7 +64,12 @@ local Voyager2 = { Rotation = { Type = "SpiceRotation", SourceFrame = "VG2_SC_BUS", - DestinationFrame = "GALACTIC" + DestinationFrame = "GALACTIC", + TimeFrame = { + Type = "TimeFrameInterval", + Start = "1977-AUG-20 16:07:06.535", + End = "2027-DEC-27" + } } }, GUI = { diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index 81e86e6ccf..e720068f87 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -68,7 +68,7 @@ SpaceModule::SpaceModule() addProperty(_showSpiceExceptions); } -void SpaceModule::internalInitialize(const ghoul::Dictionary&) { +void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) { FactoryManager::ref().addFactory( std::make_unique>(), "PlanetGeometry" @@ -106,6 +106,10 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary&) { auto fGeometry = FactoryManager::ref().factory(); ghoul_assert(fGeometry, "Planet geometry factory was not created"); fGeometry->registerClass("SimpleSphere"); + + if (dictionary.hasKeyAndValue(SpiceExceptionInfo.identifier)) { + _showSpiceExceptions = dictionary.value(SpiceExceptionInfo.identifier); + } } void SpaceModule::internalDeinitializeGL() { diff --git a/openspace.cfg b/openspace.cfg index a557e5468d..f57badd935 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -144,6 +144,9 @@ ModuleConfigurations = { -- GuiScale = 2.0, Enabled = true, Visible = true + }, + Space = { + ShowExceptions = false } }