Removing the asset_helper file (#1868)

- Remove the asset_helper file and call the onInitialize and onDeinitialize functions directly
 - Small compile fix on Windows
 - Removes the need for the registerIdentifierWithMeta function by automatically doing that for all asset.export statements
 - Allow the passing of either identifiers (as before) or entire tables to the removeSceneGraphNode, removeScreenSpaceRenderable, deleteLayer, removeAction, and export methods. In that case, the Identifier key from the table is extracted and used instead

apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp

@@ -29,6 +29,7 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QEvent>
+#include <QFile>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>

data/assets/actions/toggle_trail.asset

@@ -99,9 +99,9 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.action.removeAction(toggle_trail.Identifier)
-  openspace.action.removeAction(show_trail.Identifier)
-  openspace.action.removeAction(hide_trail.Identifier)
+  openspace.action.removeAction(toggle_trail)
+  openspace.action.removeAction(show_trail)
+  openspace.action.removeAction(hide_trail)
 end)
 
 

data/assets/base.asset

@@ -24,7 +24,6 @@ asset.require("util/launcher_images")
 asset.require("scene/milkyway/exoplanets/exoplanets_data")
 asset.require("scene/milkyway/exoplanets/exoplanets_textures")
 
-local assetHelper = asset.require("util/asset_helper")
 asset.require("scene/digitaluniverse/2dF")
 asset.require("scene/digitaluniverse/2mass")
 asset.require("scene/digitaluniverse/6dF")

data/assets/base_blank.asset

@@ -1,6 +1,5 @@
 -- This is a blank scene that that just sets up the default menus/dasboard/keys, etc.
 
-local assetHelper = asset.require("util/asset_helper")
 local propertyHelper = asset.require("util/property_helper")
 
 -- Specifying which other assets should be loaded in this scene
@@ -59,9 +58,9 @@ asset.onInitialize(function ()
 end)
 
 asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_trails.Identifier)
+  openspace.action.removeAction(toggle_trails)
   openspace.clearKey(toggle_trails.Key)
 
-  openspace.action.removeAction(toggle_planet_labels.Identifier)
+  openspace.action.removeAction(toggle_planet_labels)
   openspace.clearKey(toggle_planet_labels.Key)
 end)

data/assets/dashboard/date.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - Date",

data/assets/dashboard/distance.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - Distance",

data/assets/dashboard/framerate.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - Framerate",

data/assets/dashboard/globelocation.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - GlobeLocation",

data/assets/dashboard/parallelconnection.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - ParallelConnection",

data/assets/dashboard/simulationincrement.asset

@@ -9,9 +9,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - Simulation Increment",

data/assets/dashboard/velocity.asset

@@ -10,9 +10,11 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.dashboard.removeDashboardItem(item.Identifier)
+  openspace.dashboard.removeDashboardItem(item)
 end)
 
+asset.export(item)
+
 
 asset.meta = {
   Name = "Dashboard - Velocity",

data/assets/examples/animation.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -181,13 +180,28 @@ local animationBounce = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  animationLoop,
-  animationLoopInf,
-  animationOnce,
-  animationBounceInf,
-  animationBounce
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(animationLoop)
+  openspace.addSceneGraphNode(animationLoopInf)
+  openspace.addSceneGraphNode(animationOnce)
+  openspace.addSceneGraphNode(animationBounceInf)
+  openspace.addSceneGraphNode(animationBounce)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(animationBounce)
+  openspace.removeSceneGraphNode(animationBounceInf)
+  openspace.removeSceneGraphNode(animationOnce)
+  openspace.removeSceneGraphNode(animationLoopInf)
+  openspace.removeSceneGraphNode(animationLoop)
+end)
+
+
+asset.export(animationLoop)
+asset.export(animationLoopInf)
+asset.export(animationOnce)
+asset.export(animationBounceInf)
+asset.export(animationBounce)
 
 -- Asset
 asset.meta = {
@@ -196,17 +210,11 @@ asset.meta = {
   Description = "Simple animation example asset with an animated box model",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
-  License = "MIT license",
-  Identifiers = {
-    "animationLoop",
-    "animationLoopInf",
-    "animationOnce",
-    "animationBounceInf",
-    "animationBounce"
-  }
+  License = "MIT license"
 }
 
 -- Model
+-- @TODO: At the moment, this overwrites the previous meta description. Probably needs a way to specify multiple meta's per file?
 asset.meta = {
   Name = "Animated Box Model",
   Version = "1.0",
@@ -216,12 +224,5 @@ asset.meta = {
   License = [[
     Creative Commons Attribution 4.0 International License,
     https://creativecommons.org/licenses/by/4.0/
-  ]],
-  Identifiers = {
-    "animationLoop",
-    "animationLoopInf",
-    "animationOnce",
-    "animationBounceInf",
-    "animationBounce"
-  }
+  ]]
 }

data/assets/examples/approachevents.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -63,6 +62,6 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.removeSceneGraphNode(obj.Identifier)
-  openspace.action.removeAction(generic_action.Identifier)
+  openspace.removeSceneGraphNode(obj)
+  openspace.action.removeAction(generic_action)
 end)

data/assets/examples/dashboarditems.asset

@@ -1,50 +1,84 @@
-local assetHelper = asset.require("util/asset_helper")
+local angle = {
+  Type = "DashboardItemAngle",
+  Identifier = "Angle",
+  GuiName = "Angle",
+  ReferenceType = "Node",
+  ReferenceNodeName = "Earth",
+  DestinationType = "Node",
+  DestinationNodeName = "Moon"
+}
 
-assetHelper.registerDashboardItems(asset, {
-  {
-    Type = "DashboardItemAngle",
-    Identifier = "Angle",
-    GuiName = "Angle",
-    ReferenceType = "Node",
-    ReferenceNodeName = "Earth",
-    DestinationType = "Node",
-    DestinationNodeName = "Moon"
-  },
-  {
-    Type = "DashboardItemDate",
-    Identifier = "Date",
-    GuiName = "Date"
-  },
-  {
-    Type = "DashboardItemSimulationIncrement",
-    Identifier = "SimulationIncrement",
-    GuiName = "Simulation Increment"
-  },
-  {
-    Type = "DashboardItemDistance",
-    Identifier = "Distance",
-    GuiName = "Distance"
-  },
-  {
-    Type = "DashboardItemFramerate",
-    Identifier = "Framerate",
-    GuiName = "Framerate"
-  },
-  {
-    Type = "DashboardItemParallelConnection",
-    Identifier = "ParallelConnection",
-    GuiName = "Parallel Connection"
-  },
-  {
-    Type = "DashboardItemMission",
-    Identifier = "Mission",
-    GuiName = "Mission"
-  },
-  {
-    Type = "DashboardItemPropertyValue",
-    Identifier = "asd",
-    GuiName = "adasd",
-    URI = "Scene.Earth.Renderable.Enabled",
-    DisplayString = "Earth is enabled: {}"
-  }
-})
+local date = {
+  Type = "DashboardItemDate",
+  Identifier = "Date",
+  GuiName = "Date"
+}
+
+local simulation_increment = {
+  Type = "DashboardItemSimulationIncrement",
+  Identifier = "SimulationIncrement",
+  GuiName = "Simulation Increment"
+}
+
+local distance = {
+  Type = "DashboardItemDistance",
+  Identifier = "Distance",
+  GuiName = "Distance"
+}
+
+local framerate = {
+  Type = "DashboardItemFramerate",
+  Identifier = "Framerate",
+  GuiName = "Framerate"
+}
+
+local parallel_connection = {
+  Type = "DashboardItemParallelConnection",
+  Identifier = "ParallelConnection",
+  GuiName = "Parallel Connection"
+}
+
+local mission = {
+  Type = "DashboardItemMission",
+  Identifier = "Mission",
+  GuiName = "Mission"
+}
+
+local property_value = {
+  Type = "DashboardItemPropertyValue",
+  Identifier = "asd",
+  GuiName = "adasd",
+  URI = "Scene.Earth.Renderable.Enabled",
+  DisplayString = "Earth is enabled: {}"
+}
+
+asset.onInitialize(function() 
+  openspace.dashboard.addDashboardItem(angle)
+  openspace.dashboard.addDashboardItem(date)
+  openspace.dashboard.addDashboardItem(simulation_increment)
+  openspace.dashboard.addDashboardItem(distance)
+  openspace.dashboard.addDashboardItem(framerate)
+  openspace.dashboard.addDashboardItem(parallel_connection)
+  openspace.dashboard.addDashboardItem(mission)
+  openspace.dashboard.addDashboardItem(property_value)
+end)
+
+asset.onDeinitialize(function()
+  openspace.dashboard.removeDashboardItem(property_value)
+  openspace.dashboard.removeDashboardItem(mission)
+  openspace.dashboard.removeDashboardItem(parallel_connection)
+  openspace.dashboard.removeDashboardItem(framerate)
+  openspace.dashboard.removeDashboardItem(distance)
+  openspace.dashboard.removeDashboardItem(simulation_increment)
+  openspace.dashboard.removeDashboardItem(date)
+  openspace.dashboard.removeDashboardItem(angle)
+end)
+
+asset.export(property_value)
+asset.export(mission)
+asset.export(parallel_connection)
+asset.export(framerate)
+asset.export(distance)
+asset.export(simulation_increment)
+asset.export(date)
+asset.export(angle)

data/assets/examples/discs.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
 -- @TODO (emmbr 2020-02-03) Potential threading issue later on? This will run on the main thread
 local cyanTexture = openspace.createSingleColorImage("example_disc_color1", { 0.0, 1.0, 1.0 })
 local purpleTexture = openspace.createSingleColorImage("example_disc_color2", { 0.5, 0.0, 0.5 })
@@ -40,7 +38,16 @@ local FullEllipticDisc = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  BasicDisc,
-  FullEllipticDisc
-})
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(BasicDisc)
+  openspace.addSceneGraphNode(FullEllipticDisc)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(FullEllipticDisc)
+  openspace.removeSceneGraphNode(BasicDisc)
+end)
+
+asset.export(BasicDisc)
+asset.export(FullEllipticDisc)

data/assets/examples/globerotation.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
@@ -44,4 +43,12 @@ local Example_GlobeRotation = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Example_GlobeRotation })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example_GlobeRotation)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example_GlobeRotation)
+end)
+
+asset.export(Example_GlobeRotation)

data/assets/examples/globetranslation.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
@@ -53,7 +52,15 @@ local Example_Adaptive_Height = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  Example_Fixed_Height,
-  Example_Adaptive_Height
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Example_Fixed_Height)
+  openspace.addSceneGraphNode(Example_Adaptive_Height)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Example_Adaptive_Height)
+  openspace.removeSceneGraphNode(Example_Fixed_Height)
+end)
+
+asset.export(Example_Fixed_Height)
+asset.export(Example_Adaptive_Height)

data/assets/examples/grids.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper)
-
 local scale = 149597870700 -- 1 AU
 
 local radialGrid = {
@@ -90,9 +88,21 @@ local boxGrid = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  radialGrid,
-  planarGrid,
-  sphericalGrid,
-  boxGrid
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(radialGrid)
+  openspace.addSceneGraphNode(planarGrid)
+  openspace.addSceneGraphNode(sphericalGrid)
+  openspace.addSceneGraphNode(boxGrid)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(boxGrid)
+  openspace.removeSceneGraphNode(sphericalGrid)
+  openspace.removeSceneGraphNode(planarGrid)
+  openspace.removeSceneGraphNode(radialGrid)
+end)
+  
+asset.export(radialGrid)
+asset.export(sphericalGrid)
+asset.export(planarGrid)
+asset.export(boxGrid)

data/assets/examples/luastatemachine.asset

@@ -33,14 +33,14 @@ function previous()
   stateMachine.goToPreviousState()
 end
 
-asset.onInitialize(function ()
+asset.onInitialize(function()
   stateMachine = stateMachineHelper.createStateMachine(states)
   openspace.bindKey("RIGHT", "next()")
   openspace.bindKey("LEFT", "previous()")
 end)
 
 
-asset.onDeinitialize(function ()
+asset.onDeinitialize(function()
   stateMachine = nil
   openspace.clearKey("RIGHT")
   openspace.clearKey("LEFT")

data/assets/examples/modelshader/modelshader.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -42,4 +41,12 @@ local model = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { model })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(model)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(model)
+end)
+  
+asset.export(model)

data/assets/examples/primitives.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
 local scale = 149597870700 -- 1 AU
 
 local circle = {
@@ -46,7 +44,15 @@ local ellipse = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  circle,
-  ellipse
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(circle)
+  openspace.addSceneGraphNode(ellipse)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(ellipse)
+  openspace.removeSceneGraphNode(circle)
+end)
+  
+asset.export(circle)
+asset.export(ellipse)

data/assets/examples/renderableplaneimageonline.asset

@@ -1,6 +1,5 @@
 -- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SPOUT enabled
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
@@ -22,5 +21,12 @@ local RenderablePlaneImageOnline = {
 
 
 
-local objects = { RenderablePlaneImageOnline }
-assetHelper.registerSceneGraphNodesAndExport(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(RenderablePlaneImageOnline)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(RenderablePlaneImageOnline)
+end)
+  
+asset.export(RenderablePlaneImageOnline)

data/assets/examples/screenspacebrowser.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
 local spec = {
   Type = "ScreenSpaceBrowser",
   Identifier = "ScreenSpaceBrowserExample",
@@ -7,4 +5,12 @@ local spec = {
   Url = "https://www.openspaceproject.com/"
 };
 
-assetHelper.registerScreenSpaceRenderables(asset, { spec })
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable(spec)
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeScreenSpaceRenderable(spec)
+end)
+
+asset.export(spec)

data/assets/examples/screenspacespout.asset

@@ -1,6 +1,5 @@
 -- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SPOUT enabled
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
@@ -21,5 +20,12 @@ local Spout = {
 
 
 
-local objects = { Spout }
-assetHelper.registerSceneGraphNodesAndExport(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Spout)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Spout)
+end)
+  
+asset.export(Spout)

data/assets/examples/spheres.asset

@@ -1,4 +1,4 @@
-local assetHelper = asset.require("util/asset_helper")
+local spheres = {}
 
 local i = 1
 for z=1,3 do
@@ -9,7 +9,7 @@ for z=1,3 do
         Transform = {
           Translation = {
             Type = "StaticTranslation",
-            Position = {x, y, z}
+            Position = { x, y, z }
           }
         },
         Renderable = {
@@ -26,8 +26,27 @@ for z=1,3 do
           Path = "/Other/Spheres"
         }
       }
-      assetHelper.registerSceneGraphNodesAndExport(asset, { sphere })
+
+      table.insert(spheres, sphere)
       i = i + 1
     end
   end
 end
+
+
+asset.onInitialize(function()
+  for _, n in ipairs(spheres) do
+    openspace.addSceneGraphNode(n)
+  end
+end)
+  
+asset.onDeinitialize(function()
+  for _, n in ipairs(spheres) do
+    openspace.removeSceneGraphNode(n)
+  end
+end)
+
+
+for _, n in ipairs(spheres) do
+  asset.export(n)
+end

data/assets/examples/temperature_land_highres.asset

@@ -40,11 +40,16 @@ local layer_folder = {
   Description = [[ Temporal coverage: 01 Jan 1981 - 31 Dec 2020.]]
 }
 
-asset.onInitialize(function () 
+asset.onInitialize(function() 
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_prototype)
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_folder)
 end)
 
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer_folder)
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer_prototype)
+end)
+
 asset.export("layer", layer_prototype)
 
 asset.meta = {

data/assets/examples/urlsynchronization.asset

@@ -1,7 +1,5 @@
 -- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SYNC enabled
 
-local assetHelper = asset.require("util/asset_helper")
-
 asset.syncedResource({
   Name = "Example Single",
   Type = "UrlSynchronization",

data/assets/examples/volume/generated/cartesian.asset

@@ -4,7 +4,6 @@
 -- the volume data itself needs to be generated,
 -- using the task 'data/tasks/volume/generate_cartesian.task'
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local sunRadius = 695508000
@@ -34,5 +33,12 @@ local volume = {
     }
 }
 
-local objects = { volume }
-assetHelper.registerSceneGraphNodes(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(volume)
+end)
+    
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(volume)
+end)
+    
+asset.export(volume)

data/assets/examples/volume/generated/cartesiansequence.asset

@@ -4,35 +4,41 @@
 -- the volume data itself needs to be generated,
 -- using the task 'data/tasks/volume/generate_cartesian_sequence.task'
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local sunRadius = 695508000
 
 local volume = {
-    Identifier = "GeneratedVolume",
-    Parent = transforms.SolarSystemBarycenter.Identifier,
-    Renderable = {
-        Type = "RenderableTimeVaryingVolume",
-        SourceDirectory = asset.localResource("cartesiansequence"),
-        TransferFunction = asset.localResource("../transferfunction.txt"),
-        StepSize = 0.01,
-        MinValue = 0,
-        MaxValue = 1,
-        GridType = "Cartesian",
-        SecondsBefore = 50*365*24*60*60, -- 50 years before
-        SecondsAfter = 50*365*24*60*60 -- 50 years after
-    },
-    GUI = {
-        Path = "/Examples"
-    },
-    Transform = {
-        Scale = {
-            Type = "StaticScale",
-            Scale = 1000 * sunRadius
-        }
+  Identifier = "GeneratedVolume",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTimeVaryingVolume",
+    SourceDirectory = asset.localResource("cartesiansequence"),
+    TransferFunction = asset.localResource("../transferfunction.txt"),
+    StepSize = 0.01,
+    MinValue = 0,
+    MaxValue = 1,
+    GridType = "Cartesian",
+    SecondsBefore = 50*365*24*60*60, -- 50 years before
+    SecondsAfter = 50*365*24*60*60 -- 50 years after
+  },
+  GUI = {
+    Path = "/Examples"
+  },
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = 1000 * sunRadius
     }
+  }
 }
 
-local objects = { volume }
-assetHelper.registerSceneGraphNodes(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(volume)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(volume)
+end)
+
+asset.export(volume)

data/assets/examples/volume/generated/spherical.asset

@@ -4,35 +4,41 @@
 -- the volume data itself needs to be generated,
 -- using the task 'data/tasks/volume/generate_spherical.task'
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local astronomicalUnit = 149597870700
 
 local volume = {
-    Identifier = "GeneratedVolume",
-    Parent = transforms.SolarSystemBarycenter.Identifier,
-    Renderable = {
-        Type = "RenderableTimeVaryingVolume",
-        SourceDirectory = asset.localResource("spherical"),
-        TransferFunction = asset.localResource("../transferfunction.txt"),
-        StepSize = 0.01,
-        MinValue = 0,
-        MaxValue = 1,
-        GridType = "Spherical",
-        SecondsBefore = 50*365*24*60*60, -- 50 years before
-        SecondsAfter = 50*365*24*60*60 -- 50 years after
-    },
-    GUI = {
-        Path = "/Examples"
-    },
-    Transform = {
-        Scale = {
-            Type = "StaticScale",
-            Scale = astronomicalUnit
-        }
+  Identifier = "GeneratedVolume",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTimeVaryingVolume",
+    SourceDirectory = asset.localResource("spherical"),
+    TransferFunction = asset.localResource("../transferfunction.txt"),
+    StepSize = 0.01,
+    MinValue = 0,
+    MaxValue = 1,
+    GridType = "Spherical",
+    SecondsBefore = 50*365*24*60*60, -- 50 years before
+    SecondsAfter = 50*365*24*60*60 -- 50 years after
+  },
+  GUI = {
+    Path = "/Examples"
+  },
+  Transform = {
+    Scale = {
+      Type = "StaticScale",
+      Scale = astronomicalUnit
     }
+  }
 }
 
-local objects = { volume }
-assetHelper.registerSceneGraphNodes(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(volume)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(volume)
+end)
+
+asset.export(volume)

data/assets/examples/volume/toyvolume.asset

@@ -1,6 +1,5 @@
 -- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_TOYVOLUME enabled
 
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local ToyVolume = {
@@ -18,5 +17,12 @@ local ToyVolume = {
   }
 }
 
-local objects = { ToyVolume }
-assetHelper.registerSceneGraphNodesAndExport(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(ToyVolume)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(ToyVolume)
+end)
+  
+asset.export(ToyVolume)

data/assets/global/localbookmarks.asset

@@ -1,5 +1,20 @@
-local assetHelper = asset.require("util/asset_helper")
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
 local nodes = bookmarkHelper.getBookmarks("Local Bookmarks", "${ASSETS}/customization/localbookmarks.csv")
-assetHelper.registerSceneGraphNodesAndExport(asset, nodes);
+
+
+asset.onInitialize(function()
+  for _, n in ipairs(nodes) do
+    openspace.addSceneGraphNode(n)
+  end
+end)
+  
+asset.onDeinitialize(function()
+  for _, n in ipairs(nodes) do
+    openspace.removeSceneGraphNode(n)
+  end
+end)
+  
+for _, n in ipairs(nodes) do
+  asset.export(n)
+end

data/assets/global/openspacebookmarks.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local bookmarkHelper = asset.require("util/generate_bookmarks")
 
 local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v1/bookmarks.csv"
@@ -23,6 +22,10 @@ end)
 
 asset.onDeinitialize(function ()
   for _, n in ipairs(nodes) do
-    openspace.removeSceneGraphNode(n.Identifier);
+    openspace.removeSceneGraphNode(n);
   end
 end)
+
+for _, n in ipairs(nodes) do
+  asset.export(n);
+end

data/assets/gui/images.asset

@@ -1,7 +1,5 @@
 -- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SYNC enabled
 
-local assetHelper = asset.require("util/asset_helper")
-
 asset.syncedResource({
   Type = "UrlSynchronization",
   Name = "Icons",

data/assets/scene/digitaluniverse/2dF.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "2dF Textures",
   Type = "HttpSynchronization",
@@ -53,7 +49,17 @@ local object = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/2mass.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "2MASS Textures",
   Type = "HttpSynchronization",
@@ -49,7 +45,16 @@ local object = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/6dF.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "6dF Textures",
   Type = "HttpSynchronization",
@@ -51,7 +47,16 @@ local object = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/abell.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Abell Textures",
   Type = "HttpSynchronization",
@@ -60,7 +56,16 @@ local object = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/alternatestarlabels.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Alternate Star Labels Speck Files",
   Type = "HttpSynchronization",
@@ -37,6 +33,18 @@ local object = {
 }
 
 
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
+
+
 asset.meta = {
   Name = "Stars Labels - Alternate",
   Version = "1.1",
@@ -45,5 +53,3 @@ asset.meta = {
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
 }
-
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/digitaluniverse/backgroundradiation.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Background Radiation Speck Files",
   Type = "HttpSynchronization",
@@ -123,9 +119,25 @@ local Halpha = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  wmap, cbe, planck, Halpha
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(wmap)
+  openspace.addSceneGraphNode(cbe)
+  openspace.addSceneGraphNode(planck)
+  openspace.addSceneGraphNode(Halpha)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Halpha)
+  openspace.removeSceneGraphNode(planck)
+  openspace.removeSceneGraphNode(cbe)
+  openspace.removeSceneGraphNode(wmap)
+end)
+  
+asset.export(wmap)
+asset.export(cbe)
+asset.export(planck)
+asset.export(Halpha)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Background Radiation Textures",
   Type = "HttpSynchronization",
@@ -130,9 +126,25 @@ local multiverse_planck_4 = {
 }
 
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(multiverse_planck_1)
+  openspace.addSceneGraphNode(multiverse_planck_2)
+  openspace.addSceneGraphNode(multiverse_planck_3)
+  openspace.addSceneGraphNode(multiverse_planck_4)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(multiverse_planck_4)
+  openspace.removeSceneGraphNode(multiverse_planck_3)
+  openspace.removeSceneGraphNode(multiverse_planck_2)
+  openspace.removeSceneGraphNode(multiverse_planck_1)
+end)
+  
+asset.export(multiverse_planck_1)
+asset.export(multiverse_planck_2)
+asset.export(multiverse_planck_3)
+asset.export(multiverse_planck_4)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/clusters.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Clusters Speck Files",
   Type = "HttpSynchronization",
@@ -40,7 +36,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/constellationbounds.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local data = asset.syncedResource({
   Name = "Constellation Bounds Data",
   Type = "HttpSynchronization",
@@ -42,7 +38,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/constellations.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Constellation Speck Files",
   Type = "HttpSynchronization",
@@ -60,7 +56,19 @@ local constellations = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalactic, constellations })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(constellationsExtragalactic)
+  openspace.addSceneGraphNode(constellations)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(constellations)
+  openspace.removeSceneGraphNode(constellationsExtragalactic)
+end)
+  
+asset.export(constellationsExtragalactic)
+asset.export(constellations)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/deepsky.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
 local textures = asset.syncedResource({
   Name = "Deep Sky Objects Textures",
   Type = "HttpSynchronization",
@@ -92,7 +90,19 @@ local deepSkyImages = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImages })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(deepSkyPoints)
+  openspace.addSceneGraphNode(deepSkyImages)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(deepSkyImages)
+  openspace.removeSceneGraphNode(deepSkyPoints)
+end)
+  
+asset.export(deepSkyPoints)
+asset.export(deepSkyImages)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/dwarfs.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Brown Dwarf Textures",
   Type = "HttpSynchronization",
@@ -62,7 +58,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/exoplanets.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Exoplanets Textures",
   Type = "HttpSynchronization",
@@ -50,7 +46,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/globularclusters.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Globular Clusters Textures",
   Type = "HttpSynchronization",
@@ -54,7 +50,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/grids.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -513,11 +512,30 @@ local plane20Gly = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  radio, oort, ecliptic, eclipticLabels, equatorial, equatorialLabels, galactic,
-  galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly,
-  plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly
-})
+local nodes = {
+  radio, oort, ecliptic, eclipticLabels, equatorial, equatorialLabels,
+  galactic, galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly,
+  plane100ly, plane1kly, plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly,
+  plane20Gly
+}
+
+asset.onInitialize(function()
+  for i, node in ipairs(nodes) do
+    openspace.addSceneGraphNode(node)
+  end
+end)
+  
+asset.onDeinitialize(function()
+  for i = #nodes, 1, -1 do
+    local node = nodes[i]
+    openspace.removeSceneGraphNode(node)
+  end
+end)
+
+for i, node in ipairs(nodes) do
+  asset.export(node)
+end
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/groups.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Galaxy Groups Speck Files",
   Type = "HttpSynchronization",
@@ -40,7 +36,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/h2regions.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "HII Regions Textures",
   Type = "HttpSynchronization",
@@ -52,7 +48,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/hdf.asset

@@ -1,5 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
 local circle = asset.syncedResource({
   Name = "Circle",
   Type = "HttpSynchronization",
@@ -48,7 +46,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 asset.meta = {
   Name = "Hubble Ultra Deep Field",

data/assets/scene/digitaluniverse/kepler.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
     Name = "Kepler Textures",
     Type = "HttpSynchronization",
@@ -48,7 +44,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/localdwarfs.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Local Dwarfs Textures",
   Type = "HttpSynchronization",
@@ -54,7 +50,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/milkyway.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local planeTextures = asset.syncedResource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
@@ -47,7 +43,16 @@ local plane = {
     }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { plane })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(plane)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(plane)
+end)
+  
+asset.export(plane)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/milkyway_arm_labels.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local planeTextures = asset.syncedResource({
   Name = "Milky Way Plane Textures",
   Type = "HttpSynchronization",
@@ -44,7 +40,16 @@ local plane = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { plane })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(plane)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(plane)
+end)
+  
+asset.export(plane)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/milkyway_label.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local homespeck = asset.syncedResource({
   Name = "Home Speck File",
   Type = "HttpSynchronization",
@@ -40,7 +36,16 @@ local homeLabel = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(homeLabel)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(homeLabel)
+end)
+  
+asset.export(homeLabel)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/milkyway_sphere.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local sphereTextures = asset.syncedResource({
   Name = "Milky Way Sphere Textures",
   Type = "HttpSynchronization",
@@ -38,7 +34,16 @@ local sphere = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { sphere })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(sphere)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(sphere)
+end)
+  
+asset.export(sphere)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/obassociations.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "OB Associations Textures",
   Type = "HttpSynchronization",
@@ -56,7 +52,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/openclusters.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Open Clusters Textures",
   Type = "HttpSynchronization",
@@ -52,7 +48,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/planetarynebulae.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Planetary Nebulae Textures",
   Type = "HttpSynchronization",
@@ -49,7 +45,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/pulsars.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Pulsars Textures",
   Type = "HttpSynchronization",
@@ -53,7 +49,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/quasars.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Quasars Textures",
   Type = "HttpSynchronization",
@@ -45,7 +41,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/sdss.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Sloan Digital Sky Survey Textures",
   Type = "HttpSynchronization",
@@ -59,7 +55,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/starlabels.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Star Labels Speck Files",
   Type = "HttpSynchronization",
@@ -30,7 +26,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/starorbits.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -163,10 +162,28 @@ local pM_J13420Orbit = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
+local nodes = {
   sunOrbit, barnardsOrbit, pM_J13420Orbit, lSRJ0822Orbit, lSR1826Orbit,
   lacaille9352Orbit, kapteynsOrbit
-})
+}
+
+asset.onInitialize(function()
+  for i, node in ipairs(nodes) do
+    openspace.addSceneGraphNode(node)
+  end
+end)
+  
+asset.onDeinitialize(function()
+  for i = #nodes, 1, -1 do
+    local node = nodes[i]
+    openspace.removeSceneGraphNode(node)
+  end
+end)
+
+for i, node in ipairs(nodes) do
+  asset.export(node)
+end
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/stars.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Stars Speck Files",
   Type = "HttpSynchronization",
@@ -98,7 +94,19 @@ local sunstar = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(stars)
+  openspace.addSceneGraphNode(sunstar)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(sunstar)
+  openspace.removeSceneGraphNode(stars)
+end)
+  
+asset.export(stars)
+asset.export(sunstar)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/superclusters.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Galaxy Superclusters Textures",
   Type = "HttpSynchronization",
@@ -48,7 +44,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/supernovaremnants.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Supernova Remnants Textures",
   Type = "HttpSynchronization",
@@ -48,7 +44,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/tully.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Tully Textures",
   Type = "HttpSynchronization",
@@ -110,7 +106,19 @@ local tullyImages = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(tullyPoints)
+  openspace.addSceneGraphNode(tullyImages)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(tullyImages)
+  openspace.removeSceneGraphNode(tullyPoints)
+end)
+  
+asset.export(tullyPoints)
+asset.export(tullyImages)
+
 
 
 asset.meta = {

data/assets/scene/digitaluniverse/voids.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Voids Speck Files",
   Type = "HttpSynchronization",
@@ -40,7 +36,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/constellations/constellation_art.asset

@@ -138,7 +138,6 @@ local hide_zodiac_art = {
 asset.export("HideZodiacArt", hide_zodiac_art)
 
 local nodes = {}
-local assetRef = asset
 
 asset.onInitialize(function ()
   local constellationsCSV = images .. "constellation_data.csv"
@@ -146,7 +145,6 @@ asset.onInitialize(function ()
   nodes = createConstellations("ConstellationArt", "Constellation Art", constellationsCSV)
   for _, n in ipairs(nodes) do
     openspace.addSceneGraphNode(n);
-    assetRef.registerIdentifierWithMeta(n.Identifier)
   end
 
   openspace.action.registerAction(show_art)
@@ -159,11 +157,14 @@ asset.onDeinitialize(function ()
     openspace.removeSceneGraphNode(n.Identifier);
   end
 
-  openspace.action.removeAction(show_art.Identifier)
-  openspace.action.removeAction(hide_art.Identifier)
-  openspace.action.removeAction(disable_art.Identifier)
+  openspace.action.removeAction(show_art)
+  openspace.action.removeAction(hide_art)
+  openspace.action.removeAction(disable_art)
 end)
 
+for _, n in ipairs(nodes) do
+  asset.export(n)
+end
 
 asset.meta = {
   Name = "Constellation Images",

data/assets/scene/milkyway/gaia/apogee.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Apogee Speck Files",
   Type = "HttpSynchronization",
@@ -58,7 +54,16 @@ local gaia_abundance_apogee = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_apogee })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(gaia_abundance_apogee)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(gaia_abundance_apogee)
+end)
+  
+asset.export(gaia_abundance_apogee)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/gaia/gaiastars.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 -- Download a preprocessed binary octree of Radial Velocity subset values per star (preprocessed into 8 binary files).
 local starsFolder = asset.syncedResource({
   Name = "Gaia Stars RV",
@@ -60,7 +56,16 @@ local GaiaStars = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { GaiaStars })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(GaiaStars)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(GaiaStars)
+end)
+  
+asset.export(GaiaStars)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/gaia/galah.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local speck = asset.syncedResource({
   Name = "Galah Speck Files",
   Type = "HttpSynchronization",
@@ -58,7 +54,16 @@ local gaia_abundance_galah = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { gaia_abundance_galah })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(gaia_abundance_galah)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(gaia_abundance_galah)
+end)
+  
+asset.export(gaia_abundance_galah)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/milkyway/eso.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "ESO Milky Way Textures",
   Type = "HttpSynchronization",
@@ -36,7 +32,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 

data/assets/scene/milkyway/milkyway/volume.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
@@ -52,8 +51,16 @@ local MilkyWayVolumeGalaxy = {
   }
 }
 
-local objects = { MilkyWayVolumeGalaxy }
-assetHelper.registerSceneGraphNodesAndExport(asset, objects)
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(MilkyWayVolumeGalaxy)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(MilkyWayVolumeGalaxy)
+end)
+  
+asset.export(MilkyWayVolumeGalaxy)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/objects/orionnebula/cluster.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("./transforms")
 
 
@@ -51,7 +50,16 @@ local OrionClusterStars = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(OrionClusterStars)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(OrionClusterStars)
+end)
+  
+asset.export(OrionClusterStars)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/objects/orionnebula/nebula.asset

@@ -1,9 +1,19 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local transforms = asset.require("./transforms")
 
-local center = sunTransforms.SolarSystemBarycenter.Identifier;
-local LIGHTS = assetHelper.getDefaultLightSources(center);
+local LIGHTS = {
+  {
+    Type = "SceneGraphLightSource",
+    Identifier = "Sun",
+    Node = sunTransforms.SolarSystemBarycenter.Identifier,
+    Intensity = 1.0
+  },
+  {
+    Identifier = "Camera",
+    Type = "CameraLightSource",
+    Intensity = 0.5
+  }
+}
 
 local sync = asset.syncedResource({
   Name = "Orion Nebula Model",
@@ -134,12 +144,25 @@ local OrionNebulaProplydsModel = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {
-  NebulaHolder,
-  OrionNebulaModel,
-  OrionNebulaShocksModel,
-  OrionNebulaProplydsModel
-})
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(NebulaHolder)
+  openspace.addSceneGraphNode(OrionNebulaModel)
+  openspace.addSceneGraphNode(OrionNebulaShocksModel)
+  openspace.addSceneGraphNode(OrionNebulaProplydsModel)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(OrionNebulaProplydsModel)
+  openspace.removeSceneGraphNode(OrionNebulaShocksModel)
+  openspace.removeSceneGraphNode(OrionNebulaModel)
+  openspace.removeSceneGraphNode(NebulaHolder)
+end)
+  
+asset.export(NebulaHolder)
+asset.export(OrionNebulaModel)
+asset.export(OrionNebulaShocksModel)
+asset.export(OrionNebulaProplydsModel)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/objects/orionnebula/transforms.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
 local PARSEC_CONSTANT = 3.0856776E16;
@@ -24,7 +23,16 @@ local NebulaPosition = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { NebulaPosition })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(NebulaPosition)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(NebulaPosition)
+end)
+  
+asset.export(NebulaPosition)
+
 
 
 asset.meta = {

data/assets/scene/milkyway/stars/denver.asset

@@ -1,7 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
-
-
-
 local textures = asset.syncedResource({
   Name = "Stars Textures",
   Type = "HttpSynchronization",
@@ -50,7 +46,16 @@ local object = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(object)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(object)
+end)
+  
+asset.export(object)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 asset.require("../trail")
@@ -51,7 +50,16 @@ local Charon = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Charon })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Charon)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(Charon)
+end)
+  
+asset.export(Charon)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 
@@ -29,7 +28,16 @@ local CharonTrailBarycentric = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(CharonTrailBarycentric)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(CharonTrailBarycentric)
+end)
+  
+asset.export(CharonTrailBarycentric)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset

@@ -10,6 +10,10 @@ asset.onInitialize(function ()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
 end)
 
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
 
 

data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset

@@ -10,6 +10,10 @@ asset.onInitialize(function ()
   openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
 end)
 
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)
 
 
@@ -20,10 +24,10 @@ asset.meta = {
     nearly all of the highest-resolution images obtained by the Long-Range
     Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC)
     on New Horizons.The mosaic is the most detailed and comprehensive global view yet
-    of Pluto’s surface using New Horizons data. It includes topography data of the
-    hemisphere visible to New Horizons during the spacecraft’s closest approach. The
+    of Pluto's surface using New Horizons data. It includes topography data of the
+    hemisphere visible to New Horizons during the spacecraft's closest approach. The
     topography is derived from digital stereo-image mapping tools that measure the
-    parallax – or the difference in the apparent relative positions – of features on
+    parallax - or the difference in the apparent relative positions - of features on
     the surface obtained at different viewing angles during the encounter. Scientists
     use these parallax displacements of high and low terrain to estimate landform
     heights.The mosaic is available in Equirectangular projection at an equatorial 

data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels").PlutoKernels
 
@@ -53,7 +52,19 @@ local HydraTrail = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Hydra)
+  openspace.addSceneGraphNode(HydraTrail)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(HydraTrail)
+  openspace.removeSceneGraphNode(Hydra)
+end)
+  
+asset.export(Hydra)
+asset.export(HydraTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels").PlutoKernels
 
@@ -52,7 +51,19 @@ local KerberosTrail = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Kerberos)
+  openspace.addSceneGraphNode(KerberosTrail)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(KerberosTrail)
+  openspace.removeSceneGraphNode(Kerberos)
+end)
+  
+asset.export(Kerberos)
+asset.export(KerberosTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels").PlutoKernels
 
@@ -52,7 +51,19 @@ local NixTrail = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Nix)
+  openspace.addSceneGraphNode(NixTrail)
+end)
+    
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(NixTrail)
+  openspace.removeSceneGraphNode(Nix)
+end)
+    
+asset.export(Nix)
+asset.export(NixTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels").PlutoKernels
 
@@ -51,7 +50,19 @@ local StyxTrail = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Styx)
+  openspace.addSceneGraphNode(StyxTrail)
+end)
+    
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(StyxTrail)
+  openspace.removeSceneGraphNode(Styx)
+end)
+    
+asset.export(Styx)
+asset.export(StyxTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("./transforms")
 asset.require("spice/base")
 asset.require("./trail")
@@ -71,7 +70,19 @@ local PlutoLabel = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { Pluto, PlutoLabel })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(Pluto)
+  openspace.addSceneGraphNode(PlutoLabel)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(PlutoLabel)
+  openspace.removeSceneGraphNode(Pluto)
+end)
+  
+asset.export(Pluto)
+asset.export(PlutoLabel)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("./transforms")
 asset.require("spice/base")
 
@@ -25,7 +24,16 @@ local PlutoTrailBarycentric = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(PlutoTrailBarycentric)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(PlutoTrailBarycentric)
+end)
+  
+asset.export(PlutoTrailBarycentric)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 asset.require("spice/base")
 local kernels = asset.require("./kernels").PlutoKernels
@@ -33,7 +32,17 @@ local PlutoKeplerianTrail = {
     Description = "Keplerian trail of Pluto. Contains full orbit."
   }
 }
-assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoKeplerianTrail })
+
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(PlutoKeplerianTrail)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(PlutoKeplerianTrail)
+end)
+  
+asset.export(PlutoKeplerianTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 asset.require("spice/base")
 local kernels = asset.require("./kernels").PlutoKernels
@@ -29,7 +28,16 @@ local PlutoBarycenterTrail = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(PlutoBarycenterTrail)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(PlutoBarycenterTrail)
+end)
+  
+asset.export(PlutoBarycenterTrail)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local kernels = asset.require("./kernels").PlutoKernels
 asset.require("spice/base")
@@ -22,7 +21,16 @@ local PlutoBarycenter = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(PlutoBarycenter)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(PlutoBarycenter)
+end)
+  
+asset.export(PlutoBarycenter)
+
 
 
 asset.meta = {

data/assets/scene/solarsystem/heliosphere/bastille_day/density_volume.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local propertyHelper = asset.require("util/property_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
@@ -56,11 +55,16 @@ local toggle_volume = {
 
 asset.onInitialize(function ()
   openspace.action.registerAction(toggle_volume)
+  openspace.addSceneGraphNode(densityVolume)
 end)
+
 asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_volume.Identifier)
+  openspace.removeSceneGraphNode(densityVolume)
+  openspace.action.removeAction(toggle_volume)
 end)
-assetHelper.registerSceneGraphNodesAndExport(asset, { densityVolume })
+
+asset.export(densityVolume)
+
 
 asset.meta = {
   Name = "Predictive Science Inc. Volume Rendering Bastille Day",

data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local heliosphereTransforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
 local propertyHelper = asset.require("util/property_helper")
 local rot = asset.require("./carringtonToHEEQRotation.asset")
@@ -59,11 +58,16 @@ local toggle_fieldlines = {
 
 asset.onInitialize(function ()
   openspace.action.registerAction(toggle_fieldlines)
+  openspace.addSceneGraphNode(fieldlines)
 end)
+
 asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_fieldlines.Identifier)
+  openspace.removeSceneGraphNode(fieldlines)
+  openspace.action.removeAction(toggle_fieldlines)
 end)
-assetHelper.registerSceneGraphNodesAndExport(asset, { fieldlines })
+
+asset.export(fieldlines)
+
 
 asset.meta = {
   Name = "Predictive Science Inc. Fieldlines Bastille Day",

data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodes.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local heliosphereTransforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
 local propertyHelper = asset.require("util/property_helper")
 local rot = asset.require("./carringtonToHEEQRotation.asset")
@@ -41,11 +40,16 @@ local toggle_fluxnodes = {
 
 asset.onInitialize(function ()
   openspace.action.registerAction(toggle_fluxnodes)
+  openspace.addSceneGraphNode(fluxNodes)
 end)
+
 asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_fluxnodes.Identifier)
+  openspace.removeSceneGraphNode(fluxNodes)
+  openspace.action.removeAction(toggle_fluxnodes)
 end)
-assetHelper.registerSceneGraphNodesAndExport(asset, { fluxNodes })
+
+asset.export(fluxNodes)
+
 
 asset.meta = {
   Name = "Predictive Science Inc. Flux nodes Bastille Day",

data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodescutplane.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local propertyHelper = asset.require("util/property_helper")
 local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
 local rot = asset.require("./carringtonToHEEQRotation.asset")
@@ -84,12 +83,20 @@ local toggle_meridial = {
 asset.onInitialize(function ()
   openspace.action.registerAction(toggle_equatorial)
   openspace.action.registerAction(toggle_meridial)
+  openspace.addSceneGraphNode(EquatorialCutplane)
+  openspace.addSceneGraphNode(MeridialCutplane)
 end)
+
 asset.onDeinitialize(function ()
-  openspace.action.removeAction(toggle_equatorial.Identifier)
-  openspace.action.removeAction(toggle_meridial.Identifier)
+  openspace.removeSceneGraphNode(MeridialCutplane)
+  openspace.removeSceneGraphNode(EquatorialCutplane)
+  openspace.action.removeAction(toggle_equatorial)
+  openspace.action.removeAction(toggle_meridial)
 end)
-assetHelper.registerSceneGraphNodesAndExport(asset, { EquatorialCutplane, MeridialCutplane})
+
+asset.export(EquatorialCutplane)
+asset.export(MeridialCutplane)
+
 
 asset.meta = {
   Name = "Predictive Science Inc. Cutplanes Bastille Days",

data/assets/scene/solarsystem/heliosphere/bastille_day/fluxnodeslegend.asset

@@ -1,5 +1,4 @@
 asset.require("spice/base")
-local assetHelper = asset.require("util/asset_helper")
 
 local TexturesPath = asset.syncedResource({
   Type = "HttpSynchronization",
@@ -46,9 +45,9 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function ()
-  openspace.removeScreenSpaceRenderable(legend.Identifier)
-  openspace.action.removeAction(show_legend.Identifier)
-  openspace.action.removeAction(hide_legend.Identifier)
+  openspace.removeScreenSpaceRenderable(legend)
+  openspace.action.removeAction(show_legend)
+  openspace.action.removeAction(hide_legend)
 end)
 
 asset.meta = {

data/assets/scene/solarsystem/heliosphere/bastille_day/lightindicator.asset

@@ -1,4 +1,3 @@
-local assetHelper = asset.require("util/asset_helper")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 
@@ -27,7 +26,16 @@ local travelSpeedIndicator = {
   }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { travelSpeedIndicator })
+asset.onInitialize(function()
+  openspace.addSceneGraphNode(travelSpeedIndicator)
+end)
+  
+asset.onDeinitialize(function()
+  openspace.removeSceneGraphNode(travelSpeedIndicator)
+end)
+  
+asset.export(travelSpeedIndicator)
+
 
 asset.meta = {
   Name = "Light travel from sun to earth",