From e8ffaaa49c9e56800e898ae7c1a89c469cea90c3 Mon Sep 17 00:00:00 2001 From: Adam Rohdin Date: Sat, 3 Jun 2023 00:46:58 +0200 Subject: [PATCH] Added actions for hiding/showing major moons and their trails (closes #2675) --- .../planets/jupiter/callisto/callisto.asset | 2 +- .../planets/jupiter/callisto/trail.asset | 2 +- .../planets/jupiter/europa/europa.asset | 2 +- .../planets/jupiter/europa/trail.asset | 2 +- .../planets/jupiter/ganymede/ganymede.asset | 2 +- .../planets/jupiter/ganymede/trail.asset | 2 +- .../solarsystem/planets/jupiter/io/io.asset | 2 +- .../planets/jupiter/io/trail.asset | 2 +- .../planets/jupiter/major_moons.asset | 78 +++++++++++++- .../planets/jupiter/minor_moons.asset | 4 +- .../planets/neptune/major_moons.asset | 78 +++++++++++++- .../planets/neptune/nereid/nereid.asset | 4 +- .../planets/neptune/triton/triton.asset | 4 +- .../planets/saturn/dione/dione.asset | 2 +- .../planets/saturn/dione/trail.asset | 2 +- .../planets/saturn/enceladus/enceladus.asset | 2 +- .../planets/saturn/enceladus/trail.asset | 2 +- .../planets/saturn/hyperion/hyperion.asset | 2 +- .../planets/saturn/hyperion/trail.asset | 2 +- .../planets/saturn/iapetus/iapetus.asset | 2 +- .../planets/saturn/iapetus/trail.asset | 2 +- .../planets/saturn/major_moons.asset | 78 +++++++++++++- .../planets/saturn/mimas/mimas.asset | 2 +- .../planets/saturn/mimas/trail.asset | 2 +- .../planets/saturn/minor_moons.asset | 4 +- .../planets/saturn/rhea/rhea.asset | 2 +- .../planets/saturn/rhea/trail.asset | 2 +- .../planets/saturn/tethys/tethys.asset | 2 +- .../planets/saturn/tethys/trail.asset | 2 +- .../planets/saturn/titan/titan.asset | 2 +- .../planets/saturn/titan/trail.asset | 2 +- .../planets/uranus/major_moons.asset | 100 +++++++++++++++--- .../planets/uranus/minor_moons.asset | 4 +- 33 files changed, 349 insertions(+), 53 deletions(-) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 3a73f23b41..9c3860b697 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -47,7 +47,7 @@ local Callisto = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_major_jupiter" }, GUI = { Path = "/Solar System/Planets/Jupiter/Major Moons/Callisto" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index 8c12d2cf91..472933bf3f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -18,7 +18,7 @@ local CallistoTrail = { Period = 17.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter", "moonTrail_major_jupiter" }, GUI = { Name = "Callisto Trail", Path = "/Solar System/Planets/Jupiter/Major Moons/Callisto" diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index dd4df51e3e..ca760934d4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -46,7 +46,7 @@ local Europa = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_major_jupiter" }, GUI = { Path = "/Solar System/Planets/Jupiter/Major Moons/Europa" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 5ed9ad01e5..e2288b8bf6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -18,7 +18,7 @@ local EuropaTrail = { Period = 85.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter", "moonTrail_major_jupiter" }, GUI = { Name = "Europa Trail", Path = "/Solar System/Planets/Jupiter/Major Moons/Europa" diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 59fcca6b88..5a0340b7e8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -46,7 +46,7 @@ local Ganymede = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_major_jupiter" }, GUI = { Path = "/Solar System/Planets/Jupiter/Major Moons/Ganymede" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index 4e8811abac..24f9d1e486 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -18,7 +18,7 @@ local GanymedeTrail = { Period = 172.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter", "moonTrail_major_jupiter" }, GUI = { Name = "Ganymede Trail", Path = "/Solar System/Planets/Jupiter/Major Moons/Ganymede" diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index f8f663bde1..b25fe4e33e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -46,7 +46,7 @@ local Io = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_major_jupiter" }, GUI = { Path = "/Solar System/Planets/Jupiter/Major Moons/Io" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index f88818a5ec..37ce9a5c30 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -18,7 +18,7 @@ local IoTrail = { Period = 42.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter", "moonTrail_major_jupiter" }, GUI = { Name = "Io Trail", Path = "/Solar System/Planets/Jupiter/Major Moons/Io" diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset index c3ab5e145a..6a42b2842c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset @@ -5,9 +5,85 @@ asset.require("./io/io") +local JupiterMajorMoonsOn = { + Identifier = "os.solarsystem.JupiterMajorMoonsOn", + Name = "Turn ON major moons and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_jupiter}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_jupiter}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle(trails[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle(moons[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + ]], + Documentation = "Turn ON Jupiter's major moons and their trails", + GuiPath = "/Solar System/Jupiter", + IsLocal = true +} + +local JupiterMajorMoonsOff = { + Identifier = "os.solarsystem.JupiterMajorMoonsOff", + Name = "Turn OFF majors moon and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_jupiter}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_jupiter}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_jupiter}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" + ) + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" + ) + end + ]], + Documentation = "Turn OFF Jupiter's major moons and their trails", + GuiPath = "/Solar System/Jupiter", + IsLocal = true +} + + +asset.onInitialize(function() + openspace.action.registerAction(JupiterMajorMoonsOn) + openspace.action.registerAction(JupiterMajorMoonsOff) +end) + +asset.onDeinitialize(function() + openspace.action.removeAction(JupiterMajorMoonsOff) + openspace.action.removeAction(JupiterMajorMoonsOn) +end) + +asset.export("JupiterMajorMoonsOn", JupiterMajorMoonsOn.Identifier) +asset.export("JupiterMajorMoonsOff", JupiterMajorMoonsOff.Identifier) + + + asset.meta = { Name = "Jupiter Major Moons", - Version = "1.0", + Version = "1.1", Description = [[Meta asset containing Jupiters major moons: Callisto, Europa, Ganymede, and Io]], Author = "OpenSpace Team", diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 6551cb4f13..5d7b4f1d81 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -11,7 +11,7 @@ asset.require("./minor/themisto_group") local JupiterMinorMoonsOn = { Identifier = "os.solarsystem.JupiterMinorMoonsOn", - Name = "Turn on minor moons and trails", + Name = "Turn ON minor moons and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Fade") @@ -36,7 +36,7 @@ local JupiterMinorMoonsOn = { local JupiterMinorMoonsOff = { Identifier = "os.solarsystem.JupiterMinorMoonsOff", - Name = "Turn off minors moon and trails", + Name = "Turn OFF minors moon and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_jupiter}.Renderable.Fade") diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset index 807bb7be09..22692658ce 100644 --- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset @@ -4,10 +4,86 @@ asset.require("./nereid/nereid") +local NeptuneMajorMoonsOn = { + Identifier = "os.solarsystem.NeptuneMajorMoonsOn", + Name = "Turn on major moons and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_neptune}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_neptune}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle(trails[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle(moons[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + ]], + Documentation = "Turn ON Neptune's major moons and their trails", + GuiPath = "/Solar System/Neptune", + IsLocal = true +} + +local NeptuneMajorMoonsOff = { + Identifier = "os.solarsystem.NeptuneMajorMoonsOff", + Name = "Turn off majors moon and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_neptune}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_neptune}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_neptune}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" + ) + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" + ) + end + ]], + Documentation = "Turn OFF Neptune's major moons and their trails", + GuiPath = "/Solar System/Neptune", + IsLocal = true +} + + +asset.onInitialize(function() + openspace.action.registerAction(NeptuneMajorMoonsOn) + openspace.action.registerAction(NeptuneMajorMoonsOff) +end) + +asset.onDeinitialize(function() + openspace.action.removeAction(NeptuneMajorMoonsOff) + openspace.action.removeAction(NeptuneMajorMoonsOn) +end) + +asset.export("NeptuneMajorMoonsOn", NeptuneMajorMoonsOn.Identifier) +asset.export("NeptuneMajorMoonsOff", NeptuneMajorMoonsOff.Identifier) + + + asset.meta = { Name = "Neptune Major Moons", Version = "1.0", - Description = "Meta asset containing Neptune's major moon: Triton", + Description = "Meta asset containing Neptune's major moons Triton and Nereid", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset index 7e04bd2076..3a37ab72a3 100644 --- a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset +++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset @@ -19,7 +19,7 @@ local Nereid = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_neptune" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_major_neptune" }, GUI = { Name = "Nereid", Path = "/Solar System/Planets/Neptune/Major Moons/Nereid" @@ -40,7 +40,7 @@ local NereidTrail = { Period = 360.13, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune", "moonTrail_major_neptune" }, GUI = { Name = "Nereid Trail", Path = "/Solar System/Planets/Neptune/Major Moons/Nereid" diff --git a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset index 852dfa1b2d..43793bfa51 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset @@ -19,7 +19,7 @@ local Triton = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_neptune" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_major_neptune" }, GUI = { Name = "Triton", Path = "/Solar System/Planets/Neptune/Major Moons/Triton" @@ -40,7 +40,7 @@ local TritonTrail = { Period = 5.875, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune", "moonTrail_major_neptune" }, GUI = { Name = "Triton Trail", Path = "/Solar System/Planets/Neptune/Major Moons/Triton" diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index ef332128c5..a7a939eec5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -45,7 +45,7 @@ local Dione = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" }, GUI = { Path = "/Solar System/Planets/Saturn/Major Moons/Dione" } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index f2893d5d6b..41cdab9d54 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -17,7 +17,7 @@ local DioneTrail = { Period = 66.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Dione Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Dione", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index b55a223b56..8cde73ffd0 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -45,7 +45,7 @@ local Enceladus = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" }, GUI = { Name = "Enceladus", Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index 113417058a..e518227623 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -17,7 +17,7 @@ local EnceladusTrail = { Period = 33.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Enceladus Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Enceladus", diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index c4d953f7b8..3652eef7fc 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -44,7 +44,7 @@ local Hyperion = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" }, GUI = { Name = "Hyperion", Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion" diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index 37ac6d6965..5957e218b1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -17,7 +17,7 @@ local HyperionTrail = { Period = 21.276, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Hyperion Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Hyperion" diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index ce9fb2ec76..c8ac165115 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -45,7 +45,7 @@ local Iapetus = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" }, GUI = { Name = "Iapetus", Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus", diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index d07775f749..4b67b96bbf 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -17,7 +17,7 @@ local IapetusTrail = { Period = 79.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Iapetus Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Iapetus", diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset index d9c490ecd2..55dc4dd87e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset @@ -10,9 +10,85 @@ asset.require("./titan/atmosphere") +local SaturnMajorMoonsOn = { + Identifier = "os.solarsystem.SaturnMajorMoonsOn", + Name = "Turn ON major moons and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_saturn}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_saturn}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle(trails[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle(moons[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + ]], + Documentation = "Turn ON Saturn's major moons and their trails", + GuiPath = "/Solar System/Saturn", + IsLocal = true +} + +local SaturnMajorMoonsOff = { + Identifier = "os.solarsystem.SaturnMajorMoonsOff", + Name = "Turn OFF majors moon and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_saturn}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_saturn}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_saturn}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" + ) + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" + ) + end + ]], + Documentation = "Turn OFF Saturn's major moons and their trails", + GuiPath = "/Solar System/Saturn", + IsLocal = true +} + + +asset.onInitialize(function() + openspace.action.registerAction(SaturnMajorMoonsOn) + openspace.action.registerAction(SaturnMajorMoonsOff) +end) + +asset.onDeinitialize(function() + openspace.action.removeAction(SaturnMajorMoonsOff) + openspace.action.removeAction(SaturnMajorMoonsOn) +end) + +asset.export("SaturnMajorMoonsOn", SaturnMajorMoonsOn.Identifier) +asset.export("SaturnMajorMoonsOff", SaturnMajorMoonsOff.Identifier) + + + asset.meta = { Name = "Saturn Major Moons", - Version = "1.0", + Version = "1.1", Description = [[Meta asset containing Saturn's major moons: Dione, Enceladus, Hyperion, Iapetus, Mimas, Rhea, Tethys, and Titan]], Author = "OpenSpace Team", diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 1125591117..36aad15d4c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -70,7 +70,7 @@ local MimasLabel = { FadeDistances = { 0.3, 10.0 }, FadeWidths = { 0.15, 10.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels", "moon_major_saturn" }, GUI = { Name = "Mimas Label", Path = "/Solar System/Planets/Saturn/Major Moons/Mimas", diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 17a13cf1fd..72c60acddf 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -17,7 +17,7 @@ local MimasTrail = { Period = 23.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Mimas Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Mimas", diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset index 3ef831f2f2..1e6b513bad 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset @@ -8,7 +8,7 @@ asset.require("./minor/shepherd_group") local SaturnMinorMoonsOn = { Identifier = "os.solarsystem.SaturnMinorMoonsOn", - Name = "Turn on minor moons and trails", + Name = "Turn ON minor moons and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Fade") @@ -33,7 +33,7 @@ local SaturnMinorMoonsOn = { local SaturnMinorMoonsOff = { Identifier = "os.solarsystem.SaturnMinorMoonsOff", - Name = "Turn off minors moon and trails", + Name = "Turn OFF minors moon and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_saturn}.Renderable.Fade") diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index 6648aa2c9b..9aaf757c80 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -70,7 +70,7 @@ local RheaLabel = { FadeDistances = { 0.3, 10.0 }, FadeWidths = { 0.15, 10.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels", "moon_major_saturn" }, GUI = { Name = "Rhea Label", Path = "/Solar System/Planets/Saturn/Major Moons/Rhea", diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index 1eed0de0a6..57b15feb7a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -17,7 +17,7 @@ local RheaTrail = { Period = 108.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Rhea Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Rhea", diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 7908140566..ec844427cf 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -68,7 +68,7 @@ local TethysLabel = { FadeDistances = { 0.3, 10.0 }, FadeWidths = { 0.15, 10.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels", "moon_major_saturn" }, GUI = { Name = "Tethys Label", Path = "/Solar System/Planets/Saturn/Major Moons/Tethys", diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index 0ab1296256..f9253f7bc3 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -17,7 +17,7 @@ local TethysTrail = { Period = 45.0 / 24.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Tethys Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Tethys", diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index dfff83fa06..53b332a6f6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -45,7 +45,7 @@ local Titan = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_major_saturn" }, GUI = { Name = "Titan", Path = "/Solar System/Planets/Saturn/Major Moons/Titan", diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 76d86f8c38..c5568ac4a8 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -17,7 +17,7 @@ local TitanTrail = { Period = 16.0, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn", "moonTrail_major_saturn" }, GUI = { Name = "Titan Trail", Path = "/Solar System/Planets/Saturn/Major Moons/Titan", diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 0c888003db..4d5f5eade6 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -19,7 +19,7 @@ local Miranda = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" }, GUI = { Name = "Miranda", Path = "/Solar System/Planets/Uranus/Major Moons/Miranda" @@ -40,7 +40,7 @@ local MirandaTrail = { Period = 1.413479, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" }, GUI = { Name = "Miranda Trail", Path = "/Solar System/Planets/Uranus/Major Moons/Miranda" @@ -64,7 +64,7 @@ local MirandaLabel = { FadeDistances = { 1, 250.0 }, FadeWidths = { 1, 250.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, GUI = { Name = "Miranda Label", Path = "/Solar System/Planets/Uranus/Major Moons/Miranda", @@ -88,7 +88,7 @@ local Ariel = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" }, GUI = { Name = "Ariel", Path = "/Solar System/Planets/Uranus/Major Moons/Ariel" @@ -109,7 +109,7 @@ local ArielTrail = { Period = 2.520379, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" }, GUI = { Name = "Ariel Trail", Path = "/Solar System/Planets/Uranus/Major Moons/Ariel" @@ -133,7 +133,7 @@ local ArielLabel = { FadeDistances = { 1, 250.0 }, FadeWidths = { 1, 250.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, GUI = { Name = "Ariel Label", Path = "/Solar System/Planets/Uranus/Major Moons/Ariel", @@ -157,7 +157,7 @@ local Umbriel = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" }, GUI = { Name = "Umbriel", Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel" @@ -178,7 +178,7 @@ local UmbrielTrail = { Period = 4.144177, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" }, GUI = { Name = "Umbriel Trail", Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel" @@ -202,7 +202,7 @@ local UmbrielLabel = { FadeDistances = { 1, 250.0 }, FadeWidths = { 1, 250.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, GUI = { Name = "Umbriel Label", Path = "/Solar System/Planets/Uranus/Major Moons/Umbriel", @@ -226,7 +226,7 @@ local Titania = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" }, GUI = { Name = "Titania", Path = "/Solar System/Planets/Uranus/Major Moons/Titania" @@ -247,7 +247,7 @@ local TitaniaTrail = { Period = 8.705872, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" }, GUI = { Name = "Titania Trail", Path = "/Solar System/Planets/Uranus/Major Moons/Titania" @@ -271,7 +271,7 @@ local TitaniaLabel = { FadeDistances = { 1, 250.0 }, FadeWidths = { 1, 250.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, GUI = { Name = "Titania Label", Path = "/Solar System/Planets/Uranus/Major Moons/Titania", @@ -295,7 +295,7 @@ local Oberon = { SegmentsPerPatch = 64, Layers = {} }, - Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }, + Tag = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major", "moon_major_uranus" }, GUI = { Name = "Oberon", Path = "/Solar System/Planets/Uranus/Major Moons/Oberon" @@ -316,7 +316,7 @@ local OberonTrail = { Period = 13.463239, Resolution = 1000 }, - Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus" }, + Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_uranus", "moonTrail_major_uranus" }, GUI = { Name = "Oberon Trail", Path = "/Solar System/Planets/Uranus/Major Moons/Oberon" @@ -340,7 +340,7 @@ local OberonLabel = { FadeDistances = { 1, 250.0 }, FadeWidths = { 1, 250.0 } }, - Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, GUI = { Name = "Oberon Label", Path = "/Solar System/Planets/Uranus/Major Moons/Oberon", @@ -349,6 +349,67 @@ local OberonLabel = { } +local UranusMajorMoonsOn = { + Identifier = "os.solarsystem.UranusMajorMoonsOn", + Name = "Turn ON major moons and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_uranus}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_uranus}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle(trails[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle(moons[i], true) + openspace.setPropertyValueSingle(v, 1, 2, "Linear") + end + ]], + Documentation = "Turn ON Uranus's major moons and their trails", + GuiPath = "/Solar System/Uranus", + IsLocal = true +} + +local UranusMajorMoonsOff = { + Identifier = "os.solarsystem.UranusMajorMoonsOff", + Name = "Turn OFF majors moon and trails", + Command = [[ + local trails = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Enabled") + local trails_fade = openspace.getProperty("{moonTrail_major_uranus}.Renderable.Fade") + + local moons = openspace.getProperty("{moon_major_uranus}.Renderable.Enabled") + local moons_fade = openspace.getProperty("{moon_major_uranus}.Renderable.Fade") + + for i, v in pairs(trails_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" + ) + end + + for i, v in pairs(moons_fade) do + openspace.setPropertyValueSingle( + v, + 0, + 2, + "Linear", + "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" + ) + end + ]], + Documentation = "Turn OFF Uranus's major moons and their trails", + GuiPath = "/Solar System/Uranus", + IsLocal = true +} + + asset.onInitialize(function() openspace.spice.loadKernel(kernel.ura111) @@ -372,9 +433,15 @@ asset.onInitialize(function() openspace.addSceneGraphNode(Oberon) openspace.addSceneGraphNode(OberonTrail) openspace.addSceneGraphNode(OberonLabel) + + openspace.action.registerAction(UranusMajorMoonsOn) + openspace.action.registerAction(UranusMajorMoonsOff) end) asset.onDeinitialize(function() + openspace.action.removeAction(UranusMajorMoonsOff) + openspace.action.removeAction(UranusMajorMoonsOn) + openspace.removeSceneGraphNode(MirandaLabel) openspace.removeSceneGraphNode(MirandaTrail) openspace.removeSceneGraphNode(Miranda) @@ -414,7 +481,8 @@ asset.export(TitaniaLabel) asset.export(Oberon) asset.export(OberonTrail) asset.export(OberonLabel) - +asset.export("UranusMajorMoonsOn", UranusMajorMoonsOn.Identifier) +asset.export("UranusMajorMoonsOff", UranusMajorMoonsOff.Identifier) asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index 7c1b0d83f6..ecdce57028 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -6,7 +6,7 @@ asset.require("./irregular_retrograde_moons") local UranusMinorMoonsOn = { Identifier = "os.solarsystem.UranusMinorMoonsOn", - Name = "Turn on minor moons and trails", + Name = "Turn ON minor moons and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Fade") @@ -31,7 +31,7 @@ local UranusMinorMoonsOn = { local UranusMinorMoonsOff = { Identifier = "os.solarsystem.UranusMinorMoonsOff", - Name = "Turn off minors moon and trails", + Name = "Turn OFF minors moon and trails", Command = [[ local trails = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Enabled") local trails_fade = openspace.getProperty("{moonTrail_minor_uranus}.Renderable.Fade")