diff --git a/data/scene/imageplane/imageplane.mod b/data/scene/imageplane/imageplane.mod index 419e651374..b55d5b847a 100644 --- a/data/scene/imageplane/imageplane.mod +++ b/data/scene/imageplane/imageplane.mod @@ -11,10 +11,6 @@ return { Instrument = "NH_LORRI", Moving = false, Texture = "textures/test.jpg", - }, - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 1} }, }, -- LORRI FoV square @@ -30,10 +26,6 @@ return { Moving = true, Texture = "textures/squarefov.png", }, - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 1} - }, } } diff --git a/data/scene/newhorizons/jupiter/callisto/callisto.mod b/data/scene/newhorizons/jupiter/callisto/callisto.mod index 5bb6ed57f7..81fbdb7005 100644 --- a/data/scene/newhorizons/jupiter/callisto/callisto.mod +++ b/data/scene/newhorizons/jupiter/callisto/callisto.mod @@ -36,6 +36,7 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, + --[[ Ephemeris = { Type = "Spice", Body = "CALLISTO", @@ -50,6 +51,23 @@ return { Frame = "IAU_CALLISTO", Reference = "ECLIPJ2000" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "CALLISTO", + Reference = "ECLIPJ2000", + Observer = "JUPITER BARYCENTER", + Kernels = { + "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CALLISTO", + DestinationFrame = "ECLIPJ2000", + }, + }, GuiName = "/Solar/Planets/Jupiter" }, { @@ -62,10 +80,18 @@ return { Billboard = true, Texture = "textures/Callisto-Text.png" }, + --[[ Ephemeris = { Type = "Static", Position = {0, -1, 0, 7} } + ]] + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -10000000, 0} + }, + }, }, -- CallistoTrail module { diff --git a/data/scene/newhorizons/jupiter/europa/europa.mod b/data/scene/newhorizons/jupiter/europa/europa.mod index ff14b3448c..cc8fed3967 100644 --- a/data/scene/newhorizons/jupiter/europa/europa.mod +++ b/data/scene/newhorizons/jupiter/europa/europa.mod @@ -36,6 +36,7 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, + --[[ Ephemeris = { Type = "Spice", Body = "EUROPA", @@ -50,6 +51,23 @@ return { Frame = "IAU_EUROPA", Reference = "ECLIPJ2000" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "EUROPA", + Reference = "ECLIPJ2000", + Observer = "JUPITER BARYCENTER", + Kernels = { + "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_EUROPA", + DestinationFrame = "ECLIPJ2000", + }, + }, GuiName = "/Solar/Planets/Jupiter" }, { @@ -62,10 +80,18 @@ return { Billboard = true, Texture = "textures/Europa-Text.png" }, + --[[ Ephemeris = { Type = "Static", Position = {0, -1, 0, 7} } + ]] + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -10000000, 0} + }, + }, }, -- EuropaTrail module { diff --git a/data/scene/newhorizons/jupiter/ganymede/ganymede.mod b/data/scene/newhorizons/jupiter/ganymede/ganymede.mod index 5c92635c06..918f3045d3 100644 --- a/data/scene/newhorizons/jupiter/ganymede/ganymede.mod +++ b/data/scene/newhorizons/jupiter/ganymede/ganymede.mod @@ -36,6 +36,23 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "GANYMEDE", + Reference = "ECLIPJ2000", + Observer = "JUPITER BARYCENTER", + Kernels = { + "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_GANYMEDE", + DestinationFrame = "ECLIPJ2000", + }, + }, + --[[ Ephemeris = { Type = "Spice", Body = "GANYMEDE", @@ -50,6 +67,7 @@ return { Frame = "IAU_GANYMEDE", Reference = "ECLIPJ2000" }, + ]] GuiName = "/Solar/Planets/Jupiter" }, { @@ -66,6 +84,12 @@ return { Type = "Static", Position = {0, -1, 0, 7} } + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -10000000, 0} + }, + }, }, -- GanymedeTrail module { diff --git a/data/scene/newhorizons/jupiter/io/io.mod b/data/scene/newhorizons/jupiter/io/io.mod index 75053e1904..553ae825f5 100644 --- a/data/scene/newhorizons/jupiter/io/io.mod +++ b/data/scene/newhorizons/jupiter/io/io.mod @@ -36,6 +36,23 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "IO", + Reference = "ECLIPJ2000", + Observer = "JUPITER BARYCENTER", + Kernels = { + "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_IO", + DestinationFrame = "ECLIPJ2000", + }, + }, + --[[ Ephemeris = { Type = "Spice", Body = "IO", @@ -50,6 +67,7 @@ return { Frame = "IAU_IO", Reference = "ECLIPJ2000" }, + ]] GuiName = "/Solar/Planets/Jupiter" }, { @@ -62,10 +80,12 @@ return { Billboard = true, Texture = "textures/Io-Text.png" }, - Ephemeris = { - Type = "Static", - Position = {0, -1, 0, 7} - } + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -10000000, 0} + }, + }, }, -- IoTrail module { diff --git a/data/scene/newhorizons/jupiter/jupiter/jupiter.mod b/data/scene/newhorizons/jupiter/jupiter/jupiter.mod index 542a2b1eac..c8076e913e 100644 --- a/data/scene/newhorizons/jupiter/jupiter/jupiter.mod +++ b/data/scene/newhorizons/jupiter/jupiter/jupiter.mod @@ -2,15 +2,17 @@ return { -- Jupiter barycenter module { Name = "JupiterBarycenter", - Parent = "SolarSystemBarycenter", - Ephemeris = { - Type = "Spice", - Body = "JUPITER BARYCENTER", - Reference = "ECLIPJ2000", - Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", - } + Parent = "SolarSystemBarycenter", + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "JUPITER BARYCENTER", + Reference = "ECLIPJ2000", + Observer = "SUN", + Kernels = { + "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } + }, }, }, -- JupiterProjection module @@ -87,14 +89,12 @@ return { "JUPITER", "IO", "EUROPA", "GANYMEDE", "CALLISTO" } }, - Ephemeris = { - Type = "Static" - }, - - Rotation = { - Type = "Spice", - Frame = "IAU_JUPITER", - Reference = "GALACTIC" + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_JUPITER", + DestinationFrame = "GALACTIC", + }, }, GuiName = "/Solar/Planets/Jupiter" }, @@ -108,10 +108,12 @@ return { Billboard = true, Texture = "textures/Jupiter-text.png" }, - Ephemeris = { - Type = "Static", - Position = {0, -1, 0, 8} - } + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -100000000, 0} + }, + }, }, -- JupiterTrail module { diff --git a/data/scene/newhorizons/newhorizons/newhorizons.mod b/data/scene/newhorizons/newhorizons/newhorizons.mod index e7c2a007ca..2f517f390b 100644 --- a/data/scene/newhorizons/newhorizons/newhorizons.mod +++ b/data/scene/newhorizons/newhorizons/newhorizons.mod @@ -106,6 +106,7 @@ return { Ghosting = false, }, }, + --[[ Ephemeris = { Type = "Spice", Body = "NEW HORIZONS", @@ -116,6 +117,16 @@ return { -- Observer = "JUPITER BARYCENTER", Kernels = NewHorizonsKernels }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "NEW HORIZONS", + Reference = "GALACTIC", + Observer = "SUN", + Kernels = NewHorizonsKernels + }, + }, GuiName = "/Solar/NewHorizons" }, --NewHorizonsTrail module @@ -169,9 +180,6 @@ return { Ghosting = false, }, }, - Ephemeris = { - Type = "Static", - }, GuiName = "/Solar/NewHorizons" }, diff --git a/data/scene/newhorizons/pluto/charon/charon.mod b/data/scene/newhorizons/pluto/charon/charon.mod index 674cb55892..c7c36fe96d 100644 --- a/data/scene/newhorizons/pluto/charon/charon.mod +++ b/data/scene/newhorizons/pluto/charon/charon.mod @@ -55,6 +55,7 @@ return { "CHARON" } }, + --[[ Ephemeris = { Type = "Spice", Body = "CHARON", @@ -67,6 +68,21 @@ return { Frame = "IAU_CHARON", Reference = "ECLIPJ2000" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "CHARON", + Reference = "ECLIPJ2000", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CHARON", + DestinationFrame = "ECLIPJ2000" + }, + }, GuiName = "/Solar/Planets/Charon" }, { @@ -79,10 +95,18 @@ return { Billboard = true, Texture = "textures/Charon-Text.png" }, + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -1000000, 0} + }, + }, + --[[ Ephemeris = { Type = "Static", Position = {0, -10, 0, 5} } + ]] }, { Name = "CharonShadow", @@ -97,10 +121,6 @@ return { MainFrame = "GALACTIC", Aberration = "NONE", }, - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 5} - } }, -- CharonTrail module { diff --git a/data/scene/newhorizons/pluto/hydra/hydra.mod b/data/scene/newhorizons/pluto/hydra/hydra.mod index cae907eea9..272f45c417 100644 --- a/data/scene/newhorizons/pluto/hydra/hydra.mod +++ b/data/scene/newhorizons/pluto/hydra/hydra.mod @@ -27,6 +27,7 @@ return { Color = "textures/gray.jpg", } }, + --[[ Ephemeris = { Type = "Spice", Body = "Hydra", @@ -39,6 +40,21 @@ return { Frame = "IAU_PLUTO", Reference = "ECLIPJ2000" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "HYDRA", + Reference = "ECLIPJ2000", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "ECLIPJ2000" + }, + }, GuiName = "/Solar/Planets/Hydra" }, { @@ -51,10 +67,18 @@ return { Billboard = true, Texture = "textures/Hydra-Text.png" }, + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {1000000, 0, 1000000}, + }, + }, + --[[ Ephemeris = { Type = "Static", Position = {1, 0, 1, 6} } + ]] }, -- HydraTrail module { diff --git a/data/scene/newhorizons/pluto/kerberos/kerberos.mod b/data/scene/newhorizons/pluto/kerberos/kerberos.mod index fef4464573..4fa0d6d45c 100644 --- a/data/scene/newhorizons/pluto/kerberos/kerberos.mod +++ b/data/scene/newhorizons/pluto/kerberos/kerberos.mod @@ -27,6 +27,7 @@ return { Color = "textures/gray.jpg", } }, + --[[ Ephemeris = { Type = "Spice", Body = "KERBEROS", @@ -39,6 +40,21 @@ return { Frame = "IAU_PLUTO", Reference = "ECLIPJ2000" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "KERBEROS", + Reference = "ECLIPJ2000", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "ECLIPJ2000" + }, + }, GuiName = "/Solar/Planets/Kerberos" }, { @@ -51,10 +67,18 @@ return { Billboard = true, Texture = "textures/Kerberos-Text.png" }, + --[[ Ephemeris = { Type = "Static", Position = {1, 0, 1, 6} } + ]] + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {1000000, 0, 1000000}, + }, + }, }, -- StyxTrail module { diff --git a/data/scene/newhorizons/pluto/nix/nix.mod b/data/scene/newhorizons/pluto/nix/nix.mod index 3387e57867..483c3174c6 100644 --- a/data/scene/newhorizons/pluto/nix/nix.mod +++ b/data/scene/newhorizons/pluto/nix/nix.mod @@ -27,6 +27,21 @@ return { Color = "textures/gray.jpg", } }, + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "NIX", + Reference = "ECLIPJ2000", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "ECLIPJ2000" + }, + }, + --[[ Ephemeris = { Type = "Spice", Body = "NIX", @@ -39,6 +54,7 @@ return { Frame = "IAU_PLUTO", Reference = "ECLIPJ2000" }, + ]] GuiName = "/Solar/Planets/Nix" }, { @@ -51,10 +67,12 @@ return { Billboard = true, Texture = "textures/Nix-Text.png" }, + --[[ Ephemeris = { Type = "Static", Position = {0, 0, 0, 0} } + ]] }, -- StyxTrail module { diff --git a/data/scene/newhorizons/pluto/pluto/pluto.mod b/data/scene/newhorizons/pluto/pluto/pluto.mod index e5447cc48e..ab6abd4dff 100644 --- a/data/scene/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/newhorizons/pluto/pluto/pluto.mod @@ -21,6 +21,7 @@ return { { Name = "PlutoBarycenter", Parent = "SolarSystemBarycenter", + --[[ Ephemeris = { Type = "Spice", Body = "PLUTO BARYCENTER", @@ -28,6 +29,16 @@ return { Observer = "SUN", Kernels = NewHorizonsKernels }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "PLUTO BARYCENTER", + Reference = "ECLIPJ2000", + Observer = "SUN", + Kernels = NewHorizonsKernels + }, + }, }, -- PlutoProjection module { @@ -153,6 +164,7 @@ return { "P4", } }, + --[[ Ephemeris = { Type = "Spice", Body = "PLUTO", @@ -165,6 +177,21 @@ return { Frame = "IAU_PLUTO", Reference = "GALACTIC" }, + ]] + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "PLUTO", + Reference = "GALACTIC", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "GALACTIC", + } + }, GuiName = "/Solar/Planets/Pluto" }, { @@ -181,10 +208,12 @@ return { MieColor = {1.0, 1.0, 1.0} } }, + --[[ Ephemeris = { Type = "Static", Position = {0, 0, 0, 1} }, + ]] }, { Name = "PlutoText", @@ -196,10 +225,18 @@ return { Billboard = true, Texture = "textures/Pluto-Text.png" }, + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -2000000, 0} + }, + }, + --[[ Ephemeris = { Type = "Static", Position = {0, -20, 0, 5} } + ]] }, { Name = "PlutoTexture", @@ -212,10 +249,18 @@ return { ProjectionListener = false, Texture = "textures/Pluto-Text.png" }, + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {0, -4000000, 0} + }, + }, + --[[ Ephemeris = { Type = "Static", Position = {0, 0, 40, 5} } + ]] }, { Name = "PlutoShadow", @@ -230,10 +275,6 @@ return { MainFrame = "GALACTIC", Aberration = "NONE", }, - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 5} - } }, -- PlutoBarycentricTrail module { diff --git a/data/scene/newhorizons/pluto/styx/styx.mod b/data/scene/newhorizons/pluto/styx/styx.mod index 02d6ad7a30..b53af6a70c 100644 --- a/data/scene/newhorizons/pluto/styx/styx.mod +++ b/data/scene/newhorizons/pluto/styx/styx.mod @@ -27,6 +27,7 @@ return { Color = "textures/gray.jpg", } }, + --[[ Ephemeris = { Type = "Spice", Body = "STYX", @@ -39,6 +40,22 @@ return { Frame = "IAU_PLUTO", Reference = "ECLIPJ2000" }, + ]] + + Transform = { + Translation = { + Type = "SpiceEphemeris", + Body = "STYX", + Reference = "ECLIPJ2000", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_PLUTO", + DestinationFrame = "ECLIPJ2000" + }, + }, GuiName = "/Solar/Planets/Styx" }, { @@ -51,10 +68,18 @@ return { Billboard = true, Texture = "textures/Styx-Text.png" }, + Transform = { + Translation = { + Type = "StaticEphemeris", + Position = {1000000, 0, 1000000} + }, + }, + --[[ Ephemeris = { Type = "Static", Position = {1, 0, 1, 6} } + ]] }, -- StyxTrail module {