Some small cleanup

data/assets/mars.scene

@@ -8,54 +8,54 @@ 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",
-	"Insight EDL NavigationState"},
-	insightShortcuts.Shortcuts)
+  "Enable HiRISE",
+  "Insight EDL Time",
+  "Insight EDL NavigationState"},
+  insightShortcuts.Shortcuts)
 
 local insightDisableShortcuts = sceneHelper.extractShortcuts({
-	"Default Height Offset", 
-	"Disable HiRISE"},
-	insightShortcuts.Shortcuts)
+  "Default Height Offset", 
+  "Disable HiRISE"},
+  insightShortcuts.Shortcuts)
 
 local PerseverenceLandedShortcuts = sceneHelper.extractShortcuts({
-	"Perseverance Height Offset", 
-	"Perseverance landed time", 
-	"Enable HiRISE"},
-	perseveranceShortcuts.Shortcuts)
+  "Perseverance Height Offset", 
+  "Perseverance landed time", 
+  "Enable HiRISE"},
+  perseveranceShortcuts.Shortcuts)
 
 
 local Keybindings = {
-	sceneHelper.createKeyBindFromShortcuts("i",
-		insightEDLShortcuts,
-		"/Missions/Insight",
-		"Set and goto Insight Landing",
-		"Setup scene for insight EDL"
-	),
-	sceneHelper.createKeyBindFromShortcuts("SHIFT+i",
-		insightDisableShortcuts,
-		"/Missions/Insight",
-		"Unset Insight Landing",
-		"Disable Mars layer settings used for insight EDL"
-	),
-	sceneHelper.createKeyBindFromShortcuts("p",
-		PerseverenceLandedShortcuts,
-		"/Missions/Perseverance"
-	)
+  sceneHelper.createKeyBindFromShortcuts("i",
+    insightEDLShortcuts,
+    "/Missions/Insight",
+    "Set and goto Insight Landing",
+    "Setup scene for insight EDL"
+  ),
+  sceneHelper.createKeyBindFromShortcuts("SHIFT+i",
+    insightDisableShortcuts,
+    "/Missions/Insight",
+    "Unset Insight Landing",
+    "Disable Mars layer settings used for insight EDL"
+  ),
+  sceneHelper.createKeyBindFromShortcuts("p",
+    PerseverenceLandedShortcuts,
+    "/Missions/Perseverance"
+  )
 }
 
 asset.onInitialize(function ()
-    local now = openspace.time.currentWallTime()
-    openspace.time.setTime(now)
+  local now = openspace.time.currentWallTime()
+  openspace.time.setTime(now)
 
-    sceneHelper.bindKeys(Keybindings)
+  sceneHelper.bindKeys(Keybindings)
 
-    openspace.globebrowsing.goToGeo("Mars", 58.5877, 16.1924, 8000000)
+  openspace.globebrowsing.goToGeo("Mars", 58.5877, 16.1924, 8000000)
 
-    openspace.markInterestingNodes({ "Mars", insightAsset.Insight.Identifier, "Perseverance" })
+  openspace.markInterestingNodes({ "Mars", insightAsset.Insight.Identifier, "Perseverance" })
 end)
 
 asset.onDeinitialize(function ()
-    sceneHelper.unbindKeys(Keybindings)
-    openspace.removeInterestingNodes({ "Mars", insightAsset.Insight.Identifier})
+  sceneHelper.unbindKeys(Keybindings)
+  openspace.removeInterestingNodes({ "Mars", insightAsset.Insight.Identifier})
 end)

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

@@ -3,8 +3,8 @@
 local InsightEntryTime = "2018 NOV 26 19:39:03.68"
 
 local insightNavigationSate = "{" ..
-	"Anchor = 'Insight'," ..
-	"Pitch = 0.567457E-4," ..
+    "Anchor = 'Insight'," ..
+    "Pitch = 0.567457E-4," ..
     "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," ..
     "ReferenceFrame = 'Root',"..
     "Up = { 0.441211E0,0.247019E0,0.862737E0 }," ..

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

@@ -19,14 +19,14 @@ local LightSources = {
     }
 }
 
-local models = asset.syncedResource({  
+local models = asset.syncedResource({
     Name = "Mars 2020 Kernels",
     Type = "HttpSynchronization",
     Identifier = "perseverance_models",
     Version = 1
 })
 
-local textures = asset.syncedResource({  
+local textures = asset.syncedResource({
     Name = "Mars 2020 Kernels",
     Type = "HttpSynchronization",
     Identifier = "perseverance_textures",
@@ -48,14 +48,14 @@ local PerseveranceModel = {
     Identifier = "PerseveranceModel",
     Parent = Perseverance.Identifier,
     GUI = {
-    	Name = "Perseverance Model",
+        Name = "Perseverance Model",
         Path = "/Solar System/Missions/Perseverance"
     }
 }
 
 -- Perseverance Model Instruments --
 local Body = {
-    Identifier = "body",
+    Identifier = "Perseverance_body",
     Parent = PerseveranceModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -76,7 +76,7 @@ local Body = {
 }
 
 local Body_detail = {
-    Identifier = "Body_detail",
+    Identifier = "Perseverance_Body_detail",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -97,7 +97,7 @@ local Body_detail = {
 }
 
 local Body_staticParts_1 = {
-    Identifier = "Body_staticParts_1",
+    Identifier = "Perseverance_Body_staticParts_1",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -117,7 +117,7 @@ local Body_staticParts_1 = {
 }
 
 local Body_staticParts_2 = {
-    Identifier = "Body_staticParts_2",
+    Identifier = "Perseverance_Body_staticParts_2",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -137,7 +137,7 @@ local Body_staticParts_2 = {
 }
 
 local Body_staticParts_3 = {
-    Identifier = "Body_staticParts_3",
+    Identifier = "Perseverance_Body_staticParts_3",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -157,7 +157,7 @@ local Body_staticParts_3 = {
 }
 
 local Body_staticParts_4 = {
-    Identifier = "Body_staticParts_4",
+    Identifier = "Perseverance_Body_staticParts_4",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -177,7 +177,7 @@ local Body_staticParts_4 = {
 }
 
 local Body_staticParts_5 = {
-    Identifier = "Body_staticParts_5",
+    Identifier = "Perseverance_Body_staticParts_5",
     Parent = Body.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -198,7 +198,7 @@ local Body_staticParts_5 = {
 
 -- RA AZ
 local RA_Shoulder_AZ = {
-    Identifier = "RA_Shoulder_AZ",
+    Identifier = "Perseverance_RA_Shoulder_AZ",
     Parent = transforms.RA_Shoulder_AZ_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -218,7 +218,7 @@ local RA_Shoulder_AZ = {
 }
 
 local RA_Shoulder_AZ_detail_1 = {
-    Identifier = "RA_Shoulder_AZ_detail_1",
+    Identifier = "Perseverance_RA_Shoulder_AZ_detail_1",
     Parent = RA_Shoulder_AZ.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -238,7 +238,7 @@ local RA_Shoulder_AZ_detail_1 = {
 }
 
 local RA_Shoulder_AZ_detail_2 = {
-    Identifier = "RA_Shoulder_AZ_detail_2",
+    Identifier = "Perseverance_RA_Shoulder_AZ_detail_2",
     Parent = RA_Shoulder_AZ.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -259,7 +259,7 @@ local RA_Shoulder_AZ_detail_2 = {
 
 ---- RA EL
 local RA_Shoulder_EL_1 = {
-    Identifier = "RA_Shoulder_EL_1",
+    Identifier = "Perseverance_RA_Shoulder_EL_1",
     Parent = transforms.RA_Shoulder_EL_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -280,7 +280,7 @@ local RA_Shoulder_EL_1 = {
 
 
 local RA_Shoulder_EL_detail_1 = {
-    Identifier = "RA_Shoulder_EL_detail_1",
+    Identifier = "Perseverance_RA_Shoulder_EL_detail_1",
     Parent = RA_Shoulder_EL_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -300,7 +300,7 @@ local RA_Shoulder_EL_detail_1 = {
 }
 
 local RA_Shoulder_EL_detail_2 = {
-    Identifier = "RA_Shoulder_EL_detail_2",
+    Identifier = "Perseverance_RA_Shoulder_EL_detail_2",
     Parent = RA_Shoulder_EL_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -322,7 +322,7 @@ local RA_Shoulder_EL_detail_2 = {
 
 
 local RA_Shoulder_EL_2 = {
-    Identifier = "RA_Shoulder_EL_2",
+    Identifier = "Perseverance_RA_Shoulder_EL_2",
     Parent = RA_Shoulder_EL_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -343,7 +343,7 @@ local RA_Shoulder_EL_2 = {
 
 -- RA ELBOW
 local RA_Elbow_1 = {
-    Identifier = "RA_Elbow_1",
+    Identifier = "Perseverance_RA_Elbow_1",
     Parent = transforms.RA_Elbow_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -363,7 +363,7 @@ local RA_Elbow_1 = {
 }
 
 local RA_Elbow_detail_1 = {
-    Identifier = "RA_Elbow_detail_1",
+    Identifier = "Perseverance_RA_Elbow_detail_1",
     Parent = RA_Elbow_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -383,7 +383,7 @@ local RA_Elbow_detail_1 = {
 }
 
 local RA_Elbow_detail_2 = {
-    Identifier = "RA_Elbow_detail_2",
+    Identifier = "Perseverance_RA_Elbow_detail_2",
     Parent = RA_Elbow_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -404,7 +404,7 @@ local RA_Elbow_detail_2 = {
 
 
 local RA_Elbow_2 = {
-    Identifier = "RA_Elbow_2",
+    Identifier = "Perseverance_RA_Elbow_2",
     Parent = RA_Elbow_1.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -426,7 +426,7 @@ local RA_Elbow_2 = {
 
 -- RA WRIST
 local RA_Wrist = {
-    Identifier = "RA_Wrist",
+    Identifier = "Perseverance_RA_Wrist",
     Parent = transforms.RA_Wrist_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -446,7 +446,7 @@ local RA_Wrist = {
 }
 
 local RA_Wrist_details = {
-    Identifier = "RA_Wrist_details",
+    Identifier = "Perseverance_RA_Wrist_details",
     Parent = RA_Wrist.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -467,7 +467,7 @@ local RA_Wrist_details = {
 
 -- RA TURRET
 local RA_Turret = {
-    Identifier = "RA_Turret",
+    Identifier = "Perseverance_RA_Turret",
     Parent = transforms.RA_Turret_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -488,7 +488,7 @@ local RA_Turret = {
 
 
 local RA_Turret_details_1 = {
-    Identifier = "RA_Turret_details_1",
+    Identifier = "Perseverance_RA_Turret_details_1",
     Parent = RA_Turret.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -508,7 +508,7 @@ local RA_Turret_details_1 = {
 }
 
 local RA_Turret_details_2 = {
-    Identifier = "RA_Turret_details_2",
+    Identifier = "Perseverance_RA_Turret_details_2",
     Parent = RA_Turret.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -529,7 +529,7 @@ local RA_Turret_details_2 = {
 
 -- MastCam--
 local RSM_root = {
-    Identifier = "RSM_root",
+    Identifier = "Perseverance_RSM_root",
     Parent = transforms.RSM_ROOT_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -550,7 +550,7 @@ local RSM_root = {
 }
 
 local RSM_AZ = {
-    Identifier = "RSM_AZ",
+    Identifier = "Perseverance_RSM_AZ",
     Parent = transforms.RSM_AZ_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -570,7 +570,7 @@ local RSM_AZ = {
 }
 
 local RSM_EL = {
-    Identifier = "RSM_EL",
+    Identifier = "Perseverance_RSM_EL",
     Parent = transforms.RSM_EL_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -591,7 +591,7 @@ local RSM_EL = {
 
 ---- HGA ----
 local HGA_AZ = {
-    Identifier = "HGA_AZ",
+    Identifier = "Perseverance_HGA_AZ",
     Parent = transforms.HGA_AZ_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -611,7 +611,7 @@ local HGA_AZ = {
 }
 
 local HGA_EL = {
-    Identifier = "HGA_EL",
+    Identifier = "Perseverance_HGA_EL",
     Parent = transforms.HGA_EL_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -632,7 +632,7 @@ local HGA_EL = {
 
 ---- SAM & CHEMIN ----
 local SAM_Cover_1 = {
-    Identifier = "SAM_Cover_1",
+    Identifier = "Perseverance_SAM_Cover_1",
     Parent = transforms.SAM_Cover_1_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -652,7 +652,7 @@ local SAM_Cover_1 = {
 }
 
 local SAM_Cover_2 = {
-    Identifier = "SAM_Cover_2",
+    Identifier = "Perseverance_SAM_Cover_2",
     Parent = transforms.SAM_Cover_2_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -672,7 +672,7 @@ local SAM_Cover_2 = {
 }
 
 local CHEMIN_Bottom = {
-    Identifier = "CHEMIN_Bottom",
+    Identifier = "Perseverance_CHEMIN_Bottom",
     Parent = transforms.CHEMIN_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -693,7 +693,7 @@ local CHEMIN_Bottom = {
 
 -- Wheels --
 local Wheel_Base = {
-    Identifier = "Wheel_Base",
+    Identifier = "Perseverance_Wheel_Base",
     Parent = transforms.Wheel_base_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -712,7 +712,7 @@ local Wheel_Base = {
     }
 }
 local Wheel_Base_2 = {
-    Identifier = "Wheel_Base_2",
+    Identifier = "Perseverance_Wheel_Base_2",
     Parent = Wheel_Base.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -733,7 +733,7 @@ local Wheel_Base_2 = {
 
 -- LEFT SIDE -- 
 local Wheel_Leg_1_L = {
-    Identifier = "Wheel_Leg_1_L",
+    Identifier = "Perseverance_Wheel_Leg_1_L",
     Parent = transforms.Leg_1_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -753,7 +753,7 @@ local Wheel_Leg_1_L = {
 }
 
 local Wheel_Leg_1A_L_detail = {
-    Identifier = "Wheel_Leg_1A_L_detail",
+    Identifier = "Perseverance_Wheel_Leg_1A_L_detail",
     Parent = Wheel_Leg_1_L.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -773,7 +773,7 @@ local Wheel_Leg_1A_L_detail = {
 }
 
 local Wheel_Leg_1B_L_detail = {
-    Identifier = "Wheel_Leg_1B_L_detail",
+    Identifier = "Perseverance_Wheel_Leg_1B_L_detail",
     Parent = Wheel_Leg_1_L.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -793,7 +793,7 @@ local Wheel_Leg_1B_L_detail = {
 }
 
 local Wheel_Leg_2_L = {
-    Identifier = "Wheel_Leg_2_L",
+    Identifier = "Perseverance_Wheel_Leg_2_L",
     Parent = transforms.Leg_2_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -813,7 +813,7 @@ local Wheel_Leg_2_L = {
 }
 
 local Wheel_Wrist_F_L = {
-    Identifier = "Wheel_Wrist_F_L",
+    Identifier = "Perseverance_Wheel_Wrist_F_L",
     Parent = transforms.Wrist_F_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -833,7 +833,7 @@ local Wheel_Wrist_F_L = {
 }
 
 local Wheel_Wrist_hub_F_L = {
-    Identifier = "Wheel_Wrist_hub_F_L",
+    Identifier = "Perseverance_Wheel_Wrist_hub_F_L",
     Parent = Wheel_Wrist_F_L.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -853,7 +853,7 @@ local Wheel_Wrist_hub_F_L = {
 }
 
 local Wheel_F_L = {
-    Identifier = "Wheel_F_L",
+    Identifier = "Perseverance_Wheel_F_L",
     Parent = transforms.Wheel_F_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -873,7 +873,7 @@ local Wheel_F_L = {
 }
 
 local Wheel_C_L = {
-    Identifier = "Wheel_C_L",
+    Identifier = "Perseverance_Wheel_C_L",
     Parent = transforms.Wheel_C_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -893,7 +893,7 @@ local Wheel_C_L = {
 }
 
 local Wheel_Wrist_B_L = {
-    Identifier = "Wheel_Wrist_B_L",
+    Identifier = "Perseverance_Wheel_Wrist_B_L",
     Parent = transforms.Wrist_B_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -913,7 +913,7 @@ local Wheel_Wrist_B_L = {
 }
 
 local Wheel_Wrist_hub_B_L = {
-    Identifier = "Wheel_Wrist_hub_B_L",
+    Identifier = "Perseverance_Wheel_Wrist_hub_B_L",
     Parent = Wheel_Wrist_B_L.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -933,7 +933,7 @@ local Wheel_Wrist_hub_B_L = {
 }
 
 local Wheel_B_L = {
-    Identifier = "Wheel_B_L",
+    Identifier = "Perseverance_Wheel_B_L",
     Parent = transforms.Wheel_B_L_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -954,7 +954,7 @@ local Wheel_B_L = {
 
 -- RIGHT SIDE -- 
 local Wheel_Leg_1_R = {
-    Identifier = "Wheel_Leg_1_R",
+    Identifier = "Perseverance_Wheel_Leg_1_R",
     Parent = transforms.Leg_1_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -974,7 +974,7 @@ local Wheel_Leg_1_R = {
 }
 
 local Wheel_Leg_1A_R_detail = {
-    Identifier = "Wheel_Leg_1A_R_detail",
+    Identifier = "Perseverance_Wheel_Leg_1A_R_detail",
     Parent = Wheel_Leg_1_R.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -994,7 +994,7 @@ local Wheel_Leg_1A_R_detail = {
 }
 
 local Wheel_Leg_1B_R_detail = {
-    Identifier = "Wheel_Leg_1B_R_detail",
+    Identifier = "Perseverance_Wheel_Leg_1B_R_detail",
     Parent = Wheel_Leg_1_R.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1014,7 +1014,7 @@ local Wheel_Leg_1B_R_detail = {
 }
 
 local Wheel_Leg_2_R = {
-    Identifier = "Wheel_Leg_2_R",
+    Identifier = "Perseverance_Wheel_Leg_2_R",
     Parent = transforms.Leg_2_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1034,7 +1034,7 @@ local Wheel_Leg_2_R = {
 }
 
 local Wheel_Wrist_F_R = {
-    Identifier = "Wheel_Wrist_F_R",
+    Identifier = "Perseverance_Wheel_Wrist_F_R",
     Parent = transforms.Wrist_F_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1055,7 +1055,7 @@ local Wheel_Wrist_F_R = {
 }
 
 local Wheel_Wrist_hub_F_R = {
-    Identifier = "Wheel_Wrist_hub_F_R",
+    Identifier = "Perseverance_Wheel_Wrist_hub_F_R",
     Parent = Wheel_Wrist_F_R.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1074,9 +1074,8 @@ local Wheel_Wrist_hub_F_R = {
     }
 }
 
-
 local Wheel_F_R = {
-    Identifier = "Wheel_F_R",
+    Identifier = "Perseverance_Wheel_F_R",
     Parent = transforms.Wheel_F_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1095,9 +1094,8 @@ local Wheel_F_R = {
     }
 }
 
-
 local Wheel_C_R = {
-    Identifier = "Wheel_C_R",
+    Identifier = "Perseverance_Wheel_C_R",
     Parent = transforms.Wheel_C_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1117,7 +1115,7 @@ local Wheel_C_R = {
 }
 
 local Wheel_Wrist_B_R = {
-    Identifier = "Wheel_Wrist_B_R",
+    Identifier = "Perseverance_Wheel_Wrist_B_R",
     Parent = transforms.Wrist_B_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1137,7 +1135,7 @@ local Wheel_Wrist_B_R = {
 }
 
 local Wheel_Wrist_hub_B_R = {
-    Identifier = "Wheel_Wrist_hub_B_R",
+    Identifier = "Perseverance_Wheel_Wrist_hub_B_R",
     Parent = Wheel_Wrist_B_R.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1157,7 +1155,7 @@ local Wheel_Wrist_hub_B_R = {
 }
 
 local Wheel_B_R = {
-    Identifier = "Wheel_B_R",
+    Identifier = "Perseverance_Wheel_B_R",
     Parent = transforms.Wheel_B_R_Location.Identifier,
     Renderable = {
         Type = "RenderableModel",
@@ -1178,66 +1176,26 @@ local Wheel_B_R = {
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { 
     Perseverance,
-    PerseveranceModel, 
-    Body,
-    Body_detail,
-    Body_staticParts_1,
-    Body_staticParts_2,
-    Body_staticParts_3,
-    Body_staticParts_4,
-    Body_staticParts_5,
-    
-    RA_Shoulder_AZ,
-    RA_Shoulder_AZ_detail_1,
-    RA_Shoulder_AZ_detail_2,
-    RA_Shoulder_EL_1,
-    RA_Shoulder_EL_detail_1,
-    RA_Shoulder_EL_detail_2,
-    RA_Shoulder_EL_2,
-    RA_Elbow_1,
-    RA_Elbow_detail_1,
-    RA_Elbow_detail_2,
-    RA_Elbow_2,
-    RA_Wrist,
-    RA_Wrist_details,
-    RA_Turret,
-    RA_Turret_details_1,
-    RA_Turret_details_2,
-    
-    RSM_root,
-    RSM_AZ,
-    RSM_EL,
-    
-    HGA_AZ,
-    HGA_EL,
-    
-    SAM_Cover_1,
-    SAM_Cover_2,
-    CHEMIN_Bottom,
+    PerseveranceModel,
 
-    Wheel_Base,
-    Wheel_Base_2,
-    Wheel_Leg_1_L,
-    Wheel_Leg_1A_L_detail,
-    Wheel_Leg_1B_L_detail,
-    Wheel_Leg_2_L,
-    Wheel_Wrist_F_L,
-    Wheel_Wrist_hub_F_L,
-    Wheel_F_L,
-    Wheel_C_L,
-    Wheel_Wrist_B_L,
-    Wheel_Wrist_hub_B_L,
-    Wheel_B_L,
-    Wheel_Leg_1_R,
-    Wheel_Leg_1A_R_detail,
-    Wheel_Leg_1B_R_detail,
-    Wheel_Leg_2_R,
-    Wheel_Wrist_F_R,
-    Wheel_Wrist_hub_F_R,
-    Wheel_F_R,
-    Wheel_C_R,
-    Wheel_Wrist_B_R,
-    Wheel_Wrist_hub_B_R,
+    Body, Body_detail, Body_staticParts_1, Body_staticParts_2, Body_staticParts_3,
+    Body_staticParts_4, Body_staticParts_5,
+
+    RA_Shoulder_AZ, RA_Shoulder_AZ_detail_1, RA_Shoulder_AZ_detail_2, RA_Shoulder_EL_1,
+    RA_Shoulder_EL_detail_1, RA_Shoulder_EL_detail_2, RA_Shoulder_EL_2, RA_Elbow_1,
+    RA_Elbow_detail_1, RA_Elbow_detail_2, RA_Elbow_2, RA_Wrist, RA_Wrist_details,
+    RA_Turret, RA_Turret_details_1, RA_Turret_details_2,
+
+    RSM_root, RSM_AZ, RSM_EL,
+
+    HGA_AZ, HGA_EL,
+
+    SAM_Cover_1, SAM_Cover_2, CHEMIN_Bottom,
+
+    Wheel_Base, Wheel_Base_2, Wheel_Leg_1_L, Wheel_Leg_1A_L_detail, Wheel_Leg_1B_L_detail,
+    Wheel_Leg_2_L, Wheel_Wrist_F_L, Wheel_Wrist_hub_F_L, Wheel_F_L, Wheel_C_L,
+    Wheel_Wrist_B_L, Wheel_Wrist_hub_B_L, Wheel_B_L, Wheel_Leg_1_R,
+    Wheel_Leg_1A_R_detail, Wheel_Leg_1B_R_detail, Wheel_Leg_2_R, Wheel_Wrist_F_R,
+    Wheel_Wrist_hub_F_R, Wheel_F_R, Wheel_C_R, Wheel_Wrist_B_R, Wheel_Wrist_hub_B_R,
     Wheel_B_R
-
-})
+})

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

@@ -3,9 +3,9 @@
 local PerseveranceLaunchTime = "2020 JUL 17 13:56:42"
 local PerseveranceLandingTime = "2021 FEB 18 20:32:16"
 
-local PerseveranceNavigationSate = "{" ..
-	"Anchor = 'Insight'," ..
-	"Pitch = 0.567457E-4," ..
+local PerseveranceNavigationState = "{" ..
+    "Anchor = 'Perseverance'," ..
+    "Pitch = 0.567457E-4," ..
     "Position = { 1.240506E1,-1.369270E1,-2.423553E0 }," ..
     "ReferenceFrame = 'Root',"..
     "Up = { 0.441211E0,0.247019E0,0.862737E0 }," ..
@@ -45,7 +45,7 @@ local Shortcuts = {
         Local = false
     },
     {
-        Command = "openspace.navigation.setNavigationState(" .. PerseveranceNavigationSate .. ");",
+        Command = "openspace.navigation.setNavigationState(" .. PerseveranceNavigationState .. ");",
         Documentation = "Change the camera state for the start of Insight EDL",
         Name = "Insight EDL NavigationState",
         GuiPath = "/Missions/Insight",

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

@@ -3,13 +3,15 @@ local assetHelper = asset.require('util/asset_helper')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
 
-local kernels = asset.syncedResource({  
+local kernels = asset.syncedResource({
     Name = "Mars 2020 Kernels",
     Type = "HttpSynchronization",
     Identifier = "perseverance_kernels",
     Version = 1
 })
 
+local perseverance_id = "-168"
+
 local m2020_kernels = {
     kernels .. "/m2020.tf",
 
@@ -32,8 +34,8 @@ local PerseveranceNode = {
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
-            Target = "-168",
-            Observer = "SUN", 
+            Target = perseverance_id,
+            Observer = "SUN",
             Kernels = m2020_kernels
         },
     },
@@ -50,7 +52,7 @@ local PerseveranceTrailSun = {
         Type = "RenderableTrailTrajectory",
         Translation = { 
             Type = "SpiceTranslation",
-            Target = "-168",
+            Target = perseverance_id,
             Observer = "SUN",
             Kernels = m2020_kernels
         },
@@ -72,7 +74,7 @@ local PerseveranceTrailMars = {
         Type = "RenderableTrailTrajectory",
         Translation = {
             Type = "SpiceTranslation",
-            Target = "-168",
+            Target = perseverance_id,
             Observer = "MARS",
             Kernels = m2020_kernels
         },

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

@@ -7,7 +7,7 @@ local trailAsset = asset.require('./trail')
 local MSL_Body = {
     Identifier = "MSL_Body",
     Parent =  trailAsset.PerseveranceNode.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
             Position = { 0, 0.0, 2.8 }
@@ -27,7 +27,7 @@ local MSL_Body = {
 local RA_Base_Location = {
     Identifier = "RA_Base_Location",
     Parent = MSL_Body.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
             Position = { 1.111, -0.4525, -0.106 }
@@ -39,15 +39,14 @@ local RA_Base_Location = {
     }
 }
 
-
 --AZ
 local RA_Shoulder_AZ_Location = {
     Identifier = "RA_Shoulder_AZ_Location",
     Parent = RA_Base_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.0, -0.08}
+            Position = { 0.0, 0.0, -0.08 }
         }
     },
     GUI = {
@@ -63,7 +62,7 @@ local RA_Shoulder_EL_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.17, 0.2, -0.005}
+            Position = { 0.17, 0.2, -0.005 }
         }
     },
     GUI = {
@@ -79,7 +78,7 @@ local RA_Elbow_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.83, -0.2, 0.0 }
+            Position = { 0.83, -0.2, 0.0 }
         }
     },
     GUI = {
@@ -95,7 +94,7 @@ local RA_Wrist_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.77, 0.13, 0.035}
+            Position = { 0.77, 0.13, 0.035 }
         }
     },
     GUI = {
@@ -111,7 +110,7 @@ local RA_Turret_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.04, -0.15}
+            Position = { 0.0, 0.04, -0.15 }
         }
     },
     GUI = {
@@ -133,7 +132,7 @@ local RSM_ROOT_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.7039, 0.5769, -0.563}
+            Position = { 0.7039, 0.5769, -0.563 }
         }
     },
     GUI = {
@@ -148,7 +147,7 @@ local RSM_AZ_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.008, 0.0}
+            Position = { 0.0, 0.008, 0.0 }
         }
     },
     GUI = {
@@ -173,7 +172,7 @@ local RSM_EL_Location = {
         Translation = {
             Type = "StaticTranslation",
             --Position = {0.0, 0.0, -0.664}
-            Position = {0.002, 0.007, -0.688}   
+            Position = { 0.002, 0.007, -0.688 }
         }
     },
     GUI = {
@@ -186,10 +185,10 @@ local RSM_EL_Location = {
 local HGA_AZ_Location = {
     Identifier = "HGA_AZ_Location",
     Parent = MSL_Body.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {-0.46, -0.47, -0.55}
+            Position = { -0.46, -0.47, -0.55 }
         }
     },
     GUI = {
@@ -201,10 +200,10 @@ local HGA_AZ_Location = {
 local HGA_EL_Location = {
     Identifier = "HGA_EL_Location",
     Parent = HGA_AZ_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.0, -0.17}
+            Position = { 0.0, 0.0, -0.17 }
         }
     },
     GUI = {
@@ -255,10 +254,10 @@ local Wheel_base_Location = {
 local Leg_1_L_Location = {
     Identifier = "Leg_1_L_Location",
     Parent = Wheel_base_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.217, -0.812, -0.215}   --for the right side
+            Position = { 0.217, -0.812, -0.215 }   --for the right side
         }
     },
     GUI = {
@@ -270,10 +269,10 @@ local Leg_1_L_Location = {
 local Leg_2_L_Location = {
     Identifier = "Leg_2_L_Location",
     Parent = Leg_1_L_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {-0.74, -0.00380, 0.223} --CORRECT, DONT CHANGE
+            Position = { -0.74, -0.00380, 0.223 } --CORRECT, DONT CHANGE
         }
     },
     GUI = {
@@ -285,10 +284,10 @@ local Leg_2_L_Location = {
 local Wrist_F_L_Location = {
     Identifier = "Wrist_F_L_Location",
     Parent = Leg_1_L_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.8839, -0.2659, 0.2} --CORRECT, DONT TOUCH
+            Position = { 0.8839, -0.2659, 0.2 } --CORRECT, DONT TOUCH
         }
     },
     GUI = {
@@ -300,10 +299,10 @@ local Wrist_F_L_Location = {
 local Wheel_F_L_Location = {
     Identifier = "Wheel_F_L_Location",
     Parent = Wrist_F_L_Location.Identifier,
-    Transform = { 
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.0, 0.426}
+            Position = { 0.0, 0.0, 0.426 }
         }
     },
     GUI = {
@@ -315,10 +314,10 @@ local Wheel_F_L_Location = {
 local Wheel_C_L_Location = {
     Identifier = "Wheel_C_L_Location",
     Parent = Leg_2_L_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.45, -0.4, 0.403}
+            Position = { 0.45, -0.4, 0.403 }
         }
     },
     GUI = {
@@ -327,14 +326,13 @@ local Wheel_C_L_Location = {
     }
 }
 
-
 local Wrist_B_L_Location = {
     Identifier = "Wrist_B_L_Location",
     Parent = Leg_2_L_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {-0.627, -0.2635, -0.022} --CORRECT, DONT CHANGE
+            Position = { -0.627, -0.2635, -0.022 } --CORRECT, DONT CHANGE
         }
     },
     GUI = {
@@ -343,14 +341,13 @@ local Wrist_B_L_Location = {
     }
 }
 
-
 local Wheel_B_L_Location = {
     Identifier = "Wheel_B_L_Location",
     Parent = Wrist_B_L_Location.Identifier,
-    Transform = {  
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, -0.0, 0.426}
+            Position = { 0.0, -0.0, 0.426 }
         }
     },
     GUI = {
@@ -359,15 +356,14 @@ local Wheel_B_L_Location = {
     }
 }
 
-
 -- wheels, Right Side --
 local Leg_1_R_Location = {
     Identifier = "Leg_1_R_Location",
     Parent = Wheel_base_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.217, 0.812, -0.215}   --Check with caroline!!!
+            Position = { 0.217, 0.812, -0.215 }   --Check with caroline!!!
         }
     },
     GUI = {
@@ -379,11 +375,11 @@ local Leg_1_R_Location = {
 local Leg_2_R_Location = {
     Identifier = "Leg_2_R_Location",
     Parent = Leg_1_R_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
             --Position = {-0.74, 0.0, 0.24}
-            Position = {-0.74, 0.00380, 0.223} --want to use this one, once the center point is changed in maya
+            Position = { -0.74, 0.00380, 0.223 } --want to use this one, once the center point is changed in maya
 
         }
     },
@@ -396,10 +392,10 @@ local Leg_2_R_Location = {
 local Wrist_F_R_Location = {
     Identifier = "Wrist_F_R_Location",
     Parent = Leg_1_R_Location.Identifier,
-    Transform = {  
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.882, 0.259, 0.215}
+            Position = { 0.882, 0.259, 0.215 }
             --Position = {0.8839, 0.2659, 0.2} --position for the Wrist_F_L
         }
     },
@@ -412,10 +408,10 @@ local Wrist_F_R_Location = {
 local Wheel_F_R_Location = {
     Identifier = "Wheel_F_R_Location",
     Parent = Wrist_F_R_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, 0.0, 0.426}
+            Position = { 0.0, 0.0, 0.426 }
         }
     },
     GUI = {
@@ -427,10 +423,10 @@ local Wheel_F_R_Location = {
 local Wheel_C_R_Location = {
     Identifier = "Wheel_C_R_Location",
     Parent = Leg_2_R_Location.Identifier,
-    Transform = {  
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.45, 0.4, 0.403}
+            Position = { 0.45, 0.4, 0.403 }
         }
     },
     GUI = {
@@ -442,10 +438,10 @@ local Wheel_C_R_Location = {
 local Wrist_B_R_Location = {
     Identifier = "Wrist_B_R_Location",
     Parent = Leg_2_R_Location.Identifier,
-    Transform = {   
+    Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {-0.6208, 0.2759, -0.025}            
+            Position = { -0.6208, 0.2759, -0.025 }
         }
     },
     GUI = {
@@ -460,7 +456,7 @@ local Wheel_B_R_Location = {
     Transform = {
         Translation = {
             Type = "StaticTranslation",
-            Position = {0.0, -0.0005, 0.426}
+            Position = { 0.0, -0.0005, 0.426 }
         }
     },
     GUI = {

data/assets/util/scene_helper.asset

@@ -142,4 +142,4 @@ local createKeyBindFromShortcuts = function(key, shortcuts, guipath, title, docu
 
     return keybind
 end
-asset.export("createKeyBindFromShortcuts", createKeyBindFromShortcuts)
+asset.export("createKeyBindFromShortcuts", createKeyBindFromShortcuts)