From bb6262a7307cf68c4bcc07d581483d32ba8d35d2 Mon Sep 17 00:00:00 2001 From: lundkvistarn Date: Thu, 14 Nov 2024 15:02:51 -0500 Subject: [PATCH] removed skycamera from storm asset --- .../planets/earth/aurorasaurus/main.asset | 8 +-- .../earth/aurorasaurus/skyCamera.asset | 16 +++--- .../planets/earth/aurorasaurus/storm.asset | 57 ------------------- 3 files changed, 13 insertions(+), 68 deletions(-) diff --git a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/main.asset b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/main.asset index 1b9664cc61..2820703e80 100644 --- a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/main.asset +++ b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/main.asset @@ -24,10 +24,10 @@ asset.require("./may2024assets/rendermodeTest/22") --asset.require("./timeline") asset.require("./actions") --asset.require("./ovalGeojson") ---asset.require("./ovalLayer") +asset.require("./ovalLayer") --asset.require("./skyCamera") ---asset.require("./northernViewline") ---asset.require("./southernViewline") ---asset.require("./mission") +asset.require("./northernViewline") +asset.require("./southernViewline") +asset.require("./mission") asset.require("./storm") \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/skyCamera.asset b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/skyCamera.asset index eec930d974..2644e77527 100644 --- a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/skyCamera.asset +++ b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/skyCamera.asset @@ -1,6 +1,7 @@ local globe = asset.require("scene/solarsystem/planets/earth/earth") local imagePath = "C:/Users/alundkvi/Downloads/mothers_day_storm_data_for_bea/mothers_day_storm_data_for_bea/grid_gillam/rgb/2024/05/11/images3/" + local Skycamera_sphere = { Identifier = "Skycamera_sphere", Parent = globe.Earth.Identifier, @@ -9,14 +10,15 @@ local Skycamera_sphere = { Renderable = { Type = "RenderableTimeVaryingSphere", Size = 6379137.0, -- Slightly bigger than the sun renderable, - Enabled = true, + Enabled = false, TextureSource = imagePath, Opacity = 1, + RenderBinMode = "PostDeferredTransparent", Segments = 532 }, GUI = { Name = "Skycamera sphere", - Path = "/test", + Path = "/Sky-Camera", Description = [[Texture sequence of an extreme ultra violet (EUV) simulation, during the CME. This asset contains data from 2000-07-14 08:38 to 2000-07-14 19:48]] } @@ -26,18 +28,18 @@ local Toggleskycamera = { Identifier = "os.solarsystem.Toggleskycamera", Name = "Toggle Sky Camera", Command = [[ - if openspace.propertyValue("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled") then + if openspace.propertyValue("Scene.Skycamera_sphere.Renderable.Enabled") then openspace.setPropertyValueSingle( - "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade", + "Scene.Skycamera_sphere.Renderable.Fade", 0.0, openspace.propertyValue("OpenSpaceEngine.FadeDuration"), "Linear", - 'openspace.setPropertyValueSingle("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled", false)' + 'openspace.setPropertyValueSingle("Scene.Skycamera_sphere.Renderable.Enabled", false)' ) else - openspace.setPropertyValueSingle("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled", true) + openspace.setPropertyValueSingle("Scene.Skycamera_sphere.Renderable.Enabled", true) openspace.setPropertyValueSingle( - "Scene.EUV-Layer-bastille-day-2000.Renderable.Fade", + "Scene.Skycamera_sphere.Renderable.Fade", 1.0, openspace.propertyValue("OpenSpaceEngine.FadeDuration"), "Linear" diff --git a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/storm.asset b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/storm.asset index 504d16ddf0..2cc962ffd6 100644 --- a/data/assets/scene/solarsystem/planets/earth/aurorasaurus/storm.asset +++ b/data/assets/scene/solarsystem/planets/earth/aurorasaurus/storm.asset @@ -38,55 +38,6 @@ local Browser = { Url = "https://iswa.ccmc.gsfc.nasa.gov/IswaSystemWebApp/?layout=SuperStormMay2024Indices" } -local Skycamera_sphere = { - Identifier = "Skycamera_sphere", - Parent = globe.Earth.Identifier, - Enabled = asset.disabled, - InteractionSphere = 6379137, - Renderable = { - Type = "RenderableTimeVaryingSphere", - Size = 6379137.0, -- Slightly bigger than the sun renderable, - Enabled = false, - TextureSource = imagePath, - Opacity = 1, - RenderBinMode = "PostDeferredTransparent", - Segments = 532 - }, - GUI = { - Name = "Skycamera sphere", - Path = "/Sky-Camera", - Description = [[Texture sequence of an extreme ultra violet (EUV) simulation, during - the CME. This asset contains data from 2000-07-14 08:38 to 2000-07-14 19:48]] - } -} - -local Toggleskycamera = { - Identifier = "os.solarsystem.Toggleskycamera", - Name = "Toggle Sky Camera", - Command = [[ - if openspace.propertyValue("Scene.Skycamera_sphere.Renderable.Enabled") then - openspace.setPropertyValueSingle( - "Scene.Skycamera_sphere.Renderable.Fade", - 0.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear", - 'openspace.setPropertyValueSingle("Scene.Skycamera_sphere.Renderable.Enabled", false)' - ) - else - openspace.setPropertyValueSingle("Scene.Skycamera_sphere.Renderable.Enabled", true) - openspace.setPropertyValueSingle( - "Scene.Skycamera_sphere.Renderable.Fade", - 1.0, - openspace.propertyValue("OpenSpaceEngine.FadeDuration"), - "Linear" - ) - end - ]], - Documentation = "Toggle Sky Camera Layer", - GuiPath = "/Sky-Camera", - IsLocal = false -} - local ToggleKPindex = { Identifier = "os.ToggleKPindex", Name = "Toggle KP index", @@ -155,12 +106,8 @@ asset.onInitialize(function() openspace.setPropertyValueSingle("ScreenSpace.target-marker.Scale", 0.130000) --openspace.addScreenSpaceRenderable(Browser) - - openspace.action.registerAction(Toggleskycamera) openspace.action.registerAction(ToggleISWACygnet) openspace.action.registerAction(ToggleKPindex) - openspace.addSceneGraphNode(Skycamera_sphere) - openspace.setPropertyValueSingle("Scene.Skycamera_sphere.Rotation.Rotation", {0.000000,0.000000,-3.140000}) end) asset.onDeinitialize(function() @@ -169,17 +116,13 @@ asset.onDeinitialize(function() openspace.addScreenSpaceRenderable(Dashboard) --openspace.removeScreenSpaceRenderable(Browser) - openspace.action.removeAction(Toggleskycamera) openspace.action.removeAction(ToggleISWACygnet) openspace.action.removeAction(ToggleKPindex) - openspace.removeSceneGraphNode(Skycamera_sphere) end) --asset.export("layer", Layer) --asset.export(Browser) asset.export(Dashboard) -asset.export("Toggleskycamera", Toggleskycamera.Identifier) asset.export("ToggleISWACygnet", ToggleISWACygnet.Identifier) asset.export("ToggleKPindex", ToggleKPindex.Identifier) -asset.export(Skycamera_sphere)