From 41c53d262d6a3d09af7504224d3fc621bb9d495e Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Thu, 10 Jun 2021 13:30:47 +0200 Subject: [PATCH] Switch use of Spice id SUN to SSB where SSB is parent --- .../dwarf_planets/pluto/trail.asset | 2 +- .../dwarf_planets/pluto/transforms.asset | 2 +- .../solarsystem/missions/dawn/ceres.asset | 4 ++-- .../solarsystem/missions/dawn/dawn.asset | 4 ++-- .../solarsystem/missions/dawn/vesta.asset | 4 ++-- .../solarsystem/missions/jwst/jwst.asset | 2 +- .../missions/messenger/messengerSC.asset | 2 +- .../missions/newhorizons/transforms.asset | 2 +- .../missions/osirisrex/bennu_projection.asset | 2 +- .../missions/osirisrex/model.asset | 2 +- .../missions/osirisrex/trail.asset | 2 +- .../missions/osirisrex/transforms.asset | 2 +- .../missions/perseverance/trail.asset | 4 ++-- .../missions/pioneer/pioneer10.asset | 4 ++-- .../missions/pioneer/pioneer11.asset | 4 ++-- .../solarsystem/missions/rosetta/67p.asset | 4 ++-- .../missions/rosetta/rosetta.asset | 2 +- .../missions/voyager/voyager1.asset | 12 +++++------ .../missions/voyager/voyager2.asset | 20 +++++++++---------- .../planets/earth/lagrange_points/L1.asset | 2 +- .../planets/earth/lagrange_points/L2.asset | 4 ++-- .../planets/earth/lagrange_points/L4.asset | 2 +- .../planets/earth/lagrange_points/L5.asset | 2 +- .../solarsystem/planets/earth/trail.asset | 2 +- .../planets/earth/transforms.asset | 2 +- .../planets/jupiter/transforms.asset | 2 +- .../solarsystem/planets/mars/transforms.asset | 2 +- .../solarsystem/planets/mercury/trail.asset | 2 +- .../planets/neptune/transforms.asset | 2 +- .../planets/saturn/transforms.asset | 2 +- .../planets/uranus/transforms.asset | 2 +- .../planets/venus/transforms.asset | 2 +- data/assets/scene/solarsystem/sun/glare.asset | 2 +- .../rendering/atmospheredeferredcaster.cpp | 6 +++--- modules/globebrowsing/src/renderableglobe.cpp | 6 +++--- src/util/spicemanager.cpp | 5 +++++ 36 files changed, 66 insertions(+), 61 deletions(-) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index c309dce11b..ef7dd49624 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -13,7 +13,7 @@ local PlutoBarycenterTrail = { Translation = { Type = "SpiceTranslation", Target = "PLUTO BARYCENTER", - Observer = "SUN", + Observer = "SSB", Kernels = kernels }, Color = { 0.3, 0.7, 0.3 }, diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset index e190435fd3..475a73286b 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset @@ -12,7 +12,7 @@ local PlutoBarycenter = { Translation = { Type = "SpiceTranslation", Target = "PLUTO BARYCENTER", - Observer = "SUN", + Observer = "SSB", Kernels = kernels } }, diff --git a/data/assets/scene/solarsystem/missions/dawn/ceres.asset b/data/assets/scene/solarsystem/missions/dawn/ceres.asset index 900df2e071..3b5bcc41f9 100644 --- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset +++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset @@ -28,7 +28,7 @@ local Ceres = { Translation = { Type = "SpiceTranslation", Target = "CERES", - Observer = "SUN", + Observer = "SSB", Kernels = { kernels .. "/dawn_ceres_v01.tpc", kernels .. "/sb_ceres_140724.bsp", @@ -65,7 +65,7 @@ local CeresTrail = { Translation = { Type = "SpiceTranslation", Target = "CERES", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.7, 0.8, 0.7 }, StartTime = "2010 JAN 01 00:00:00.000", diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index 96d8464328..5887fb10d0 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -637,7 +637,7 @@ local Dawn = { Translation = { Type = "SpiceTranslation", Target = "DAWN", - Observer = "SUN", + Observer = "SSB", Kernels = KernelFiles }, Rotation = { @@ -722,7 +722,7 @@ local DawnTrail = { Translation = { Type = "SpiceTranslation", Target = "DAWN", - Observer = "SUN" + Observer = "SSB" }, Color = { 1.0, 0.8, 0.4 }, ShowFullTrail = false, diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 99f3b082ff..247e009502 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -31,7 +31,7 @@ local Vesta = { Translation = { Type = "SpiceTranslation", Target = "VESTA", - Observer = "SUN", + Observer = "SSB", Kernels = { --kernels .. "/dawn_vesta_v06.tpc", kernels .. "/sb_vesta_071107.bsp" @@ -118,7 +118,7 @@ local VestaTrail = { Translation = { Type = "SpiceTranslation", Target = "VESTA", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.7, 0.8, 0.7 }, StartTime = "2007 JUL 20 12:00:00", diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset index a0c86521e4..6909b74699 100644 --- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset @@ -165,7 +165,7 @@ local JWSTSunTrail = { Translation = { Type = "SpiceTranslation", Target = "JWST", - Observer = "SUN", + Observer = "SSB", Kernels = JWSTKernel .. "/jwst_horizons_20200101_20240101_v01.bsp" }, Color = { 0.0, 0.9, 0.9 }, diff --git a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset index 7b46f16645..b5cadee6e1 100644 --- a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset +++ b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset @@ -67,7 +67,7 @@ local Messenger = { Translation = { Type = "SpiceTranslation", Target = "MESSENGER", - Observer = "SUN", + Observer = "SSB", Kernels = LocalKernels }, Rotation = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset index 5238428c17..ff3965ba14 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset @@ -14,7 +14,7 @@ local PlutoBarycenterAccurate = { Translation = { Type = "SpiceTranslation", Target = "PLUTO BARYCENTER", - Observer = "SUN", + Observer = "SSB", Kernels = kernels.PlutoKernels } }, diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset index ae2b0add47..afcfb529a7 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset @@ -88,7 +88,7 @@ local BennuTrail = { Translation = { Type = "SpiceTranslation", Target = BENNU_BODY, - Observer = "SUN" + Observer = "SSB" }, Color = { 0.4, 0.0, 0.7 }, StartTime = "2015 JAN 01 00:00:00.000", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index 0af62025e7..aab64ada66 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -36,7 +36,7 @@ local OsirisRex = { Translation = { Type = "SpiceTranslation", Target = "OSIRIS-REX", - Observer = "SUN", + Observer = "SSB", Kernels = OsirisRexKernels }, Rotation = { diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset index 4d152a2bf7..01b33183bc 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset @@ -37,7 +37,7 @@ local OsirisRexTrailSolarSystem = { Translation = { Type = "SpiceTranslation", Target = "OSIRIS-REX", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.2, 0.9, 0.2 }, StartTime = "2016 SEP 8 23:05:00.50", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset index e8266beadf..ca481d5b1b 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset @@ -12,7 +12,7 @@ local BennuBarycenter = { Translation = { Type = "SpiceTranslation", Target = BENNU_BODY, - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/missions/perseverance/trail.asset b/data/assets/scene/solarsystem/missions/perseverance/trail.asset index 10c76a45eb..cd7fffdb30 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/trail.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/trail.asset @@ -35,7 +35,7 @@ local PerseveranceNode = { Translation = { Type = "SpiceTranslation", Target = perseverance_id, - Observer = "SUN", + Observer = "SSB", Kernels = m2020_kernels } }, @@ -54,7 +54,7 @@ local PerseveranceTrailSun = { Translation = { Type = "SpiceTranslation", Target = perseverance_id, - Observer = "SUN", + Observer = "SSB", Kernels = m2020_kernels }, Color = { 0.2, 0.7, 0.1 }, diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset index 5ff94818de..bf147bbf71 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset @@ -21,7 +21,7 @@ local Pioneer10 = { Translation = { Type = "SpiceTranslation", Target = Pioneer10NAIF, - Observer = "SUN", + Observer = "SSB", Kernels = kernelsList } }, @@ -41,7 +41,7 @@ local Pioneer10Trail = { Translation = { Type = "SpiceTranslation", Target = Pioneer10NAIF, - Observer = "SUN", + Observer = "SSB", Kernels = kernelsList }, Color = { 0.70, 0.50, 0.20 }, diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset index c9f5a6355c..dad188e997 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset @@ -24,7 +24,7 @@ local Pioneer11 = { Translation = { Type = "SpiceTranslation", Target = Pioneer11NAIF, - Observer = "SUN", + Observer = "SSB", Kernels = kernelsList } }, @@ -44,7 +44,7 @@ local Pioneer11Trail = { Translation = { Type = "SpiceTranslation", Target = Pioneer11NAIF, - Observer = "SUN", + Observer = "SSB", Kernels = kernelsList }, Color = { 0.70, 0.50, 0.20 }, diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index cf41bc2a91..76d84cb4fa 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -33,7 +33,7 @@ local Barycenter = { Translation = { Type = "SpiceTranslation", Target = "CHURYUMOV-GERASIMENKO", - Observer = "SUN" + Observer = "SSB" } }, GUI = { @@ -118,7 +118,7 @@ local Trail67P = { Translation = { Type = "SpiceTranslation", Target = "CHURYUMOV-GERASIMENKO", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.1, 0.9, 0.2 }, StartTime = "2014 JAN 01 00:00:00.000", diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 189d22ca49..b33c412cde 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -94,7 +94,7 @@ local Rosetta = { Translation = { Type = "SpiceTranslation", Target = "ROSETTA", - Observer = "SUN", + Observer = "SSB", Kernels = RosettaKernels }, Rotation = { diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index 85d6b3bf30..a0d0d4ae22 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -47,7 +47,7 @@ local Voyager1 = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Rotation = { @@ -108,7 +108,7 @@ local VoyagerTrailCruiseEarthJupiter = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Color = { 0.70, 0.50, 0.20 }, @@ -130,7 +130,7 @@ local VoyagerTrailEncounterJupiter = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Color = { 0.70, 0.50, 0.20 }, @@ -153,7 +153,7 @@ local VoyagerTrailCruiseJupiterSaturn = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -176,7 +176,7 @@ local VoyagerTrailEncounterSaturn = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -199,7 +199,7 @@ local VoyagerTrailCruiseSaturnInf = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 1", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 812c3d29a2..f2fddaab3c 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -51,7 +51,7 @@ local Voyager2 = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Rotation = { @@ -112,7 +112,7 @@ local VoyagerTrailCruiseEarthJupiter = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Color = { 0.70, 0.50, 0.20 }, @@ -134,7 +134,7 @@ local VoyagerTrailEncounterJupiter = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, Color = { 0.70, 0.50, 0.20 }, @@ -157,7 +157,7 @@ local VoyagerTrailCruiseJupiterSaturn = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -180,7 +180,7 @@ local VoyagerTrailEncounterSaturn = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -203,7 +203,7 @@ local VoyagerTrailCruiseSaturnUranus = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -226,7 +226,7 @@ local VoyagerTrailEncounterUranus = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -249,7 +249,7 @@ local VoyagerTrailCruiseUranusNeptune = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -272,7 +272,7 @@ local VoyagerTrailEncounterNeptune = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, @@ -295,7 +295,7 @@ local VoyagerTrailCruiseNeptuneInf = { Translation = { Type = "SpiceTranslation", Target = "VOYAGER 2", - Observer = "SUN", + Observer = "SSB", Kernels = Kernels }, EnableFade = false, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset index 420ff19185..3d9905bf89 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset @@ -20,7 +20,7 @@ local L1 = { Translation = { Type = "SpiceTranslation", Target = "391", -- L1 - Observer = "SUN", + Observer = "SSB", Kernels = kernels .. "/L1_de431.bsp" } }, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset index 0f84519837..0d3741f2de 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset @@ -19,7 +19,7 @@ local L2Small = { Translation = { Type = "SpiceTranslation", Target = "392", -- L2 - Observer = "SUN", + Observer = "SSB", Kernels = kernels .. "/L2_de431.bsp" } }, @@ -46,7 +46,7 @@ local L2 = { Translation = { Type = "SpiceTranslation", Target = "392", -- L2 - Observer = "SUN", + Observer = "SSB", Kernels = kernels .. "/L2_de431.bsp" } }, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset index 05ca2a57b5..5ed34bcb8a 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset @@ -20,7 +20,7 @@ local L4 = { Translation = { Type = "SpiceTranslation", Target = "394", -- L4 - Observer = "SUN", + Observer = "SSB", Kernels = kernels .. "/L4_de431.bsp" } }, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset index dcaabb12b7..1fffca80db 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset @@ -20,7 +20,7 @@ local L5 = { Translation = { Type = "SpiceTranslation", Target = "395", -- L5 - Observer = "SUN", + Observer = "SSB", Kernels = kernels .. "/L5_de431.bsp" } }, diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 39870cc5af..2f91712bde 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -12,7 +12,7 @@ local EarthTrail = { Translation = { Type = "SpiceTranslation", Target = "EARTH", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.5, 0.8, 1.0 }, Period = 365.242, diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index 7717c89707..d08a74058f 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -11,7 +11,7 @@ local EarthBarycenter = { Translation = { Type = "SpiceTranslation", Target = "EARTH BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index 28db943e93..371cad76da 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -11,7 +11,7 @@ local JupiterBarycenter = { Translation = { Type = "SpiceTranslation", Target = "JUPITER BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index 1ec160733b..7b8fb79dbf 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -9,7 +9,7 @@ local MarsBarycenter = { Translation = { Type = "SpiceTranslation", Target = "MARS BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 40628994a2..2514f0ca70 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -12,7 +12,7 @@ local MercuryTrail = { Translation = { Type = "SpiceTranslation", Target = "MERCURY", - Observer = "SUN" + Observer = "SSB" }, Color = { 0.6, 0.5, 0.5 }, Period = 87.968, diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index ede2678dbd..6ad969535d 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -9,7 +9,7 @@ local NeptuneBarycenter = { Translation = { Type = "SpiceTranslation", Target = "NEPTUNE BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index cedfe258df..066c700e44 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -9,7 +9,7 @@ local SaturnBarycenter = { Translation = { Type = "SpiceTranslation", Target = "SATURN BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index 99a3274132..8a01b2847b 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -11,7 +11,7 @@ local UranusBarycenter = { Translation = { Type = "SpiceTranslation", Target = "URANUS BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 2db6ea4117..79f947d1cc 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -9,7 +9,7 @@ local VenusBarycenter = { Translation = { Type = "SpiceTranslation", Target = "VENUS BARYCENTER", - Observer = "SUN" + Observer = "SSB" } }, GUI = { diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 827ab90509..c565d81004 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -21,7 +21,7 @@ local SunGlare = { Transform = { Translation = { Type = "SpiceTranslation", - Target = "SUN", + Target = "SSB", Observer = "SSB" } }, diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp index b26103a2fd..b01c2c604d 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -348,7 +348,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData, double lt; glm::dvec3 sunPosWorld = SpiceManager::ref().targetPosition( "SUN", - "SUN", + "SSB", "GALACTIC", {}, _time, @@ -386,7 +386,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData, // Getting source and caster: glm::dvec3 sourcePos = SpiceManager::ref().targetPosition( shadowConf.source.first, - "SUN", + "SSB", "GALACTIC", {}, _time, @@ -395,7 +395,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData, sourcePos *= KM_TO_M; // converting to meters glm::dvec3 casterPos = SpiceManager::ref().targetPosition( shadowConf.caster.first, - "SUN", + "SSB", "GALACTIC", {}, _time, diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 5cdeeb1ee6..e6176e1ac4 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -1995,7 +1995,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog // Getting source and caster: glm::dvec3 sourcePos = SpiceManager::ref().targetPosition( shadowConf.source.first, - "SUN", + "SSB", "GALACTIC", {}, data.time.j2000Seconds(), @@ -2004,7 +2004,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog sourcePos *= KM_TO_M; // converting to meters glm::dvec3 casterPos = SpiceManager::ref().targetPosition( shadowConf.caster.first, - "SUN", + "SSB", "GALACTIC", {}, data.time.j2000Seconds(), @@ -2056,7 +2056,7 @@ void RenderableGlobe::calculateEclipseShadows(ghoul::opengl::ProgramObject& prog const glm::dvec3 sunPos = SpiceManager::ref().targetPosition( "SUN", - "SUN", + "SSB", "GALACTIC", {}, data.time.j2000Seconds(), diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index fa862a73df..30e17b8ef6 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -325,6 +325,11 @@ bool SpiceManager::hasSpkCoverage(const std::string& target, double et) const { ghoul_assert(!target.empty(), "Empty target"); const int id = naifId(target); + // SOLAR SYSTEM BARYCENTER special case, implicitly included by Spice + if (id == 0) { + return true; + } + const auto it = _spkIntervals.find(id); if (it != _spkIntervals.end()) { const std::vector>& intervalVector = it->second;