Move the launcher image synchronization from base -> base_blank and move the...

Move the launcher image synchronization from base -> base_blank  and move the trail actions from base_blank -> base

data/assets/base.asset

@@ -22,7 +22,6 @@ asset.require("scene/milkyway/milkyway/volume")
 asset.require("scene/milkyway/constellations/constellation_art")
 asset.require("scene/milkyway/constellations/constellation_keybinds")
 asset.require("scene/milkyway/objects/orionnebula/orionnebula")
-asset.require("util/launcher_images")
 
 asset.require("scene/digitaluniverse/2dF")
 asset.require("scene/digitaluniverse/2mass")
@@ -60,11 +59,56 @@ asset.require("scene/digitaluniverse/supernovaremnants")
 asset.require("scene/digitaluniverse/tully")
 asset.require("scene/digitaluniverse/voids")
 
-
 asset.require("customization/globebrowsing")
 
+local toggle_trails = {
+  Identifier = "os_default.toggle_trails",
+  Name = "Toggle Trails",
+  Command = [[
+    local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
+    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
+    
+    local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled");
+    for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
+  ]],
+  Documentation = "Toggles the visibility of planet and moon trails",
+  GuiPath = "/Rendering",
+  IsLocal = false,
+
+  Key = "h"
+}
+
+local toggle_planet_labels = {
+  Identifier = "os_default.toggle_planet_labels",
+  Name = "Toggle planet labels",
+  Command = [[
+    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
+    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
+  ]],
+  Documentation = "Turns on visibility for all solar system labels",
+  GuiPath = "/Rendering",
+  IsLocal = false,
+
+  Key = "l"
+}
+
+
 asset.onInitialize(function ()
+  openspace.action.registerAction(toggle_trails)
+  openspace.bindKey(toggle_trails.Key, toggle_trails.Identifier)
+
+  openspace.action.registerAction(toggle_planet_labels)
+  openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
+
   openspace.globebrowsing.loadWMSServersFromFile(
     openspace.absPath("${DATA}/globebrowsing_servers.lua")
   )
 end)
+
+asset.onDeinitialize(function ()
+  openspace.action.removeAction(toggle_trails)
+  openspace.clearKey(toggle_trails.Key)
+
+  openspace.action.removeAction(toggle_planet_labels)
+  openspace.clearKey(toggle_planet_labels.Key)
+end)

data/assets/base_blank.asset

@@ -15,55 +15,11 @@ local webGui = asset.require("util/webgui")
 -- Scale the different UI components based on the operating system's DPI scaling value
 asset.require("util/dpiscaling")
 
-local toggle_trails = {
-  Identifier = "os_default.toggle_trails",
-  Name = "Toggle Trails",
-  Command = [[
-    local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
-    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-    
-    local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled");
-    for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-  ]],
-  Documentation = "Toggles the visibility of planet and moon trails",
-  GuiPath = "/Rendering",
-  IsLocal = false,
-
-  Key = "h"
-}
-
-local toggle_planet_labels = {
-  Identifier = "os_default.toggle_planet_labels",
-  Name = "Toggle planet labels",
-  Command = [[
-    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
-    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-  ]],
-  Documentation = "Turns on visibility for all solar system labels",
-  GuiPath = "/Rendering",
-  IsLocal = false,
-
-  Key = "l"
-}
+-- Load the images required for the launcher to show up
+asset.require("util/launcher_images")
 
 asset.onInitialize(function ()
   webGui.setCefRoute("onscreen")
-
-  openspace.action.registerAction(toggle_trails)
-  openspace.bindKey(toggle_trails.Key, toggle_trails.Identifier)
-
-  openspace.action.registerAction(toggle_planet_labels)
-  openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
-
   openspace.setDefaultGuiSorting()
-
   openspace.setPropertyValueSingle("RenderEngine.VerticalLogOffset", 0.100000)
 end)
-
-asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_trails)
-  openspace.clearKey(toggle_trails.Key)
-
-  openspace.action.removeAction(toggle_planet_labels)
-  openspace.clearKey(toggle_planet_labels.Key)
-end)

src/scene/scenegraphnode.cpp

@@ -49,8 +49,7 @@
 namespace {
     constexpr const char* _loggerCat = "SceneGraphNode";
 
-    constexpr openspace::properties::Property::PropertyInfo ComputeScreenSpaceInfo =
-    {
+    constexpr openspace::properties::Property::PropertyInfo ComputeScreenSpaceInfo = {
         "ComputeScreenSpaceData",
         "Compute Screen Space Data",
         "If this value is set to 'true', the screenspace-based properties are calculated "
@@ -63,24 +62,28 @@ namespace {
         "The x,y position in screen space. Can be used for placing GUI elements",
         openspace::properties::Property::Visibility::Hidden
     };
+    
     constexpr openspace::properties::Property::PropertyInfo ScreenVisibilityInfo = {
         "ScreenVisibility",
         "ScreenVisibility",
         "Determines if the node is currently visible on screen",
         openspace::properties::Property::Visibility::Hidden
     };
+    
     constexpr openspace::properties::Property::PropertyInfo DistanceFromCamToNodeInfo = {
         "DistanceFromCamToNode",
         "DistanceFromCamToNode",
         "The distance from the camera to the node surface",
         openspace::properties::Property::Visibility::Hidden
     };
+    
     constexpr openspace::properties::Property::PropertyInfo ScreenSizeRadiusInfo = {
         "ScreenSizeRadius",
         "ScreenSizeRadius",
         "The screen size of the radius of the node",
         openspace::properties::Property::Visibility::Hidden
     };
+    
     constexpr openspace::properties::Property::PropertyInfo VisibilityDistanceInfo = {
         "VisibilityDistance",
         "VisibilityDistance",