Add additional tags to minor moons, trails, and labels of Jupiter and…

… Saturn (closes #3272)
OpenSpace · May 22, 2024 · 9828b96 · 9828b96
1 parent 2dd1b2f
commit 9828b96
Show file tree

Hide file tree

Showing 13 changed files with 1,334 additions and 167 deletions.
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -53,6 +53,7 @@ local CarpoTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carpo",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local CarpoLabel = {
     FadeDistances = { 1.0, 100.0 },
     FadeWidths = { 0.0, 100.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "Carpo Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/Carpo",
@@ -104,7 +111,13 @@ local CarpoLabelNear = {
     FadeDistances = { 0.2, 1.0 },
     FadeWidths = { 0.1, 0.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "Carpo Label (Near)",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/Carpo",
@@ -160,6 +173,7 @@ local S2018J4Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_carpo",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -186,7 +200,13 @@ local S2018J4Label = {
     FadeDistances = { 1.5, 90.0 },
     FadeWidths = { 0.5, 90.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "S/2018 J 4 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/S2018J4",
@@ -211,7 +231,13 @@ local S2018J4LabelNear = {
     FadeDistances = { 0.2, 1.0 },
     FadeWidths = { 0.1, 0.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_carpo"
+  },
   GUI = {
     Name = "S2018J4 Label (Near)",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Carpo Group/S2018J4",

diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -53,6 +53,7 @@ local LedaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -79,7 +80,13 @@ local LedaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Leda Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Leda",
@@ -135,6 +142,7 @@ local HimaliaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -161,7 +169,13 @@ local HimaliaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Himalia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Himalia",
@@ -217,6 +231,7 @@ local LysitheaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -243,7 +258,13 @@ local LysitheaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Lysithea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Lysithea",
@@ -299,6 +320,7 @@ local ElaraTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -325,7 +347,13 @@ local ElaraLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Elara Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Elara",
@@ -381,6 +409,7 @@ local DiaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -407,7 +436,13 @@ local DiaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Dia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Dia",
@@ -463,6 +498,7 @@ local S2011J3Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -489,7 +525,13 @@ local S2011J3Label = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "S/2011 J 3 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2011J3",
@@ -545,6 +587,7 @@ local S2018J2Trail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -571,7 +614,13 @@ local S2018J2Label = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "S/2018 J 2 Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/S2018J2",
@@ -627,6 +676,7 @@ local PandiaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -653,7 +703,13 @@ local PandiaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Pandia Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Pandia",
@@ -709,6 +765,7 @@ local ErsaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_himalia",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -735,7 +792,13 @@ local ErsaLabel = {
     FadeDistances = { 1.0, 120.0 },
     FadeWidths = { 1.0, 120.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_himalia"
+  },
   GUI = {
     Name = "Ersa Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Himalia Group/Ersa",

diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -52,6 +52,7 @@ local MetisTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -78,7 +79,13 @@ local MetisLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Metis Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Metis",
@@ -134,6 +141,7 @@ local AdrasteaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -160,7 +168,13 @@ local AdrasteaLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Adrastea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Adrastea",
@@ -216,6 +230,7 @@ local AmaltheaTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -242,7 +257,13 @@ local AmaltheaLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Amalthea Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Amalthea",
@@ -298,6 +319,7 @@ local ThebeTrail = {
     "moonTrail_solarSystem",
     "moonTrail_giants",
     "moonTrail_jupiter",
+    "moonTrail_inner",
     "moonTrail_minor",
     "moonTrail_minor_jupiter"
   },
@@ -324,7 +346,13 @@ local ThebeLabel = {
     FadeDistances = { 0.1, 3.0 },
     FadeWidths = { 0.1, 3.0 }
   },
-  Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
+  Tag = {
+    "solarsystem_labels",
+    "moon_labels",
+    "minor_moon_labels",
+    "minor_moon_labels_jupiter",
+    "minor_moon_labels_inner"
+  },
   GUI = {
     Name = "Thebe Label",
     Path = "/Solar System/Planets/Jupiter/Minor Moons/Inner Group/Thebe",