Remove duplication from the base module

Add trail-only asset for Voyager and Pioneer

data/assets/base.asset

@@ -2,13 +2,9 @@
 -- loading this scene directly without any other elements added on top of it will
 -- probably not work
 
-local assetHelper = asset.require('util/asset_helper')
-local sceneHelper = asset.require('util/scene_helper')
-local propertyHelper = asset.require('util/property_helper')
+asset.require('./base_blank')
 
 -- Specifying which other assets should be loaded in this scene
-asset.require('spice/base')
-
 asset.require('scene/solarsystem/sun/sun')
 asset.require('scene/solarsystem/sun/glare')
 asset.require('scene/solarsystem/sun/default_layers')
@@ -19,58 +15,17 @@ asset.require('scene/solarsystem/planets/mars/moons/deimos')
 asset.require('scene/solarsystem/dwarf_planets/pluto/system')
 asset.require('scene/solarsystem/dwarf_planets/pluto/default_layers')
 asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers')
+asset.require('scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11')
 asset.require('scene/milkyway/milkyway/volume')
 asset.require('scene/milkyway/constellations/constellation_art')
 asset.require('scene/milkyway/constellations/constellation_keybinds')
 
+local assetHelper = asset.require('util/asset_helper')
 assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
-
 assetHelper.requireAll(asset, 'scene/digitaluniverse')
 
--- Load default key bindings applicable to most scenes
-asset.require('util/default_keybindings')
-asset.require('util/default_dashboard')
-asset.require('util/default_joystick')
-
--- Load web gui
-local webGui = asset.require('util/webgui')
-
-asset.require('customization/globebrowsing')
-
--- Keybindings that are specific for this scene
-local Keybindings = {
-    {
-        Key = "h",
-        Name="Toggle Trails",
-        Command = "local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end\n" ..
-        "local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled'); for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end",
-        Documentation = "Toggles the visibility of planet and moon trails",
-        GuiPath = "/Rendering",
-        Local = false
-    },
-    {
-        Key = "l",
-        Name = "Toggle planet labels",
-        Command = "local list = openspace.getProperty('{solarsystem_labels}.Renderable.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end",
-        Documentation = "Turns on visibility for all solar system labels",
-        GuiPath = "/Rendering",
-        Local = false
-    }
-}
-
 asset.onInitialize(function ()
-    webGui.setCefRoute("onscreen")
-
-    sceneHelper.bindKeys(Keybindings)
-    openspace.setDefaultGuiSorting()
-
-    openspace.setPropertyValueSingle("RenderEngine.VerticalLogOffset", 0.100000)
-
     openspace.globebrowsing.loadWMSServersFromFile(
         openspace.absPath("${DATA}/globebrowsing_servers.lua")
     )
-end)
-
-asset.onDeinitialize(function ()
-    sceneHelper.unbindKeys(Keybindings)
-end)
+end)

data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset

@@ -0,0 +1,89 @@
+local assetHelper = asset.require('util/asset_helper')
+
+local sampleInterval = 24*60*60
+
+local voyager1 = {
+   Identifier = "Voyager1",
+   Parent = "SolarSystemBarycenter",
+   Renderable = {
+       Type = "RenderableTrailTrajectory",
+       Translation = {
+           Type = "HorizonsTranslation",
+           HorizonsTextFile = asset.localResource("voyager_1.txt")
+       },
+       Color = { 0.9, 0.9, 0.0 },
+       StartTime = "1977 SEP 06 00:00:00",
+       EndTime = "2030 DEC 31 00:00:00",
+       SampleInterval = sampleInterval,
+       TimeStampSubsampleFactor = 1
+   },
+   GUI = {
+       Name = "Voyager 1",
+       Path = "/Solar System/Missions"
+   }
+}
+
+local voyager2 = {
+   Identifier = "Voyager2",
+   Parent = "SolarSystemBarycenter",
+   Renderable = {
+       Type = "RenderableTrailTrajectory",
+       Translation = {
+           Type = "HorizonsTranslation",
+           HorizonsTextFile = asset.localResource("voyager_2.txt")
+       },
+       Color = { 0.9, 0.9, 0.0 },
+       StartTime = "1977 AUG 21 00:00:00",
+       EndTime = "2030 DEC 31 00:00:00",
+       SampleInterval = sampleInterval,
+       TimeStampSubsampleFactor = 1
+   },
+   GUI = {
+       Name = "Voyager 2",
+       Path = "/Solar System/Missions"
+   }
+}
+
+local pioneer10 = {
+   Identifier = "Pioneer10",
+   Parent = "SolarSystemBarycenter",
+   Renderable = {
+       Type = "RenderableTrailTrajectory",
+       Translation = {
+           Type = "HorizonsTranslation",
+           HorizonsTextFile = asset.localResource("pioneer_10.txt")
+       },
+       Color = { 0.9, 0.3, 0.0 },
+       StartTime = "1972 MAR 04 00:00:00",
+       EndTime = "2030 DEC 31 00:00:00",
+       SampleInterval = sampleInterval,
+       TimeStampSubsampleFactor = 1
+   },
+   GUI = {
+       Name = "Pioneer 10",
+       Path = "/Solar System/Missions"
+   }
+}
+
+local pioneer11 ={
+   Identifier = "Pioneer11",
+   Parent = "SolarSystemBarycenter",
+   Renderable = {
+       Type = "RenderableTrailTrajectory",
+       Translation = {
+           Type = "HorizonsTranslation",
+           HorizonsTextFile = asset.localResource("pioneer_11.txt")
+       },
+       Color = { 0.9, 0.3, 0.0 },
+       StartTime = "1973 APR 07 00:00:00",
+       EndTime = "2030 DEC 31 00:00:00",
+       SampleInterval = sampleInterval,
+       TimeStampSubsampleFactor = 1
+   },
+   GUI = {
+       Name = "Pioneer 11",
+       Path = "/Solar System/Missions"
+   }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { voyager1, voyager2, pioneer10, pioneer11 })