mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 04:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Harmonize capitalization of action names (#2579)

Browse Source 
* Harmonize capitalization of action names (closes #2215)
* Fix confusion between delta time and simulation time (closes #2536)
This commit is contained in:
Alexander Bock
2023-04-05 17:58:18 +02:00
committed by GitHub
parent 80e2aaf564
commit 3379393af7
31 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/assets/actions/planets/mars_layers.asset
View File

@@ -13,7 +13,7 @@ asset.export("ctx_enable_action", ctx_enable_action.Identifier)
local ctx_disable_action = {
Identifier = "os.mars.ctx.fadedout",
Name = "Fade out CTX Layer",
Name = "Fade out CTX layer",
Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Settings.Opacity", 0, 2.0)]],
Documentation = "Fade out CTX",
GuiPath = "/Solar System/Mars",
@@ -46,7 +46,7 @@ asset.export("hirise_disable_action", hirise_disable_action.Identifier)
local lshirise_enable_action = {
Identifier = "os.mars.lshirise.fadein",
Name = "Fade in HiRISE Local Set",
Name = "Fade in HiRISE local set",
Command = [[
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled", true)
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", true)
@@ -60,7 +60,7 @@ asset.export("lshirise_enable_action", lshirise_enable_action.Identifier)
local lshirise_disable_action = {
Identifier = "os.mars.lshirise.fadedout",
Name = "Fade out HiRISE Local Set",
Name = "Fade out HiRISE local set",
Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Settings.Opacity", 0, 2.0)
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", false)]],
Documentation = "Fade out HiRISE local set layer for Mars",

4
data/assets/actions/planets/planet_lighting.asset
View File

@@ -45,11 +45,11 @@ end
local function getIlluminationAction(node, node_lower, global)
local actionString = "_standard_illumination"
local actionName = "Standard Illumination"
local actionName = "standard illumination"
local actionCommand = getIlluminationCommand(node, global)
if (global) then
actionString = "_global_illumination"
actionName = "Global Illumination"
actionName = "global illumination"
actionCommand = getIlluminationCommand(node, global)
end

2
data/assets/actions/planets/scale_planets_and_moons.asset
View File

@@ -28,7 +28,7 @@ end
local function getToggleScaleAction(identifier, scale, name, speedup, speedown)
local action = {
Identifier = "os.toggle_" .. string.gsub(name, "%s+", "") .. "_scale",
Name = "Toggle " .. name .. " Scale",
Name = "Toggle " .. name .. " scale",
Command = [[
local list = openspace.getProperty("]] .. identifier .. [[.Scale.Scale");
if #list == 0 then

2
data/assets/actions/system/undo_event_fades.asset
View File

@@ -1,6 +1,6 @@
local undo_event_fade = {
Identifier = "os.undo_event_fade",
Name = "Undo All Event Fading",
Name = "Undo all event fading",
Command = [[
openspace.setPropertyValue("Scene.*.Renderable.Fade", 1.0, 0.5);
]],

4
data/assets/actions/trails/on_off_all_minor_moons.asset
View File

@@ -1,6 +1,6 @@
local minormoons_on = {
Identifier = "os_default.minormoons_on",
Name = "Turn ON minor moons and trails",
Name = "Turn on minor moons and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor}.Renderable.Fade');
@@ -25,7 +25,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os_default.minormoons_off",
Name = "Turn OFF minor moons and trails",
Name = "Turn off minor moons and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor}.Renderable.Fade');

2
data/assets/actions/trails/toggle_all_minor_moon_trails.asset
View File

@@ -1,6 +1,6 @@
local toggle_minormoon_trails = {
Identifier = "os_default.toggle_minormoon_trails",
Name = "Toggle Minor Moon Trails",
Name = "Toggle minor moon trails",
Command = [[
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
for _,v in pairs(list) do

6
data/assets/actions/trails/toggle_all_trails.asset
View File

@@ -1,6 +1,6 @@
local fade_up_trails = {
Identifier = "os.fade_up_trails",
Name = "Show All Trails",
Name = "Show all trails",
Command = [[
local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
for _,v in ipairs(capList) do
@@ -19,7 +19,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
local fade_down_trails = {
Identifier = "os.fade_down_trails",
Name = "Hide All Trails",
Name = "Hide all trails",
Command = [[
local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
for _,v in ipairs(capList) do
@@ -38,7 +38,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
local toggle_trails = {
Identifier = "os.toggle_trails",
Name = "Toggle All Trails",
Name = "Toggle all trails",
Command = [[
local capList = openspace.getProperty("*Trail.Renderable.Fade");
local list = openspace.getProperty("*trail.Renderable.Fade");

2
data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset
View File

@@ -1,6 +1,6 @@
local toggle_trails = {
Identifier = "os_default.toggle_trails",
Name = "Toggle Planet and Moon Trails (Instant)",
Name = "Toggle planet and moon trails (instant)",
Command = [[
local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end

6
data/assets/actions/trails/toggle_trail.asset
View File

@@ -1,6 +1,6 @@
local toggle_trail = {
Identifier = "os.toggle_trail",
Name = "Toggle Trail",
Name = "Toggle trail",
Command = [[
local node
if is_declared("args") then
@@ -48,7 +48,7 @@ asset.export("toggle_trail", toggle_trail.Identifier)
local hide_trail = {
Identifier = "os.hide_trail",
Name = "Hide Trail",
Name = "Hide trail",
Command = [[
local node
if is_declared("args") then
@@ -73,7 +73,7 @@ asset.export("hide_trail", hide_trail.Identifier)
local show_trail = {
Identifier = "os.show_trail",
Name = "Show Trail",
Name = "Show trail",
Command = [[
local node
if is_declared("args") then

6
data/assets/actions/trails/toggle_trails_planets_moons.asset
View File

@@ -1,6 +1,6 @@
local fade_up_trails = {
Identifier = "os.fade_up_trails_planets_moon",
Name = "Show Planet and Moon Trails",
Name = "Show planet and moon trails",
Command = [[
openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 1, 2);
openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 1, 2);
@@ -13,7 +13,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
local fade_down_trails = {
Identifier = "os.fade_down_trails_planets_moon",
Name = "Hide Planet and Moon Trails",
Name = "Hide planet and moon trails",
Command = [[
openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 0, 2);
openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 0, 2);
@@ -26,7 +26,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
local toggle_trails = {
Identifier = "os.toggle_trails_planets_moon",
Name = "Toggle Planet and Moon Trails",
Name = "Toggle planet and moon trails",
Command = [[
local capList = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Fade");
local list = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Fade");

10
data/assets/actions/trails/trail_appearance.asset
View File

@@ -1,6 +1,6 @@
local enable_trail_fading = {
Identifier = "os.enable_trail_fading",
Name = "Enable Trail Fading",
Name = "Enable trail fading",
Command = [[
openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", true);
openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", true);
@@ -13,7 +13,7 @@ asset.export("enable_trail_fading", enable_trail_fading.Identifier)
local disable_trail_fading = {
Identifier = "os.disable_trail_fading",
Name = "Disable Trail Fading",
Name = "Disable trail fading",
Command = [[
openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", false);
openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", false);
@@ -26,7 +26,7 @@ asset.export("disable_trail_fading", disable_trail_fading.Identifier)
local toggle_trail_fading = {
Identifier = "os.toggle_trail_fading",
Name = "Toggle Trail Fading",
Name = "Toggle trail fading",
Command = [[
local capList = openspace.getProperty("*Trail.Renderable.Appearance.EnableFade")
local list = openspace.getProperty("*trail.Renderable.Appearance.EnableFade")
@@ -69,7 +69,7 @@ local function getHighlightAction(identifierString, value, nameString)
end
local action = {
Identifier = "os." .. actionString .. identifierString .. "_trail",
Name = actionString .. " " .. nameString .. " Trail",
Name = actionString .. " " .. nameString .. " trail",
Command = getHightlightCommand(identifierString, value),
Documentation = "Animates the trail fade of " .. nameString .. "'s Trail",
GuiPath = "/Trails/Appearance",
@@ -81,7 +81,7 @@ end
local function getToggleHighlightAction(identifierString, value, nameString)
local action = {
Identifier = "os.toggle_" .. identifierString .. "_trail_highlight",
Name = "Toggle " .. nameString .. " Trail Highlight",
Name = "Toggle " .. nameString .. " trail highlight",
Command = [[
local list = openspace.getProperty("]] .. identifierString .. [[.Renderable.Appearance.Fade");
if #list == 0 then

4
data/assets/educational/scale/eiffeltower.asset
View File

@@ -48,7 +48,7 @@ local eiffelTower = {
local updatePositionAction = {
Identifier = "os.drop_eiffel_tower",
Name = "Drop Eiffel Tower under camera",
Name = "Drop Eiffel tower under camera",
Command = [[
local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera();
local camera = openspace.navigation.getNavigationState();
@@ -67,7 +67,7 @@ local updatePositionAction = {
local resetPositionAction = {
Identifier = "os.reset_eiffel_tower",
Name = "Reset Eiffel Tower position",
Name = "Reset Eiffel tower position",
Command = [[
-- same position as above
local lat = 48.85824

2
data/assets/examples/approachevents.asset
View File

@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local generic_action = {
Identifier = "os.example.generic",
Name = "Generic Example",
Name = "Generic example",
Command = [[
openspace.printInfo("Node: " .. args.Node)
openspace.printInfo("Transition: " .. args.Transition)

10
data/assets/scene/milkyway/constellations/constellation_art.asset
View File

@@ -124,7 +124,7 @@ end
local show_art = {
Identifier = "constellation_art.show_art",
Name = "Show Constellation Art",
Name = "Show constellation art",
Command = [[
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", true);
@@ -138,7 +138,7 @@ asset.export("ShowArtAction", show_art)
local hide_art = {
Identifier = "constellation_art.hide_art",
Name = "Hide Constellation Art",
Name = "Hide constellation art",
Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0, 2)]],
Documentation = "Fades out constellation artwork",
GuiPath = "/Rendering",
@@ -148,7 +148,7 @@ asset.export("HideArtAction", hide_art)
local disable_art = {
Identifier = "constellation_art.disable_art",
Name = "Disable Constellation Art",
Name = "Disable constellation art",
Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", false)]],
Documentation = "Disable constellation artwork",
GuiPath = "/Rendering",
@@ -158,7 +158,7 @@ asset.export("DisableArtAction", disable_art)
local show_zodiac_art = {
Identifier = "constellation_art.show_zodiac_art",
Name = "Show Zodiac Art",
Name = "Show zodiac art",
Command = [[
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
openspace.setPropertyValue("{zodiac}.Renderable.Enabled",true);
@@ -172,7 +172,7 @@ asset.export("ShowZodiacArt", show_zodiac_art)
local hide_zodiac_art = {
Identifier = "constellation_art.hide_zodiac_art",
Name = "Hide Zodiac Art",
Name = "Hide zodiac art",
Command = [[openspace.setPropertyValue("{zodiac}.Renderable.Opacity", 0, 2)]],
Documentation = "fades down zodiac art work",
GuiPath = "/Rendering",

2
data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
View File

@@ -49,7 +49,7 @@ local fieldlines = {
local toggle_fieldlines = {
Identifier = "os.events.bastilleday.fieldlines.togglefieldlines",
Name = "Toggle Fieldlines",
Name = "Toggle fieldlines",
Command = propertyHelper.invert("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled"),
Documentation = "Toggle fieldline rendering of CME",
GuiPath = "/Bastille-Day 2000",

4
data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
View File

@@ -23,7 +23,7 @@ asset.onInitialize(function ()
rawset(_G, "nextFlip", function() helper.nextFlipbookPage(flipbook) end)
openspace.action.registerAction({
Identifier = "lem_flipbook.next_flip",
Name = "Next A11 flip",
Name = "Next Apollo 11 flip",
Command = "nextFlip()",
Documentation = "Show the next Apollo 11 flipbook image",
GuiPath = "/Missions/Apollo/11",
@@ -33,7 +33,7 @@ asset.onInitialize(function ()
rawset(_G, "previousFlip", function() helper.previousFlipbookPage(flipbook) end)
openspace.action.registerAction({
Identifier = "lem_flipbook.prev_flip",
Name = "Prev A11 flip",
Name = "Prev Apollo 11 flip",
Command = "previousFlip()",
Documentation = "Show the previous Apollo 11 flipbook image",
GuiPath = "/Missions/Apollo/11",

4
data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
View File

@@ -85,7 +85,7 @@ end
local show_apollo_labels = {
Identifier = "apollo_insignias.show_insignias",
Name = "Show Apollo Landing Labels",
Name = "Show Apollo landing labels",
Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)]],
Documentation = "Show patches of the Apollo missions on their respective landing sites",
GuiPath = "/Missions/Apollo",
@@ -94,7 +94,7 @@ local show_apollo_labels = {
local hide_apollo_labels = {
Identifier = "apollo_insignias.hide_insignias",
Name = "Hide Apollo Landing Labels",
Name = "Hide Apollo landing labels",
Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)]],
Documentation = "Hide patches of the Apollo missions on their respective landing sites",
GuiPath = "/Missions/Apollo",

2
data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset
View File

@@ -1,6 +1,6 @@
local toggle_trail = {
Identifier = "event.jwst.toggle_trail",
Name = "Toggle JWST Trail (Auto)",
Name = "Toggle JWST trail (auto)",
Command = [[
local node
if is_declared("args") then

22
data/assets/scene/solarsystem/missions/newhorizons/actions.asset
View File

@@ -13,7 +13,7 @@ local focus_newhorizons = {
local anchor_nh_aim_pluto = {
Identifier = "os.missions.newhorizons.aimpluto",
Name = "Anchor NH, Aim Pluto",
Name = "Anchor NH, Aim Pluto",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'NewHorizons');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', 'Pluto');
@@ -52,7 +52,7 @@ local focus_charon = {
local toggle_nh_imageprojection = {
Identifier = "os.missions.newhorizons.toggleimageprojection",
Name = "Toggle NH Image Projection",
Name = "Toggle NH image projection",
Command = [[
local enabled = openspace.getPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection');
openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection', not enabled);
@@ -90,7 +90,7 @@ local approach_time_and_projections = {
local increase_hightmap_pluto = {
Identifier = "os.missions.newhorizons.pluto.increasehightmap",
Name = "Pluto HeightExaggeration +",
Name = "Pluto height exaggeration +",
Command = [[
openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") + 5000);
]],
@@ -101,7 +101,7 @@ local increase_hightmap_pluto = {
local decrease_hightmap_pluto = {
Identifier = "os.missions.newhorizons.pluto.decreasehightmap",
Name = "Pluto HeightExaggeration -",
Name = "Pluto height exaggeration -",
Command = [[
openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") - 5000);
]],
@@ -112,7 +112,7 @@ local decrease_hightmap_pluto = {
local increase_hightmap_charon = {
Identifier = "os.missions.newhorizons.charon.increasehightmap",
Name = "Charon HeightExaggeration +",
Name = "Charon height exaggeration +",
Command = [[
openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") + 5000);
]],
@@ -123,7 +123,7 @@ local increase_hightmap_charon = {
local decrease_hightmap_charon = {
Identifier = "os.missions.newhorizons.charon.decreasehightmap",
Name = "Charon HeightExaggeration -",
Name = "Charon height exaggeration -",
Command = [[
openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") - 5000);
]],
@@ -134,7 +134,7 @@ local decrease_hightmap_charon = {
local toggle_pluto_trail = {
Identifier = "os.missions.newhorizons.pluto.toggletrail",
Name = "Toggle Pluto Trail",
Name = "Toggle Pluto trail",
Command = [[
openspace.setPropertyValueSingle('Scene.PlutoBarycentricTrail.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoBarycentricTrail.Renderable.Enabled'));
]],
@@ -145,7 +145,7 @@ local toggle_pluto_trail = {
local toggle_pluto_labels = {
Identifier = "os.missions.newhorizons.pluto.togglelabels",
Name = "Toggle Pluto Labels",
Name = "Toggle Pluto labels",
Command = [[
local list = {"Scene.PlutoText.Renderable.Enabled", "Scene.CharonText.Renderable.Enabled", "Scene.HydraText.Renderable.Enabled", "Scene.NixText.Renderable.Enabled", "Scene.KerberosText.Renderable.Enabled", "Scene.StyxText.Renderable.Enabled"};
for _,v in pairs(list) do
@@ -159,7 +159,7 @@ local toggle_pluto_labels = {
local toggle_nh_labels = {
Identifier = "os.missions.newhorizons.togglelabels",
Name = "Toggle New Horizons Labels",
Name = "Toggle New Horizons labels",
Command = [[
local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity");
if v <= 0.5 then
@@ -175,7 +175,7 @@ local toggle_nh_labels = {
local toggle_shadows = {
Identifier = "os.missions.newhorizons.toggleshadows",
Name = "Toggle Shadows",
Name = "Toggle shadows",
Command = [[
openspace.setPropertyValueSingle('Scene.PlutoShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoShadow.Renderable.Enabled'));
openspace.setPropertyValueSingle('Scene.CharonShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.CharonShadow.Renderable.Enabled'));
@@ -187,7 +187,7 @@ local toggle_shadows = {
local toggle_nh_trail = {
Identifier = "os.missions.newhorizons.toggletrail",
Name = "Toggle NH Trail",
Name = "Toggle New Horizons trail",
Command = [[
openspace.setPropertyValueSingle('Scene.NewHorizonsTrailPluto.Renderable.Enabled', not openspace.getPropertyValue('Scene.NewHorizonsTrailPluto.Renderable.Enabled'));
]],

2
data/assets/scene/solarsystem/missions/osirisrex/actions.asset
View File

@@ -1,6 +1,6 @@
local focus_osirisrex = {
Identifier = "os.missions.osirisrex.focus",
Name = "Focus on OsirisRex",
Name = "Focus on OsirisREx",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'OsirisRex');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');

2
data/assets/scene/solarsystem/missions/perseverance/actions.asset
View File

@@ -1,6 +1,6 @@
local setup_perseverance = {
Identifier = "os.missions.perseverance.setup",
Name = "Setup and Goto Perseverance",
Name = "Setup and go to Perseverance",
Command = [[
openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1685.5);
openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1686.0);

2
data/assets/scene/solarsystem/missions/rosetta/actions.asset
View File

@@ -2,7 +2,7 @@ local toggle_outer_planetary_trails = {
Identifier = "os.missions.rosetta.toggleouterplanetarytrails",
Name = "Toggle outer planetary trails",
Command = [[
local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled');
local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled')
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end

6
data/assets/scene/solarsystem/missions/voyager/actions.asset
View File

@@ -1,6 +1,6 @@
local jupiter_approach = {
Identifier = "os.missions.voyager.setup.jupiterapproach",
Name = "Set Jupiter Approach",
Name = "Set Jupiter approach",
Command = [[
openspace.time.setTime('1979-01-20T01:32:07.914')
]],
@@ -11,7 +11,7 @@ local jupiter_approach = {
local saturn_approach = {
Identifier = "os.missions.voyager.setup.saturnapproach",
Name = "Set Saturn Approach",
Name = "Set Saturn approach",
Command = [[
openspace.time.setTime('1980-10-20T07:43:42.645');
]],
@@ -50,7 +50,7 @@ local toggle_minormoon_trails = {
Identifier = "os.missions.voyager.toggleminormoontrails",
Name = "Toggle minor trails",
Command = [[
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled')
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end

4
data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
View File

@@ -9,7 +9,7 @@ asset.require("./minor/themisto_group")
local minormoons_on = {
Identifier = "os.solarsystem.jupiter.minormoonson",
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');
@@ -34,7 +34,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os.solarsystem.jupiter.minormoonsoff",
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');

4
data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
View File

@@ -4,7 +4,7 @@ asset.require("./irregular_retrograde_moons")
local minormoons_on = {
Identifier = "os.solarsystem.neptune.minormoonson",
Name = "Turn ON minor moons and trails",
Name = "Turn on minor moons and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor_neptune}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor_neptune}.Renderable.Fade');
@@ -29,7 +29,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os.solarsystem.neptune.minormoonsoff",
Name = "Turn OFF minors moon and trails",
Name = "Turn off minors moon and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor_neptune}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor_neptune}.Renderable.Fade');

4
data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
View File

@@ -6,7 +6,7 @@ asset.require("./minor/shepherd_group")
local minormoons_on = {
Identifier = "os.solarsystem.saturn.minormoonson",
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');
@@ -31,7 +31,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os.solarsystem.saturn.minormoonsoff",
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');

4
data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
View File

@@ -4,7 +4,7 @@ asset.require("./irregular_retrograde_moons")
local minormoons_on = {
Identifier = "os.solarsystem.uranus.minormoonson",
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');
@@ -29,7 +29,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os.solarsystem.uranus.minormoonsoff",
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');

2
data/assets/scene/solarsystem/sun/EUV_layer.asset
View File

@@ -32,7 +32,7 @@ local EUVLayer = {
local toggle_EUV_layer = {
Identifier = "os.solarsystem.sun.toggleeuv",
Name = "Toggle EUV Layer",
Name = "Toggle EUV layer",
Command = propertyHelper.invert("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled"),
Documentation = "Toggle EUV layer of sun",
GuiPath = "/Bastille-Day 2000",

32
data/assets/util/default_keybindings.asset
View File

@@ -2,7 +2,7 @@ local propertyHelper = asset.require("./property_helper")
local toggle_native_ui = {
Identifier = "os_default.toggle_native_ui",
Name = "Show Native GUI",
Name = "Show native GUI",
Command = propertyHelper.invert("Modules.ImGUI.Enabled"),
Documentation = "Shows or hides the native UI",
GuiPath = "/System/GUI",
@@ -13,7 +13,7 @@ local toggle_native_ui = {
local toggle_shutdown = {
Identifier = "os_default.toggle_shutdown",
Name = "Toggle Shutdown",
Name = "Toggle shutdown",
Command = "openspace.toggleShutdown()",
Documentation = "Toggles the shutdown that will stop OpenSpace after a grace period. Press again to cancel the shutdown during this period",
GuiPath = "/System",
@@ -24,7 +24,7 @@ local toggle_shutdown = {
local take_screenshot = {
Identifier = "os_default.take_screenshot",
Name = "Take Screenshot",
Name = "Take screenshot",
Command = "openspace.takeScreenshot()",
Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory",
GuiPath = "/System/Rendering",
@@ -35,7 +35,7 @@ local take_screenshot = {
local toggle_pause_interpolated = {
Identifier = "os_default.toggle_pause_interpolated",
Name = "Toggle Pause (Interpolated)",
Name = "Toggle pause (interpolate)",
Command = "openspace.time.pauseToggleViaKeyboard()",
Documentation = "Smoothly starts and stops the simulation time",
GuiPath = "/Time/Simulation Speed",
@@ -46,7 +46,7 @@ local toggle_pause_interpolated = {
local toggle_pause_immediate = {
Identifier = "os_default.toggle_pause_immediate",
Name = "Toggle Pause (Immediate)",
Name = "Toggle pause (immediate)",
Command = "openspace.time.togglePause()",
Documentation = "Immediately starts and stops the simulation time",
GuiPath = "/Time/Simulation Speed",
@@ -57,7 +57,7 @@ local toggle_pause_immediate = {
local toggle_rotation_friction = {
Identifier = "os_default.toggle_rotation_friction",
Name = "Toggle Rotation friction",
Name = "Toggle rotation friction",
Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RotationalFriction"),
Documentation = "Toggles the rotational friction of the camera. If it is disabled, the camera rotates around the focus object indefinitely",
GuiPath = "/Navigation",
@@ -68,7 +68,7 @@ local toggle_rotation_friction = {
local toggle_zoom_friction = {
Identifier = "os_default.toggle_zoom_friction",
Name = "Toggle Zoom Friction",
Name = "Toggle zoom friction",
Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.ZoomFriction"),
Documentation = "Toggles the zoom friction of the camera. If it is disabled, the camera rises up from or closes in towards the focus object indefinitely",
GuiPath = "/Navigation",
@@ -79,7 +79,7 @@ local toggle_zoom_friction = {
local toggle_roll_friction = {
Identifier = "os_default.toggle_roll_friction",
Name = "Toggle Roll Friction",
Name = "Toggle roll friction",
Command = propertyHelper.invert("NavigationHandler.OrbitalNavigator.Friction.RollFriction"),
Documentation = "Toggles the roll friction of the camera. If it is disabled, the camera rolls around its own axis indefinitely",
GuiPath = "/Navigation",
@@ -145,9 +145,9 @@ local toggle_master_rendering = {
local next_delta_step_interpolate = {
Identifier = "os_default.next_delta_step_interpolate",
Name = "Next Delta Time Step (Interpolate)",
Name = "Next simulation time step (interpolate)",
Command = "openspace.time.interpolateNextDeltaTimeStep()",
Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists",
Documentation = "Smoothly interpolates the simulation speed to the next simulation time step, if one exists",
GuiPath = "/Time/Simulation Speed",
IsLocal = true,
@@ -156,9 +156,9 @@ local next_delta_step_interpolate = {
local next_delta_step_immediate = {
Identifier = "os_default.next_delta_step_immediate",
Name = "Next Delta Time Step (Immediate)",
Name = "Next simulation time step (immediate)",
Command = "openspace.time.setNextDeltaTimeStep()",
Documentation = "Immediately set the simulation speed to the next delta time step, if one exists",
Documentation = "Immediately set the simulation speed to the next simulation time step, if one exists",
GuiPath = "/Time/Simulation Speed",
IsLocal = true,
@@ -167,9 +167,9 @@ local next_delta_step_immediate = {
local previous_delta_step_interpolate = {
Identifier = "os_default.previous_delta_step_interpolate",
Name = "Previous Delta Time Step (Interpolate)",
Name = "Previous simulation time step (interpolate)",
Command = "openspace.time.interpolatePreviousDeltaTimeStep()",
Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists",
Documentation = "Smoothly interpolates the simulation speed to the previous simulation time step, if one exists",
GuiPath = "/Time/Simulation Speed",
IsLocal = true,
@@ -178,9 +178,9 @@ local previous_delta_step_interpolate = {
local previous_delta_step_immediate = {
Identifier = "os_default.previous_delta_step_immediate",
Name = "Previous Delta Time Step (Immediate)",
Name = "Previous simulation time step (immediate)",
Command = "openspace.time.setPreviousDeltaTimeStep()",
Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists",
Documentation = "Immediately set the simulation speed to the previous simulation time step, if one exists",
GuiPath = "/Time/Simulation Speed",
IsLocal = true,

2
data/assets/util/testing_keybindings.asset
View File

@@ -4,7 +4,7 @@ local propertyHelper = asset.require("./property_helper")
local take_screenshot = {
Identifier = "testing_keyboard.take_screenshot",
Name = "Take Screenshot",
Name = "Take screenshot",
Command = "openspace.takeScreenshot()",
Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory",
GuiPath = "/Rendering",

4
src/util/timemanager.cpp
View File

@@ -74,7 +74,7 @@ namespace {
"when interpolating"
};
constexpr std::string_view DeltaTimeStepsKeybindsGuiPath = "/Time/Delta Time Steps";
constexpr std::string_view DeltaTimeStepsKeybindsGuiPath = "/Time/Simulation Speed/Steps";
}
namespace openspace {
@@ -507,7 +507,7 @@ void TimeManager::addDeltaTimesKeybindings() {
action.documentation = fmt::format(
"Setting the simulation speed to {} seconds per realtime second", s
);
action.name = fmt::format("Set Simulation Speed: {}", s);
action.name = fmt::format("Set: {}", s);
action.guiPath = DeltaTimeStepsKeybindsGuiPath;
action.isLocal = interaction::Action::IsLocal::Yes;
global::actionManager->registerAction(std::move(action));