From 8bbb294eff83bb62aaebcb6a678c8ffd9938ed06 Mon Sep 17 00:00:00 2001
From: Jonathan Grangien <jonathan.grangien@gmail.com>
Date: Fri, 11 May 2018 11:51:21 -0400
Subject: [PATCH] Change MAS MHD assets

---
 data/assets/mas.scene                         | 32 ++++++++++++-------
 .../scene/solarsystem/model/mas/mas.asset     | 10 +++---
 data/tasks/mas_eclipse_conversion.task        |  1 -
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/data/assets/mas.scene b/data/assets/mas.scene
index 4b076db3ea..39aefefb95 100644
--- a/data/assets/mas.scene
+++ b/data/assets/mas.scene
@@ -17,7 +17,15 @@ asset.require('util/default_keybindings')
 
 local sunAsset = asset.require('scene/solarsystem/sun/sun')
 -- local earthAsset = asset.require('scene/solarsystem/planets/earth/earth')
-local masAsset = asset.require('scene/solarsystem/model/mas/mas')
+local masMhdAsset = asset.require('scene/solarsystem/model/mas/mas')
+
+-- This causes crash because the renderable is not removed properly before the next frame
+local toggleMas = function ()
+    return 
+        -- "openspace.removeSceneGraphNode('Mas_MHD');" ..
+        "openspace.assset.remove('Mas_MHD');" ..
+        "openspace.asset.add('Mas_MHD');"
+end
 
 local Keybindings = {
     {
@@ -39,15 +47,9 @@ local Keybindings = {
         Local = false
     },
     {
-        Key = "r",
-        Command = "openspace.setPropertyValueSingle('Scene.Mas.renderable.Enabled', false);",
-        Documentation = "Set Mas volume off",
-        Local = false
-    },
-    {
-        Key = "a",
-        Command = "openspace.setPropertyValueSingle('Scene.Mas.renderable.Enabled', true);",
-        Documentation = "Set Mas volume on",
+        Key = "t",
+        Command = toggleMas(),
+        Documentation = "Toggle mas asset on/off",
         Local = false
     }
 }
@@ -63,6 +65,10 @@ asset.onInitialize(function ()
     --     openspace.absPath("${DATA}/globebrowsing_servers.lua")
     -- )
 
+    openspace.markInterestingNodes({
+        "Mas_MHD"
+    })
+
     openspace.addVirtualProperty(
         "BoolProperty",
         "Show Trails",
@@ -74,7 +80,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = masAsset.Mas.Identifier,
+        Focus = masMhdAsset.Mas_MHD.Identifier,
         Position = { 10000000000, 10000000000, 10000000000 },
         Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
     })
@@ -84,5 +90,9 @@ end)
 asset.onDeinitialize(function ()
     sceneHelper.unbindKeys(Keybindings)
 
+    openspace.removeInterestingNodes({
+        "Mas_MHD"
+    })
+
     openspace.removeVirtualProperty("*Trail.renderable.Enabled")
 end)
diff --git a/data/assets/scene/solarsystem/model/mas/mas.asset b/data/assets/scene/solarsystem/model/mas/mas.asset
index ce4933199b..671cf39386 100644
--- a/data/assets/scene/solarsystem/model/mas/mas.asset
+++ b/data/assets/scene/solarsystem/model/mas/mas.asset
@@ -6,12 +6,12 @@ asset.require("spice/base")
 
 local sunRadius = 695508000
 
-local Mas = {  
-        Identifier = "Mas",
+local Mas_MHD = {  
+        Identifier = "Mas_MHD",
         Parent = sunTransforms.SolarSystemBarycenter.Identifier,
         Renderable = {
             Type = "RenderableTimeVaryingVolume",
-            StepSize = 0.01,
+            StepSize = 0.001,
             TransferFunction = "${DATA}/mas/mas_transfer_function.txt",
             SourceDirectory = "${DATA}/mas/raw",
             LowerValueBound = 0,
@@ -36,8 +36,8 @@ local Mas = {
         },
         GUI = {
             Path = "/Solar System/Mas",
-            Hidden = true
+            Hidden = false
         }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, {Mas})
+assetHelper.registerSceneGraphNodesAndExport(asset, { Mas_MHD })
diff --git a/data/tasks/mas_eclipse_conversion.task b/data/tasks/mas_eclipse_conversion.task
index 1115489ad6..d04e5760ce 100644
--- a/data/tasks/mas_eclipse_conversion.task
+++ b/data/tasks/mas_eclipse_conversion.task
@@ -1,4 +1,3 @@
-
 return {
     {
         Type = "KameleonVolumeToRawTask",