From 9d481f722091fddd56c9bd73527e352b7ff860d8 Mon Sep 17 00:00:00 2001 From: Arohdin Date: Thu, 25 Sep 2025 15:47:19 +0200 Subject: [PATCH] Update installation specific to work with 0.21.2 --- .../others/olympus_mons_node.asset | 3 +- .../stort_installation_base.asset | 13 ++++-- .../substates/missions/apollo.asset | 4 +- .../substates/missions/apollo/scripts.asset | 12 ++--- .../substates/missions/cassini.asset | 2 +- .../substates/missions/cassini/kernels.asset | 11 +++++ .../substates/missions/cassini/scripts.asset | 4 +- .../substates/missions/mars_rovers.asset | 44 +++++++++---------- .../substates/missions/voyager_pioneer.asset | 2 +- .../utility_functions.asset | 4 +- .../dwarf_planets/ceres/ceres.asset | 2 +- .../dwarf_planets/ceres/trail.asset | 2 +- .../dwarf_planets/pluto/pluto.asset | 2 +- .../dwarf_planets/pluto/trail.asset | 2 +- .../missions/osirisrex/actions.asset | 4 +- 15 files changed, 65 insertions(+), 46 deletions(-) diff --git a/data/assets/installationspecific/others/olympus_mons_node.asset b/data/assets/installationspecific/others/olympus_mons_node.asset index 234b9f3744..6dc7e6e232 100644 --- a/data/assets/installationspecific/others/olympus_mons_node.asset +++ b/data/assets/installationspecific/others/olympus_mons_node.asset @@ -1,7 +1,8 @@ local mars = asset.require('scene/solarsystem/planets/mars/mars') local lat = 18.65 -local long = 226.2 +-- local long = 226.2 +local long = -133.3 local OlympusMonsPosition = { Identifier = "OlympusMonsPosition", diff --git a/data/assets/installationspecific/stort_installation_base.asset b/data/assets/installationspecific/stort_installation_base.asset index 48933743fc..484d12f180 100644 --- a/data/assets/installationspecific/stort_installation_base.asset +++ b/data/assets/installationspecific/stort_installation_base.asset @@ -42,7 +42,8 @@ asset.require("scene/solarsystem/missions/apollo/apollo_globebrowsing") asset.require("scene/solarsystem/missions/apollo/insignias_map") -- Voyager & Pioneer mission -asset.require("scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11") +asset.require("scene/solarsystem/missions/pioneer/horizons") +asset.require("scene/solarsystem/missions/voyager/horizons") -- ISS asset.require("scene/solarsystem/planets/earth/satellites/misc/iss") @@ -94,8 +95,8 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Europe.Enabled", true) openspace.setPropertyValueSingle("Scene.PerseveranceModel.Renderable.LightSources.Camera.Intensity", 0.7) - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Curiosity-Rover-Path.Enabled", false) - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.Enabled", false) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Curiosity-Rover-Path.Enabled", false) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.Enabled", false) -- Exoplanets openspace.setPropertyValueSingle("Scene.Exoplanets.Renderable.Enabled", true) @@ -110,6 +111,12 @@ asset.onInitialize(function () -- Insignias - for some reason they have opacity 0.0 per default in the asset openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1.0) + -- Pioneer & Voyager trail appearance + openspace.setPropertyValueSingle("Scene.Pioneer10_Horizons.Renderable.Appearance.LineFadeAmount", 0.15) + openspace.setPropertyValueSingle("Scene.Pioneer11_Horizons.Renderable.Appearance.LineFadeAmount", 0.15) + openspace.setPropertyValueSingle("Scene.Voyager1_Horizons.Renderable.Appearance.LineFadeAmount", 0.15) + openspace.setPropertyValueSingle("Scene.Voyager2_Horizons.Renderable.Appearance.LineFadeAmount", 0.15) + -- Have Cassini missing trails faded out per default openspace.setPropertyValue("{cassini_trail}.Renderable.Fade", 0.0) diff --git a/data/assets/installationspecific/substates/missions/apollo.asset b/data/assets/installationspecific/substates/missions/apollo.asset index 848e596ca4..4e91e1e38c 100644 --- a/data/assets/installationspecific/substates/missions/apollo.asset +++ b/data/assets/installationspecific/substates/missions/apollo.asset @@ -42,7 +42,7 @@ local apollo8State = { ]] .. util.fadeOutNodes({ "ISS_trail", "ISS" }) .. [[ ]] .. scripts.apolloScripts .. [[ openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMaximumAllowedDistance", false); - openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnabledMinimumAllowedDistance", false); + openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMinimumAllowedDistance", false); openspace.setPropertyValueSingle('Modules.Touch.TouchInteraction.DisableZoom', true); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.DisableZoom", true); ]], @@ -87,7 +87,7 @@ local leaveState = [[ local flyToMoon = [[ ]] .. util.setCurveType("ZoomOutOverview") .. [[ openspace.time.setPause(true) - openspace.pathnavigation.flyTo('Moon', true) + openspace.navigation.flyTo('Moon', true) ]] local flyToApollo8 = [[ diff --git a/data/assets/installationspecific/substates/missions/apollo/scripts.asset b/data/assets/installationspecific/substates/missions/apollo/scripts.asset index e7807f3cba..99ca795964 100644 --- a/data/assets/installationspecific/substates/missions/apollo/scripts.asset +++ b/data/assets/installationspecific/substates/missions/apollo/scripts.asset @@ -17,7 +17,7 @@ local apollo8Scripts = [[ -- Zoom out a little openspace.scriptScheduler.loadScheduledScript( "1968-12-21T12:54:51", - "openspace.pathnavigation.zoomToDistance(]] .. tostring(launchOverviewDistance) .. [[)" + "openspace.navigation.zoomToDistance(]] .. tostring(launchOverviewDistance) .. [[)" ) -- Focus on Apollo 8 again @@ -38,7 +38,7 @@ local apollo8Scripts = [[ "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth')" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(earthOverviewDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(earthOverviewDistance) .. [[)" .. "openspace.time.interpolateDeltaTime(1800)" -- 30 min per second ) @@ -49,7 +49,7 @@ local apollo8Scripts = [[ "openspace.time.interpolateDeltaTime(10800)" .. -- 3 hours per second "openspace.setPropertyValueSingle('UserProperties.DeltaTimeValue', 3)" .. "openspace.setPropertyValueSingle('UserProperties.DeltaTimeUnit', 'h')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(apollo8OverviewDistance) .. [[)" + "openspace.navigation.zoomToDistance(]] .. tostring(apollo8OverviewDistance) .. [[)" ) -- Half way to moon @@ -68,7 +68,7 @@ local apollo8Scripts = [[ "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon')" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(moonOverviewDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(moonOverviewDistance) .. [[)" .. "openspace.time.interpolateDeltaTime(3600)" .. -- 1 hour per second "openspace.setPropertyValueSingle('UserProperties.DeltaTimeValue', 1)" .. "openspace.setPropertyValueSingle('UserProperties.DeltaTimeUnit', 'h')" @@ -81,7 +81,7 @@ local apollo8Scripts = [[ "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo8')" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(apollo8OverviewDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(apollo8OverviewDistance) .. [[)" .. "openspace.time.interpolateDeltaTime(10800)" .. -- 3 hours per second "openspace.setPropertyValueSingle('UserProperties.DeltaTimeValue', 3)" .. "openspace.setPropertyValueSingle('UserProperties.DeltaTimeUnit', 'h')" @@ -106,7 +106,7 @@ local apollo8Scripts = [[ "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth')" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(earthOverviewDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(earthOverviewDistance) .. [[)" .. "openspace.time.interpolateDeltaTime(1800)" .. -- 30 min per second "openspace.setPropertyValueSingle('UserProperties.DeltaTimeValue', 30)" .. "openspace.setPropertyValueSingle('UserProperties.DeltaTimeUnit', 'm')" diff --git a/data/assets/installationspecific/substates/missions/cassini.asset b/data/assets/installationspecific/substates/missions/cassini.asset index 54823bbe3a..0addeac1ee 100644 --- a/data/assets/installationspecific/substates/missions/cassini.asset +++ b/data/assets/installationspecific/substates/missions/cassini.asset @@ -65,7 +65,7 @@ local huygensState = { openspace.setPropertyValue('{moonTrail_major_saturn}.Renderable.Fade', 0.0, 3.0) openspace.setPropertyValueSingle('Scene.Titan.Renderable.Fade', 1.0, 3.0) openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMaximumAllowedDistance", false); - openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnabledMinimumAllowedDistance", false); + openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMinimumAllowedDistance", false); openspace.setPropertyValueSingle('Modules.Touch.TouchInteraction.DisableZoom', true); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.DisableZoom", true); ]] .. util.fadeInNodes({ "TitanTrail", "Titan" }) .. [[ diff --git a/data/assets/installationspecific/substates/missions/cassini/kernels.asset b/data/assets/installationspecific/substates/missions/cassini/kernels.asset index b19710b555..d258b3068f 100644 --- a/data/assets/installationspecific/substates/missions/cassini/kernels.asset +++ b/data/assets/installationspecific/substates/missions/cassini/kernels.asset @@ -93,6 +93,17 @@ local pckKernels = { kernels .. "/telesto_mst2013.bpc", } + +asset.onInitialize(function() + openspace.spice.loadKernel(ephemerisKernels) + openspace.spice.loadKernel(pckKernels) +end) + +asset.onDeinitialize(function() + openspace.spice.unloadKernel(pckKernels) + openspace.spice.unloadKernel(ephemerisKernels) +end) + asset.export("kernels", kernels) asset.export("ephemerisKernels", ephemerisKernels) asset.export("pckKernels", pckKernels) \ No newline at end of file diff --git a/data/assets/installationspecific/substates/missions/cassini/scripts.asset b/data/assets/installationspecific/substates/missions/cassini/scripts.asset index 2b8360a640..992084889c 100644 --- a/data/assets/installationspecific/substates/missions/cassini/scripts.asset +++ b/data/assets/installationspecific/substates/missions/cassini/scripts.asset @@ -165,7 +165,7 @@ local huygensScripts = [[ "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchorInterpolationTime', 2.0)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Titan')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(approachDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(approachDistance) .. [[)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchorInterpolationTime', 2.0)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Titan')" .. @@ -178,7 +178,7 @@ local huygensScripts = [[ "openspace.time.interpolateDeltaTime(600)" .. -- 10 min per second "openspace.setPropertyValueSingle('UserProperties.DeltaTimeValue', 10)" .. "openspace.setPropertyValueSingle('UserProperties.DeltaTimeUnit', 'm')" .. - "openspace.pathnavigation.zoomToDistance(]] .. tostring(landingDistance) .. [[)" .. + "openspace.navigation.zoomToDistance(]] .. tostring(landingDistance) .. [[)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchorInterpolationTime', 2.0)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil)" .. "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Titan')" .. diff --git a/data/assets/installationspecific/substates/missions/mars_rovers.asset b/data/assets/installationspecific/substates/missions/mars_rovers.asset index cbe96d4bbf..a51871fba8 100644 --- a/data/assets/installationspecific/substates/missions/mars_rovers.asset +++ b/data/assets/installationspecific/substates/missions/mars_rovers.asset @@ -43,9 +43,9 @@ local marsRoversState = { Enter = [[ openspace.setPropertyValue("{ingenuity_only}.Renderable.Fade", 0.0, 2.0); openspace.setPropertyValue("{perseverance_only}.Renderable.Fade", 0.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.Fade", 0.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path-2024.Fade", 0.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Ingenuity-Path-2024.Fade", 0.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.Fade", 0.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path-2024.Fade", 0.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Ingenuity-Path-2024.Fade", 0.0); ]] .. util.setOrbitSpeedFactor(0.4) .. [[ ]] .. util.orbitOnArrival() .. [[ ]], @@ -57,7 +57,7 @@ local marsRoversState = { local goToMarsOverview = [[ ]] .. util.setCurveType("ZoomOutOverview") .. [[ openspace.time.setPause(true) - openspace.pathnavigation.flyTo('Mars', true) + openspace.navigation.flyTo('Mars', true) ]] ----- @@ -78,14 +78,14 @@ local curiosityState = { Enter = [[ ]] .. reduceAmbientIntensity .. [[ openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_Mosaic_Sweden.Fade", 1.0, 5.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Curiosity-Rover-Path.Enabled", true); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Curiosity-Rover-Path.Enabled", true); ]] .. util.setOrbitSpeedFactor(0.8) .. [[ ]] .. util.orbitAroundUpOnArrival() .. [[ ]], Exit = [[ ]] .. resetAmbientIntensity .. [[ ]] .. util.stopOrbiting() .. [[ - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Curiosity-Rover-Path.Enabled", false); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Curiosity-Rover-Path.Enabled", false); ]] .. util.disableRoll() .. [[ ]] } @@ -111,12 +111,12 @@ local perseveranceState = { ]] .. util.stopOrbiting() .. [[ openspace.setPropertyValue("{perseverance_only}.Enabled", true); openspace.setPropertyValue("{perseverance_only}.Renderable.Fade", 1.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.Enabled", true); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.Fade", 1.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.ForceUpdateHeightData", nil); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.Enabled", true); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.Fade", 1.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.ForceUpdateHeightData", nil); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.MinimumAllowedDistance", 10); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMaximumAllowedDistance", false); - openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnabledMinimumAllowedDistance", false); + openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.LimitZoom.EnableMinimumAllowedDistance", false); openspace.setPropertyValueSingle("Modules.Touch.TouchInteraction.DisableZoom", true); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.DisableZoom", true); ]] .. util.setOrbitSpeedFactor(0.6) .. [[ @@ -124,7 +124,7 @@ local perseveranceState = { ]], Exit = [[ openspace.setPropertyValue("{perseverance_only}.Renderable.Fade", 0.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path.Fade", 0.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path.Fade", 0.0, 2.0); openspace.setPropertyValueSingle("Modules.Touch.TouchInteraction.DisableZoom", false); openspace.setPropertyValueSingle("NavigationHandler.OrbitalNavigator.DisableZoom", false); ]] .. util.stopOrbiting() .. [[ @@ -154,19 +154,19 @@ local ingenuityState = { openspace.setPropertyValue("{ingenuity_only}.Renderable.Fade", 1.0, 2.0); openspace.setPropertyValueSingle("Scene.Mars-Ingenuity-Position-2024.Renderable.Fade", 1.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path-2024.Enabled", true); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path-2024.Fade", 1.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path-2024.ForceUpdateHeightData", nil); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Ingenuity-Path-2024.Enabled", true); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Ingenuity-Path-2024.Fade", 1.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Ingenuity-Path-2024.ForceUpdateHeightData", nil); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path-2024.Enabled", true); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path-2024.Fade", 1.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path-2024.ForceUpdateHeightData", nil); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Ingenuity-Path-2024.Enabled", true); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Ingenuity-Path-2024.Fade", 1.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Ingenuity-Path-2024.ForceUpdateHeightData", nil); ]] .. util.orbitAroundUpOnArrival() .. [[ ]], Exit = [[ openspace.setPropertyValue("{ingenuity_only}.Renderable.Fade", 0.0, 2.0); openspace.setPropertyValueSingle("Scene.Mars-Ingenuity-Position-2024.Renderable.Fade", 0.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Perseverance-Rover-Path-2024.Fade", 0.0, 2.0); - openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeoJson.Ingenuity-Path-2024.Fade", 0.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Perseverance-Rover-Path-2024.Fade", 0.0, 2.0); + openspace.setPropertyValueSingle("Scene.Mars.Renderable.GeographicOverlays.Ingenuity-Path-2024.Fade", 0.0, 2.0); ]] .. util.stopOrbiting() .. [[ ]] .. util.disableRoll() .. [[ ]] @@ -198,19 +198,19 @@ local leaveTransition = [[ local toPerseveranceTransition = [[ ]] .. util.enableRoll() .. [[ ]] .. util.setCurveType("ZoomOutOverview") .. [[ - openspace.pathnavigation.flyToNavigationState( ]] .. perseverance_TiltedNavState_Path .. [[) + openspace.navigation.flyToNavigationState( ]] .. perseverance_TiltedNavState_Path .. [[) ]] local toIngenuityTransition = [[ ]] .. util.enableRoll() .. [[ ]] .. util.setCurveType("ZoomOutOverview") .. [[ - openspace.pathnavigation.flyToNavigationState( ]] .. ingenuity_TiltedNavState_Path .. [[) + openspace.navigation.flyToNavigationState( ]] .. ingenuity_TiltedNavState_Path .. [[) ]] local toCuriosityTransition = [[ ]] .. util.enableRoll() .. [[ ]] .. util.setCurveType("ZoomOutOverview") .. [[ - openspace.pathnavigation.flyToNavigationState( ]] .. galeCrater_TiltedNavState .. [[) + openspace.navigation.flyToNavigationState( ]] .. galeCrater_TiltedNavState .. [[) ]] local transitions = { diff --git a/data/assets/installationspecific/substates/missions/voyager_pioneer.asset b/data/assets/installationspecific/substates/missions/voyager_pioneer.asset index a1d74bcb0c..745b551757 100644 --- a/data/assets/installationspecific/substates/missions/voyager_pioneer.asset +++ b/data/assets/installationspecific/substates/missions/voyager_pioneer.asset @@ -5,7 +5,7 @@ local today = asset.require('./../../default_time').time ---------------------------------------------------------------- -- STATES ---------------------------------------------------------------- -local trails = { "Voyager1", "Voyager2", "Pioneer10", "Pioneer11" } +local trails = { "Voyager1_Horizons", "Voyager2_Horizons", "Pioneer10_Horizons", "Pioneer11_Horizons" } local voyagerPioneerNavigationState = [[{ Anchor = "Sun", diff --git a/data/assets/installationspecific/utility_functions.asset b/data/assets/installationspecific/utility_functions.asset index fdf92712e6..693d127aa3 100644 --- a/data/assets/installationspecific/utility_functions.asset +++ b/data/assets/installationspecific/utility_functions.asset @@ -113,13 +113,13 @@ end local flyToNavState = function(state) return [[ - openspace.pathnavigation.flyToNavigationState(]] .. state .. [[) + openspace.navigation.flyToNavigationState(]] .. state .. [[) ]] end local flyLinearlyToHeight = function(height) return [[ - openspace.pathnavigation.zoomToDistance(]] .. tostring(height) .. [[) + openspace.navigation.zoomToDistance(]] .. tostring(height) .. [[) ]] end diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset index f6be8f3d83..96f3dcf582 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/ceres.asset @@ -9,7 +9,7 @@ local Ceres = { Type = "RenderableGlobe", Radii = { 487300, 487300, 454700 } }, - Tag = { "planet_terrestrial", "dwarf_planet" }, + Tag = { "planet_terrestrial", "dwarf_planet", "ceres_system" }, GUI = { Path = "/Solar System/Dwarf Planets/Ceres" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset index 6cf9d4e5c7..e1f7d499a0 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/ceres/trail.asset @@ -18,7 +18,7 @@ local CeresTrail = { Period = 1680, Resolution = 1000 }, - Tag = { "planetTrail_dwarf" }, + Tag = { "planetTrail_dwarf", "ceres_system" }, GUI = { Name = "Ceres Trail", Path = "/Solar System/Dwarf Planets/Ceres", diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index 8034f03b96..55ccc7c646 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -43,7 +43,7 @@ local Pluto = { Color = { 1.0, 1.0, 0.0 } } }, - Tag = { "planet_terrestrial", "dwarf_planet" }, + Tag = { "planet_terrestrial", "dwarf_planet", "pluto_system" }, GUI = { Path = "/Solar System/Dwarf Planets/Pluto" } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index 0250915f1d..3ea9dabc2a 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -18,7 +18,7 @@ local PlutoBarycenterTrail = { Resolution = 368, LineLength = 0.03 }, - Tag = { "planetTrail_dwarf" }, + Tag = { "planetTrail_dwarf", "pluto_system" }, GUI = { Name = "Pluto Barycenter Trail", Path = "/Solar System/Dwarf Planets/Pluto", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset index c3cab44525..aa6aee450e 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset @@ -102,7 +102,7 @@ local SetLaunchTime = { Command = [[ openspace.printInfo('Set time: Launch') openspace.time.setTime('2016-SEP-08 23:05:05.000' - openspace.pathnavigation.flyToNavigationState({ + openspace.navigation.flyToNavigationState({ Yaw = -0.0001539482222527231, Anchor = "Earth", Position = { 10453686.309525654, -10108287.946681349, 5873485.232088189 }, @@ -125,7 +125,7 @@ local LookImageCapture = { Command = [[ openspace.printInfo("Set time: Image Capture") openspace.time.setTime("2018-11-02T04:14:44") - openspace.pathnavigation.flyTo("BennuBarycenter") + openspace.navigation.flyTo("BennuBarycenter") openspace.time.setDeltaTime(60) ]], Documentation = "Look at the image capture of OSIRIS-REx",