diff --git a/data/assets/actions/trails/on_off_all_minor_moons.asset b/data/assets/actions/trails/on_off_all_minor_moons.asset index 5f680e6dae..dcc975e14f 100644 --- a/data/assets/actions/trails/on_off_all_minor_moons.asset +++ b/data/assets/actions/trails/on_off_all_minor_moons.asset @@ -2,21 +2,8 @@ local MinorMoonsOn = { Identifier = "os.MinorMoonsOn", Name = "Turn on minor moons and trails", Command = [[ - local trails = openspace.property("{moonTrail_minor}.Renderable.Enabled") - local trails_fade = openspace.property("{moonTrail_minor}.Renderable.Fade") - - local moons = openspace.property("{moon_minor}.Renderable.Enabled") - local moons_fade = openspace.property("{moon_minor}.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 + openspace.fadeIn("{moonTrail_minor}.Renderable") + openspace.fadeIn("{moon_minor}.Renderable") ]], Documentation = "Turn ON minor moons and their trails for all planets in the solar system", GuiPath = "/Solar System/Minor Moons", @@ -27,31 +14,8 @@ local MinorMoonsOff = { Identifier = "os.MinorMoonsOff", Name = "Turn off minor moons and trails", Command = [[ - local trails = openspace.property("{moonTrail_minor}.Renderable.Enabled") - local trails_fade = openspace.property("{moonTrail_minor}.Renderable.Fade") - - local moons = openspace.property("{moon_minor}.Renderable.Enabled") - local moons_fade = openspace.property("{moon_minor}.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 + openspace.fadeOut("{moonTrail_minor}.Renderable") + openspace.fadeOut("{moon_minor}.Renderable") ]], Documentation = "Turn OFF minor moons and their trails for all planets in the solar system", GuiPath = "/Solar System/Minor Moons", @@ -76,7 +40,7 @@ asset.export("MinorMoonsOff", MinorMoonsOff.Identifier) asset.meta = { Name = "Actions - Turn ON/OFF all Minor Moons", - Description = "Asset providing actions to turn ON/OFF all minor moons and their trails", + Description = "Asset providing actions to turn ON/OFF all minor moons and their trails", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset index 729e4360ac..fdc6c79f08 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset @@ -49,23 +49,7 @@ local ToggleFieldlines = { Identifier = "os.bastilleday.fieldlines.ToggleFieldlines", Name = "Toggle fieldlines", Command = [[ - if openspace.propertyValue("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable") ]], Documentation = "Toggle fieldline rendering of CME", GuiPath = "/Bastille-Day 2000", diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset index 17c1cca52d..e7b58bf6dd 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset @@ -35,23 +35,7 @@ local ToggleFluxnodes = { Identifier = "os.bastilleday.fluxnodes.ToggleFluxnodes", Name = "Toggle flux nodes", Command = [[ - if openspace.propertyValue("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("Scene.MAS-MHD-FluxNodes-bastille-day-2000.Renderable") ]], Documentation = "Toggle flux node rendering of CME", GuiPath = "/Bastille-Day 2000", diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset index e213f3306f..3d4031cbc9 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset @@ -74,23 +74,7 @@ local ToggleEquatorial = { Identifier = "os.bastilleday.fluxnodescutplane.ToggleEquatorial", Name = "Toggle equatorial cutplane", Command = [[ - if openspace.propertyValue("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.EquatorialCutplane-bastille-day-2000.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.EquatorialCutplane-bastille-day-2000.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.EquatorialCutplane-bastille-day-2000.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("Scene.EquatorialCutplane-bastille-day-2000.Renderable") ]], Documentation = "Toggle equatorial cutplane of CME", GuiPath = "/Bastille-Day 2000", @@ -101,23 +85,7 @@ local ToggleMeridial = { Identifier = "os.bastilleday.fluxnodescutplane.ToggleMeridial", Name = "Toggle meridial cutplane", Command = [[ - if openspace.propertyValue("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.MeridialCutplane-bastille-day-2000.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.MeridialCutplane-bastille-day-2000.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.MeridialCutplane-bastille-day-2000.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("Scene.MeridialCutplane-bastille-day-2000.Renderable") ]], Documentation = "Toggle meridial cutplane of CME", GuiPath = "/Bastille-Day 2000", diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset index 43427b2bff..5f011beecb 100644 --- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset +++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset @@ -19,23 +19,7 @@ local ToggleLegend = { Identifier = "os.bastilleday.fluxnodelegend.ToggleLegend", Name = "Toggle the legend image", Command = [[ - if openspace.propertyValue("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled") then - openspace.setPropertyValueSingle( - "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled", true) - openspace.setPropertyValueSingle( - "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("ScreenSpace.LegendFluxNodes-bastille-day-2000") ]], Documentation = "Toggle the legend image", GuiPath = "/Bastille-Day 2000", @@ -46,13 +30,7 @@ local HideLegend = { Identifier = "os.bastilleday.fluxnodelegend.HideLegend", Name = "Hides the legend image", Command = [[ - openspace.setPropertyValueSingle( - "ScreenSpace.LegendFluxNodes-bastille-day-2000.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("ScreenSpace.LegendFluxNodes-bastille-day-2000.Enabled", false)' - ) + openspace.fadeOut("ScreenSpace.LegendFluxNodes-bastille-day-2000") ]], Documentation = "Hides the legend image", GuiPath = "/Bastille-Day 2000", diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset index 4173848baf..3df49c9443 100644 --- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset +++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset @@ -39,10 +39,7 @@ local ToggleKaguyaLayer = { Identifier = "os.apollo.moon.ToggleKaguyaLayer", Name = "Toggle Kaguya layer", Command = [[ - openspace.setPropertyValueSingle( - "Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah.Enabled", - not openspace.propertyValue("Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah.Enabled") - ) + openspace.toggleFade("Scene.Moon.Renderable.Layers.ColorLayers.Kaguya_Utah") ]], Documentation = "Toggles Moon Kaguya color layer", GuiPath = "/Missions/Apollo", diff --git a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset index 0d632d4a92..139f41d1bc 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset @@ -147,12 +147,7 @@ local DecreaseHeightmapCharon = { local TogglePlutoTrail = { Identifier = "os.newhorizons.TogglePlutoTrail", Name = "Toggle Pluto trail", - Command = [[ - openspace.setPropertyValueSingle( - "Scene.PlutoBarycentricTrail.Renderable.Enabled", - not openspace.propertyValue("Scene.PlutoBarycentricTrail.Renderable.Enabled") - ) - ]], + Command = [[openspace.toggleFade("Scene.PlutoBarycentricTrail.Renderable")]], Documentation = "Toggles the visibility of the trail behind Pluto", GuiPath = "/Missions/New Horizons", IsLocal = false @@ -162,30 +157,12 @@ local TogglePlutoLabels = { Identifier = "os.newhorizons.TogglePlutoLabels", Name = "Toggle Pluto labels", Command = [[ - openspace.setPropertyValueSingle( - "Scene.PlutoText.Renderable.Enabled", - not openspace.propertyValue("Scene.PlutoText.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.CharonText.Renderable.Enabled", - not openspace.propertyValue("Scene.CharonText.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.HydraText.Renderable.Enabled", - not openspace.propertyValue("Scene.HydraText.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.NixText.Renderable.Enabled", - not openspace.propertyValue("Scene.NixText.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.KerberosText.Renderable.Enabled", - not openspace.propertyValue("Scene.KerberosText.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.StyxText.Renderable.Enabled", - not openspace.propertyValue("Scene.StyxText.Renderable.Enabled") - ) + openspace.toggleFade("Scene.PlutoText.Renderable") + openspace.toggleFade("Scene.CharonText.Renderable") + openspace.toggleFade("Scene.HydraText.Renderable") + openspace.toggleFade("Scene.NixText.Renderable") + openspace.toggleFade("Scene.KerberosText.Renderable") + openspace.toggleFade("Scene.StyxText.Renderable") ]], Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx", GuiPath = "/Missions/New Horizons", @@ -196,12 +173,7 @@ local ToggleNewHorizonsLabels = { Identifier = "os.newhorizons.ToggleNewHorizonsLabels", Name = "Toggle New Horizons labels", Command = [[ - local v = openspace.propertyValue("Scene.Labels.Renderable.Opacity") - if v <= 0.5 then - openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity", 1.0, 2.0) - else - openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity", 0.0, 2.0) - end + openspace.toggleFade("Scene.Labels.Renderable") ]], Documentation = "Toggles the visibility of the labels for the New Horizons instruments", GuiPath = "/Missions/New Horizons", @@ -212,14 +184,8 @@ local ToggleShadows = { Identifier = "os.newhorizons.ToggleShadows", Name = "Toggle shadows", Command = [[ - openspace.setPropertyValueSingle( - "Scene.PlutoShadow.Renderable.Enabled", - not openspace.propertyValue("Scene.PlutoShadow.Renderable.Enabled") - ) - openspace.setPropertyValueSingle( - "Scene.CharonShadow.Renderable.Enabled", - not openspace.propertyValue("Scene.CharonShadow.Renderable.Enabled") - ) + openspace.toggleFade("Scene.PlutoShadow.Renderable") + openspace.toggleFade("Scene.CharonShadow.Renderable") ]], Documentation = "Toggles the visibility of the shadow visualization of Pluto and Charon", GuiPath = "/Missions/New Horizons", @@ -230,10 +196,7 @@ local ToggleNewHorizonsTrail = { Identifier = "os.newhorizons.ToggleNewHorizonsTrail", Name = "Toggle New Horizons trail", Command = [[ - openspace.setPropertyValueSingle( - "Scene.NewHorizonsTrailPluto.Renderable.Enabled", - not openspace.propertyValue("Scene.NewHorizonsTrailPluto.Renderable.Enabled") - ) + openspace.toggleFade("Scene.NewHorizonsTrailPluto.Renderable") ]], Documentation = "Toggles the trail of New Horizons", GuiPath = "/Missions/New Horizons", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset index 09f90f1fca..c3cab44525 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset @@ -76,10 +76,7 @@ local ToggleSunMarker = { Identifier = "os.osirisrex.ToggleSunMarker", Name = "Toggle Sun marker", Command = [[ - openspace.setPropertyValueSingle( - "Scene.SunMarker.Renderable.Enabled", - not openspace.propertyValue("Scene.SunMarker.Renderable.Enabled") - ) + openspace.toggleFade("Scene.SunMarker.Renderable") ]], Documentation = "Toggles the visibility of the text marking the location of the Sun", GuiPath = "/Missions/Osiris Rex", diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 39b620ccd2..dbf024975e 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -256,10 +256,7 @@ local ToggleImagePlane = { Identifier = "os.rosetta.ToggleImagePlane", Name = "Toggle image plane", Command = [[ - openspace.setPropertyValueSingle( - "Scene.ImagePlaneRosetta.Renderable.Enabled", - not openspace.propertyValue("Scene.ImagePlaneRosetta.Renderable.Enabled") - ) + openspace.toggleFade("Scene.ImagePlaneRosetta.Renderable") ]], Documentation = "Toggles the visibility of the free floating image plane", GuiPath = "/Missions/Rosetta", @@ -270,10 +267,7 @@ local TogglePhilaeTrail = { Identifier = "os.rosetta.TogglePhilaeTrail", Name = "Toggle Philae trail", Command = [[ - openspace.setPropertyValueSingle( - "Scene.PhilaeTrail.Renderable.Enabled", - not openspace.propertyValue("Scene.PhilaeTrail.Renderable.Enabled") - ) + openspace.toggleFade("Scene.PhilaeTrail.Renderable") ]], Documentation = "Toggles the visibility of Philae's trail", GuiPath = "/Missions/Rosetta", diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 83641da904..4c505acbf0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -13,21 +13,8 @@ local JupiterMinorMoonsOn = { Identifier = "os.solarsystem.JupiterMinorMoonsOn", Name = "Turn ON minor moons and trails", Command = [[ - local trails = openspace.property("{moonTrail_minor_jupiter}.Renderable.Enabled") - local trails_fade = openspace.property("{moonTrail_minor_jupiter}.Renderable.Fade") - - local moons = openspace.property("{moon_minor_jupiter}.Renderable.Enabled") - local moons_fade = openspace.property("{moon_minor_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 + openspace.fadeIn("{moonTrail_minor_jupiter}.Renderable") + openspace.fadeIn("{moon_minor_jupiter}.Renderable") ]], Documentation = "Turn ON Jupiter's minor moons and their trails", GuiPath = "/Solar System/Jupiter", @@ -38,31 +25,8 @@ local JupiterMinorMoonsOff = { Identifier = "os.solarsystem.JupiterMinorMoonsOff", Name = "Turn OFF minors moon and trails", Command = [[ - local trails = openspace.property("{moonTrail_minor_jupiter}.Renderable.Enabled") - local trails_fade = openspace.property("{moonTrail_minor_jupiter}.Renderable.Fade") - - local moons = openspace.property("{moon_minor_jupiter}.Renderable.Enabled") - local moons_fade = openspace.property("{moon_minor_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 + openspace.fadeOut("{moonTrail_minor_jupiter}.Renderable") + openspace.fadeOut("{moon_minor_jupiter}.Renderable") ]], Documentation = "Turn OFF Jupiter's minor moons and their trails", GuiPath = "/Solar System/Jupiter", diff --git a/data/assets/scene/solarsystem/sun/euv_layer.asset b/data/assets/scene/solarsystem/sun/euv_layer.asset index 65e7820ab0..a5a955740b 100644 --- a/data/assets/scene/solarsystem/sun/euv_layer.asset +++ b/data/assets/scene/solarsystem/sun/euv_layer.asset @@ -36,23 +36,7 @@ local ToggleEuv = { Identifier = "os.solarsystem.sun.ToggleEuv", Name = "Toggle EUV layer", Command = [[ - if openspace.propertyValue("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end + openspace.toggleFade("Scene.EUV-Layer-bastille-day-2000.Renderable") ]], Documentation = "Toggle EUV layer of sun", GuiPath = "/Bastille-Day 2000",