mars2020 landed

data/assets/mars.scene

@@ -7,7 +7,6 @@ local perseveranceShortcuts = asset.require('scene/solarsystem/missions/persever
 local insightAsset = asset.require('scene/solarsystem/missions/insight/edl')
 local insightShortcuts = asset.require('scene/solarsystem/missions/insight/shortcuts')
 
-
 local insightEDLShortcuts = sceneHelper.extractShortcuts({"Insight Height Offset", 
 	"Enable HiRISE",
 	"Insight EDL Time",
@@ -22,7 +21,6 @@ local insightDisableShortcuts = sceneHelper.extractShortcuts({
 local PerseverenceLandedShortcuts = sceneHelper.extractShortcuts({
 	"Perseverance Height Offset", 
 	"Perseverance landed time", 
-	-- "Show Perseverance Trail", 
 	"Enable HiRISE"},
 	perseveranceShortcuts.Shortcuts)
 
@@ -47,7 +45,6 @@ local Keybindings = {
 }
 
 asset.onInitialize(function ()
-
     local now = openspace.time.currentWallTime()
     openspace.time.setTime(now)
 
@@ -55,8 +52,7 @@ asset.onInitialize(function ()
 
     openspace.globebrowsing.goToGeo("Mars", 58.5877, 16.1924, 8000000)
 
-    openspace.markInterestingNodes({ "Mars", insightAsset.Insight.Identifier })
-
+    openspace.markInterestingNodes({ "Mars", insightAsset.Insight.Identifier, "Perseverance" })
 end)
 
 asset.onDeinitialize(function ()

data/assets/scene/solarsystem/missions/perseverance/model.asset

@@ -33,19 +33,16 @@ local textures = asset.syncedResource({
     Version = 1
 })
 
-
-
 -- Perseverance Model --
 local Perseverance = {
-    Identifier = "PerseveranceM",
+    Identifier = "Perseverance",
     Parent = transforms.MSL_Body.Identifier,
     GUI = {
-        Name = "Perseverance Position",
+        Name = "Perseverance",
         Path = "/Solar System/Missions/Perseverance"
     }
 }
 
-
 -- Perseverance Model --
 local PerseveranceModel = {
     Identifier = "PerseveranceModel",

data/assets/scene/solarsystem/missions/perseverance/shortcuts.asset

@@ -13,8 +13,8 @@ local PerseveranceNavigationSate = "{" ..
 
 local Shortcuts = {
     {
-        Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);" .. 
-        "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -470.800006);",
+        Command = "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);" ..
+        "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset', -1677.088867);",
         Documentation = "Enable height layer offset for Perseverance landing trail",
         Name = "Perseverance Height Offset",
         GuiPath = "/Missions/Insight",

data/assets/scene/solarsystem/missions/perseverance/transforms.asset

@@ -1,29 +1,12 @@
 local assetHelper = asset.require('util/asset_helper')
 local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
 local marsAsset = asset.require('scene/solarsystem/planets/mars/mars')
+local trailAsset = asset.require('./trail')
 
 
-local m2020_pos = {
-    Identifier = "m2020_pos",
-    Parent =  marsAsset.Mars.Identifier,
-    Transform = {   
-        Translation = {
-            Type = "GlobeTranslation",
-            Globe = "Mars",
-            Latitude = 18.3628,
-            Longitude = 77.5945,
-            UseHeightmap = true
-        },
-    },
-    GUI = {
-        Path = "/Solar System/Missions/Perseverance/Transforms",
-        Hidden = true,
-    }
-}
-
 local MSL_Body = {
     Identifier = "MSL_Body",
-    Parent =  m2020_pos.Identifier,
+    Parent =  trailAsset.PerseveranceNode.Identifier,
     Transform = {   
         Translation = {
             Type = "StaticTranslation",
@@ -31,7 +14,7 @@ local MSL_Body = {
         },
         Rotation = {
             Type = "StaticRotation",
-            Rotation = { -1.884960,0.000000,2.905970 }
+            Rotation = { -0.521593,0.648407,2.888407 }
         }
     },
     GUI = {
@@ -487,8 +470,6 @@ local Wheel_B_R_Location = {
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { 
-
-    m2020_pos,
     MSL_Body,
     RA_Base_Location,
     RA_Shoulder_AZ_Location,

openspace.cfg

@@ -60,6 +60,7 @@ Asset = "default"
 -- Asset = "apollo_sites"
 -- Asset = "touch"
 -- Asset = "dawn"
+-- Asset = "mars"
 
 -- Sets the profile that should be loaded by OpenSpace.  Profiles are going to replace
 -- assets in a future versions and shouldn't be used at the same time as the 'Asset'