From cde5c1b469e8ad4f2a4c5ca4c13ffaaa1a3ef147 Mon Sep 17 00:00:00 2001 From: Erik Broberg Date: Tue, 19 Jul 2016 18:14:54 -0400 Subject: [PATCH] Add BennuTrail --- data/scene/osirisrex.scene | 4 +-- data/scene/osirisrex/osirisrex.mod | 53 +++++++++++++++++------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/data/scene/osirisrex.scene b/data/scene/osirisrex.scene index b889e7be50..b88e749d92 100644 --- a/data/scene/osirisrex.scene +++ b/data/scene/osirisrex.scene @@ -164,14 +164,14 @@ return { ScenePath = ".", CommonFolder = "common", Camera = { - Focus = "OsirisRex", + Focus = "Bennu2", Position = {1, 1, 0, 7}, }, Modules = { "sun", "mercury", "venus", - --"earth", + "earth", "mars", "saturn", "uranus", diff --git a/data/scene/osirisrex/osirisrex.mod b/data/scene/osirisrex/osirisrex.mod index 07786ba1c9..7ffe554969 100644 --- a/data/scene/osirisrex/osirisrex.mod +++ b/data/scene/osirisrex/osirisrex.mod @@ -1,29 +1,12 @@ ---dofile "osirisrex_spicekernels.lua" - +local BENNU_BODY = "2101955" return { - -- Earth barycenter module - { - Name = "EarthBarycenter", - Parent = "SolarSystemBarycenter", - Static = true, - Ephemeris = { - Type = "Spice", - Body = "EARTH BARYCENTER", - Reference = "ECLIPJ2000", - Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - } - }, - }, - { - Name = "OsirisRex", - Parent = "EarthBarycenter", + Name = "Bennu2", + Parent = "SolarSystemBarycenter", Renderable = { Type = "RenderablePlanet", - Frame = "IAU_EARTH", - Body = "EARTH", + Frame = "IAU_BENNU", + Body = BENNU_BODY, Geometry = { Type = "SimpleSphere", Radius = { 6.371, 6 }, @@ -39,7 +22,31 @@ return { Clouds = "textures/earth_clouds.jpg" } }, + + Ephemeris = { + Type = "Spice", + Body = BENNU_BODY, + -- Reference = "ECLIPJ2000", + Reference = "GALACTIC", + Observer = "SUN", + }, - GuiName = "/Solar/Planets/OsirisRex" + GuiName = "/Solar/Bennu" + }, + + { + Name = "BennuTrail", + Parent = "SolarSystemBarycenter", + Renderable = { + Type = "RenderableTrail", + Body = BENNU_BODY, + Frame = "GALACTIC", + Observer = "SUN", + RGB = { 0.4, 0.0, 0.7}, + TropicalOrbitPeriod = 436.649, + EarthOrbitRatio = 1.3559, -- worst parameter I've ever seen + DayLength = 4.288 -- why this for a path?? + }, + GuiName = "/Solar/BennuTrail" }, }