From c06b7bce11728186e6ccb6921ae8fbaacb4bfec1 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 30 Aug 2016 10:48:12 +0200 Subject: [PATCH] Adding Philae trail --- data/scene/rosetta.scene | 4 +- data/scene/rosetta/67P/67P.mod | 22 ------ data/scene/rosetta/rosetta/rosetta.mod | 95 +++++++++++++++++--------- 3 files changed, 64 insertions(+), 57 deletions(-) diff --git a/data/scene/rosetta.scene b/data/scene/rosetta.scene index 32a635067b..0aa3c75884 100644 --- a/data/scene/rosetta.scene +++ b/data/scene/rosetta.scene @@ -9,9 +9,9 @@ function preInitialization() openspace.spice.loadKernel("${SPICE}/naif0011.tls") openspace.spice.loadKernel("${SPICE}/pck00010.tpc") - openspace.time.setTime("2014-08-15T03:05:18.101") + -- openspace.time.setTime("2014-08-15T03:05:18.101") -- openspace.time.setTime("2016-08-20T03:05:18.101") - -- openspace.time.setTime("2014-11-17T03:05:18.101") + openspace.time.setTime("2014-11-12T09:00:18.101") -- openspace.time.setTime("2015-07-29T06:02:10.000") -- openspace.time.setTime("2014 AUG 21 18:00:00") -- openspace.time.setTime("2015 SEP 10 19:39:00") diff --git a/data/scene/rosetta/67P/67P.mod b/data/scene/rosetta/67P/67P.mod index 27e25f8959..9c14de2e59 100644 --- a/data/scene/rosetta/67P/67P.mod +++ b/data/scene/rosetta/67P/67P.mod @@ -9,28 +9,6 @@ return { Body = "CHURYUMOV-GERASIMENKO", Reference = "GALACTIC", Observer = "SUN", - Kernels = { - --needed - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", - -- SPK - --long term orbits loaded first - '${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/LORL_DL_009_02____P__00268.BSP', - '${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/RORL_DL_009_02____P__00268.BSP', - '${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/CORL_DL_009_02____P__00268.BSP', - - '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORL_DL_006_01____H__00156.BSP', - '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORL_DL_006_01____H__00156.BSP', - '${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORL_DL_006_01____H__00156.BSP', - - --Jan 2014 - May 2015 (version match with 00162 ck files) - "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/CORB_DV_097_01_______00162.BSP", - "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/RORB_DV_097_01_______00162.BSP", - "${OPENSPACE_DATA}/spice/RosettaKernels/SPK/LORB_DV_097_01_______00162.BSP", - - "${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/CORB_DV_211_01_______00288.BSP", - "${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/RORB_DV_211_01_______00288.BSP", - "${OPENSPACE_DATA}/spice/RosettaKernels_New/SPK/LORB_DV_211_01_______00288.BSP", - } }, }, GuiName = "/Solar/67PBarycenter", diff --git a/data/scene/rosetta/rosetta/rosetta.mod b/data/scene/rosetta/rosetta/rosetta.mod index 19339a6612..fd489a5f23 100644 --- a/data/scene/rosetta/rosetta/rosetta.mod +++ b/data/scene/rosetta/rosetta/rosetta.mod @@ -1,4 +1,7 @@ RosettaKernels = { + "${OPENSPACE_DATA}/spice/Rosetta/SCLK/ROS_160718_STEP.TSC", + "${OPENSPACE_DATA}/spice/Rosetta/SCLK/ros_triv.tsc", + "${OPENSPACE_DATA}/spice/Rosetta/SPK/CORB_DV_243_01___T19_00325.BSP", "${OPENSPACE_DATA}/spice/Rosetta/SPK/CORB_DV_223_01___T19_00302.BSP", "${OPENSPACE_DATA}/spice/Rosetta/SPK/CORB_DV_145_01___T19_00216.BSP", @@ -17,9 +20,6 @@ RosettaKernels = { "${OPENSPACE_DATA}/spice/Rosetta/IK/ROS_NAVCAM_V01.TI", - "${OPENSPACE_DATA}/spice/Rosetta/SCLK/ROS_160718_STEP.TSC", - "${OPENSPACE_DATA}/spice/Rosetta/SCLK/ros_triv.tsc", - "${OPENSPACE_DATA}/spice/Rosetta/FK/ROS_CHURYUMOV_V01.TF", "${OPENSPACE_DATA}/spice/Rosetta/FK/ROS_V26.TF", @@ -137,13 +137,13 @@ return { Rotation = { ModelTransform = RotationMatrix } }, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "-226071", -- ROS_HGA - DestinationFrame = "ROS_SPACECRAFT", - } - } + -- Transform = { + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "-226071", -- ROS_HGA + -- DestinationFrame = "ROS_SPACECRAFT", + -- } + -- } }, { Name = "Rosetta_parts", @@ -216,13 +216,13 @@ return { Rotation = { ModelTransform = RotationMatrix } }, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "-226015", -- ROS_SA - DestinationFrame = "ROS_SPACECRAFT", - } - } + -- Transform = { + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "-226015", -- ROS_SA + -- DestinationFrame = "ROS_SPACECRAFT", + -- } + -- } }, { Name = "Rosetta_wing_b", @@ -241,13 +241,13 @@ return { Rotation = { ModelTransform = RotationMatrix } }, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "-226025", -- ROS_SA - DestinationFrame = "ROS_SPACECRAFT", - } - } + -- Transform = { + -- Rotation = { + -- Type = "SpiceRotation", + -- SourceFrame = "-226025", -- ROS_SA + -- DestinationFrame = "ROS_SPACECRAFT", + -- } + -- } }, { Name = "Rosetta_yellow_foil", @@ -269,9 +269,18 @@ return { }, { Name = "Philae", - Parent = "RosettaModel" + Parent = "RosettaModel", -- This should need a transform, but currently the model is intrinsically -- translated + -- Transform = { + -- Translation = { + -- Type = "SpiceEphemeris", + -- Body = "PHILAE", + -- Reference = "GALACTIC", + -- Observer = "ROSETTA", + -- Kernels = RosettaKernels + -- } + -- } }, { Name = "Philae_foil", @@ -368,20 +377,40 @@ return { End = "2016 SEP 30 12:00:00" }, SampleDeltaTime = 3600, -- Seconds between each point - SubSamples = 0, + SubSamples = 3, }, GuiName = "/Solar/RosettaCometTrail" }, + { + Name = "PhilaeTrail", + Parent = "67PBarycenter", + Renderable = { + Type = "RenderableTrailNew", + -- Spice + Body = "PHILAE", + Frame = "GALACTIC", + Observer = "CHURYUMOV-GERASIMENKO", + -- Optional rendering properties + LineColor = { 1.0, 1.0, 1.0 }, + PointColor = { 0.9, 0.2, 0.9 }, + LineFade = 0.0, -- [0,1] + RenderPart = 0.5, -- [0,1] + LineWidth = 2, + ShowTimeStamps = false, + RenderFullTrail = false, + -- Time interval + TimeRange = { + Start = "2014 NOV 12 08:35:00", + End = "2014 NOV 12 17:00:00" + }, + SampleDeltaTime = 2, -- Seconds between each point + SubSamples = 0, + }, + GuiName = "/Solar/RosettaCometTrail" + }, { Name = "NAVCAM", Parent = "Rosetta", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "NAVCAM", - DestinationFrame = "ROS_SPACECRAFT", - }, - }, GuiName = "/Solar/Rosetta_navcam" }, {