From 8ea5837f000ae61612853d887e314e39ccadfadf Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sun, 31 Dec 2017 17:26:46 -0500 Subject: [PATCH] Various updates and fixes to scene and assets --- data/assets/default.scene | 6 ---- data/assets/default_full.scene | 7 +++++ data/assets/everything.asset | 10 +++++++ data/assets/newhorizons.scene | 2 +- data/assets/osirisrex.scene | 17 +++++++++++ data/assets/rosetta.scene | 19 ++++++++++++- .../missions/newhorizons/pluto.asset | 1 + .../missions/osirisrex/bennu.asset | 10 +++---- .../missions/osirisrex/trail.asset | 2 +- .../solarsystem/missions/rosetta/67p.asset | 2 +- .../missions/rosetta/rosetta.asset | 10 +++---- data/tasks/full_sync.task | 28 +++++++++++-------- 12 files changed, 82 insertions(+), 32 deletions(-) create mode 100644 data/assets/default_full.scene create mode 100644 data/assets/everything.asset diff --git a/data/assets/default.scene b/data/assets/default.scene index cc62dba310..61a868f304 100644 --- a/data/assets/default.scene +++ b/data/assets/default.scene @@ -7,12 +7,6 @@ assetHelper.requestAll(asset, 'scene/solarsystem/sun') asset.require('scene/solarsystem/planets') asset.require('scene/solarsystem/planets/mars/moons/phobos') asset.require('scene/solarsystem/planets/mars/moons/deimos') --- asset.require('scene/solarsystem/planets/jupiter/minor_moons') --- asset.require('scene/solarsystem/planets/saturn/minor_moons') --- asset.require('scene/solarsystem/planets/uranus/minor_moons') --- asset.require('scene/solarsystem/planets/neptune/inner_moons') --- asset.require('scene/solarsystem/planets/neptune/irregular_prograde_moons') --- asset.require('scene/solarsystem/planets/neptune/irregular_retrograde_moons') assetHelper.requestAll(asset, 'scene/digitaluniverse') -- Load default key bindings applicable to most scenes diff --git a/data/assets/default_full.scene b/data/assets/default_full.scene new file mode 100644 index 0000000000..faf201f55e --- /dev/null +++ b/data/assets/default_full.scene @@ -0,0 +1,7 @@ +asset.require('./default') +asset.require('scene/solarsystem/planets/jupiter/minor_moons') +asset.require('scene/solarsystem/planets/saturn/minor_moons') +asset.require('scene/solarsystem/planets/uranus/minor_moons') +asset.require('scene/solarsystem/planets/neptune/inner_moons') +asset.require('scene/solarsystem/planets/neptune/irregular_prograde_moons') +asset.require('scene/solarsystem/planets/neptune/irregular_retrograde_moons') diff --git a/data/assets/everything.asset b/data/assets/everything.asset new file mode 100644 index 0000000000..3ad44567f9 --- /dev/null +++ b/data/assets/everything.asset @@ -0,0 +1,10 @@ +-- Please note that this scene/asset is not meant to be included anywhere directly. +-- Rather it is used in the Sync application to synchronize the entire asset folder +-- without needing manual adaption + +local assetHelper = asset.require('util/asset_helper') +local sceneHelper = asset.require('util/scene_helper') + +assetHelper.requestAll(asset, 'scene') +assetHelper.requestAll(asset, 'spice') +assetHelper.requestAll(asset, 'util') diff --git a/data/assets/newhorizons.scene b/data/assets/newhorizons.scene index f89a34f88b..2b7294122a 100644 --- a/data/assets/newhorizons.scene +++ b/data/assets/newhorizons.scene @@ -136,7 +136,7 @@ asset.onInitialize(function () openspace.set_default_dashboard() openspace.dashboard.addDashboardItem({ Type = "DashboardItemSpacing", - Spacing = 50 + Spacing = 25 }) openspace.dashboard.addDashboardItem({ diff --git a/data/assets/osirisrex.scene b/data/assets/osirisrex.scene index 520266086d..e01840cd74 100644 --- a/data/assets/osirisrex.scene +++ b/data/assets/osirisrex.scene @@ -84,6 +84,23 @@ asset.onInitialize(function () sceneHelper.bindKeys(Keybindings) openspace.set_default_dashboard() + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemSpacing", + Spacing = 25 + }) + + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemDistance", + SourceType = "Node", + SourceNodeName = "OsirisRex", + DestinationType = "Node", + DestinationNodeName = "BennuBarycenter" + }) + + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemInstruments" + }) + openspace.set_default_gui_sorting() sceneHelper.setDeltaTimeKeys({ diff --git a/data/assets/rosetta.scene b/data/assets/rosetta.scene index 046fad6566..899477a5a4 100644 --- a/data/assets/rosetta.scene +++ b/data/assets/rosetta.scene @@ -85,6 +85,23 @@ asset.onInitialize(function () sceneHelper.bindKeys(Keybindings) openspace.set_default_dashboard() + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemSpacing", + Spacing = 25 + }) + + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemDistance", + SourceType = "Node", + SourceNodeName = "Rosetta", + DestinationType = "Node", + DestinationNodeName = "67P" + }) + + openspace.dashboard.addDashboardItem({ + Type = "DashboardItemInstruments" + }) + openspace.set_default_gui_sorting() sceneHelper.setDeltaTimeKeys({ @@ -93,7 +110,7 @@ asset.onInitialize(function () }) openspace.mark_interesting_nodes({ - "67PBarycenter", "Rosetta", "Philae" + "67P", "Rosetta", "Philae" }) openspace.addVirtualProperty( diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset index 32056545cb..41a69bfb21 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset @@ -250,6 +250,7 @@ local PlutoTrail = { Parent = sunTransforms.SolarSystemBarycenter.Name, Renderable = { Type = "RenderableTrailOrbit", + Enabled = false, Translation = { Type = "SpiceTranslation", Target = "PLUTO BARYCENTER", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index 98a595ca38..ee833916e2 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -24,8 +24,8 @@ local BENNU_BODY = "2101955" local Bennu = { Name = "Bennu", Parent = transforms.BennuBarycenter.Name, - Transform = { - Rotation = { + Transform = +{ Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_BENNU", DestinationFrame = "GALACTIC" @@ -40,8 +40,8 @@ local Bennu = { }, ColorTexture = textures .. "/gray.png", Projection = { - Sequence = "InstrumentTimes", - SequenceType = asset.localResource('instrumentTimes'), + Sequence = asset.localResource('InstrumentTimes'), + SequenceType = "instrument-times", Observer = "OSIRIS-REX", Target = BENNU_BODY, Aberration = "NONE", @@ -107,4 +107,4 @@ local BennuTrail = { } --- assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail }) +assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset index 27cd64c80d..e1ca69219a 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset @@ -55,7 +55,7 @@ local OsirisRexTrailBennu = { Observer = BENNU_BODY }, Color = { 0.9, 0.2, 0.9 }, - StartTime = "2016 SEP 8 23:05:00.50", + StartTime = "2018 SEP 4 00:00:00", EndTime = "2023 SEP 24 12:00:00", SampleInterval = 3600 }, diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index d911001c4d..558b100f60 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -32,7 +32,7 @@ local imagesTorrent = asset.syncedResource({ }) .. "/rosettaimages" local Barycenter = { - Name = "Barycenter", + Name = "67PBarycenter", Parent = transforms.SolarSystemBarycenter.Name, Transform = { Translation = { diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 3ce8c11f8f..06bb949a01 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -8,14 +8,14 @@ local textures = asset.syncedResource({ Name = "Rosetta Textures", Type = "HttpSynchronization", Identifier = "rosetta_textures", - Version = 1 + Version = 2 }) local models = asset.syncedResource({ Name = "Rosetta Models", Type = "HttpSynchronization", Identifier = "rosetta_model", - Version = 1 + Version = 3 }) local kernels = asset.syncedResource({ @@ -325,7 +325,7 @@ local PhilaeParts = { Type = "MultiModelGeometry", GeometryFile = models .. "/lander_parts.obj" }, - ColorTexture = models .. "/foil_silver_ramp.png", + ColorTexture = textures .. "/foil_silver_ramp.png", ModelTransform = RotationMatrix }, GuiPath = "/Solar System/Missions/Rosetta" @@ -427,7 +427,7 @@ local PhilaeTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { Rosetta, - RosettsModel, + RosettaModel, RosettaBlackFoil, RosettaBlackParts, RosettaDish, @@ -449,5 +449,5 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { PhilaeSolarPanels, RosettaCometTrail, - PhilaeTrail, + PhilaeTrail }) diff --git a/data/tasks/full_sync.task b/data/tasks/full_sync.task index 5d8def3343..789779ccf9 100644 --- a/data/tasks/full_sync.task +++ b/data/tasks/full_sync.task @@ -1,30 +1,34 @@ return { - { - Type = "SyncAssetTask", - Asset = "dawn" - }, { Type = "SyncAssetTask", Asset = "default" }, - { - Type = "SyncAssetTask", - Asset = "juno" - }, { Type = "SyncAssetTask", Asset = "newhorizons" }, - { - Type = "SyncAssetTask", - Asset = "osirisrex" - }, { Type = "SyncAssetTask", Asset = "rosetta" }, + { + Type = "SyncAssetTask", + Asset = "dawn" + }, + { + Type = "SyncAssetTask", + Asset = "juno" + }, + { + Type = "SyncAssetTask", + Asset = "osirisrex" + }, { Type = "SyncAssetTask", Asset = "voyager" + }, + { + Type = "SyncAssetTask", + Asset = "everything" } }