From e21948833e255847cea380ab9ee1088ef77d4572 Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Thu, 20 May 2021 16:15:46 +0200 Subject: [PATCH] Profile and asset clean up --- .../solarsystem/missions/jwst/HUDFImage.asset | 2 +- .../scene/solarsystem/missions/jwst/L1.asset | 8 ++--- .../scene/solarsystem/missions/jwst/L2.asset | 35 ++++++++++++++++--- .../scene/solarsystem/missions/jwst/L4.asset | 4 +-- .../scene/solarsystem/missions/jwst/L5.asset | 4 +-- .../solarsystem/missions/jwst/jwst.asset | 10 ++++-- data/profiles/jwst.profile | 16 +++++++++ 7 files changed, 63 insertions(+), 16 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset index d7756a86d2..a9c6cd1d3c 100644 --- a/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset +++ b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset @@ -58,7 +58,7 @@ local HUDFJWSTLine = { }, Tag = { "hudf" }, GUI = { - Name = "JWST to HUDF image line", + Name = "James Webb Space Telescope to Hubble Ultra Deep Field line", Path = "/Solar System/Missions/JWST", } } diff --git a/data/assets/scene/solarsystem/missions/jwst/L1.asset b/data/assets/scene/solarsystem/missions/jwst/L1.asset index d24db2f55a..f7be995856 100644 --- a/data/assets/scene/solarsystem/missions/jwst/L1.asset +++ b/data/assets/scene/solarsystem/missions/jwst/L1.asset @@ -28,7 +28,7 @@ local L1 = { Tag = { "lagrange_points" }, GUI = { Name = "L1", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", } } @@ -39,8 +39,8 @@ local L1Label = { Enabled = false, Type = "RenderableLabels", LabelText = "L1", - FontSize = 14, - LabelSize = 6.4, + FontSize = 20, + LabelSize = 7.5, LabelMaxSize = 100.0, LabelMinSize = 1.0, LabelOrientationOption = "Camera View Direction", @@ -50,7 +50,7 @@ local L1Label = { Tag = { "lagrange_points" }, GUI = { Name = "L1 Label", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", Description = "Main label for L1" } } diff --git a/data/assets/scene/solarsystem/missions/jwst/L2.asset b/data/assets/scene/solarsystem/missions/jwst/L2.asset index 267fd1d922..ba9c7c3af7 100644 --- a/data/assets/scene/solarsystem/missions/jwst/L2.asset +++ b/data/assets/scene/solarsystem/missions/jwst/L2.asset @@ -24,9 +24,10 @@ local L2 = { Kernels = L2Kernel } }, + Tag = { "L2" }, GUI = { Name = "L2", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", } } @@ -45,13 +46,37 @@ local L2Label = { BlendMode = "Normal", EnableFading = false }, + Tag = { "L2" }, GUI = { Name = "L2 Label", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", Description = "Main label for L2" } } +local L2BigLabel = { + Identifier = "L2BigLabel", + Parent = L2.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "L2", + FontSize = 20, + LabelSize = 7.5, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = false + }, + Tag = { "lagrange_points" }, + GUI = { + Name = "Large L2 Label", + Path = "/Solar System/Missions/JWST/Lagrange points", + Description = "Large label for L2" + } +} + local L2SunLine = { Identifier = "L2SunLine", Parent = transforms.SolarSystemBarycenter.Identifier, @@ -62,14 +87,16 @@ local L2SunLine = { Color = { 0.5, 0.5, 0.5 }, LineWidth = 2 }, + Tag = { "L2" }, GUI = { Name = "Earth to L2 Line", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", } } assetHelper.registerSceneGraphNodesAndExport(asset, { L2, L2SunLine, - L2Label + L2Label, + L2BigLabel }) diff --git a/data/assets/scene/solarsystem/missions/jwst/L4.asset b/data/assets/scene/solarsystem/missions/jwst/L4.asset index 74f5b59e1d..26296f5367 100644 --- a/data/assets/scene/solarsystem/missions/jwst/L4.asset +++ b/data/assets/scene/solarsystem/missions/jwst/L4.asset @@ -28,7 +28,7 @@ local L4 = { Tag = { "lagrange_points" }, GUI = { Name = "L4", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", } } @@ -50,7 +50,7 @@ local L4Label = { Tag = { "lagrange_points" }, GUI = { Name = "L4 Label", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", Description = "Main label for L4" } } diff --git a/data/assets/scene/solarsystem/missions/jwst/L5.asset b/data/assets/scene/solarsystem/missions/jwst/L5.asset index a6b033cb00..01fbd0a58d 100644 --- a/data/assets/scene/solarsystem/missions/jwst/L5.asset +++ b/data/assets/scene/solarsystem/missions/jwst/L5.asset @@ -28,7 +28,7 @@ local L5 = { Tag = { "lagrange_points" }, GUI = { Name = "L5", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", } } @@ -50,7 +50,7 @@ local L5Label = { Tag = { "lagrange_points" }, GUI = { Name = "L5 Label", - Path = "/Solar System/Missions/JWST", + Path = "/Solar System/Missions/JWST/Lagrange points", Description = "Main label for L5" } } diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset index ad5d8b38c7..d1f07097b0 100644 --- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset @@ -60,15 +60,17 @@ local JWSTBand = { } }, Renderable = { + Enabled = false, Type = "RenderableSphere", Texture = "C:/Users/ElmQPC/Desktop/Malin/develop/images/jwst/JWST-band.png", - Size = 25E9, - Segments = 150, + Size = 9.2E15, + Segments = 50, DisableFadeInOut = true, Orientation = "Inside", Opacity = 0.1, UseAdditiveBlending = true, }, + Tag = { "fov" }, GUI = { Name = "James Webb Space Telescope View Band", Path = "/Solar System/Missions/JWST", @@ -137,6 +139,7 @@ local JWSTFov = { Identifier = "JWSTFov", Parent = JWSTModel.Identifier, Renderable = { + Enabled = false, Type = "RenderablePrism", Segments = 6, Lines = 3, @@ -145,7 +148,7 @@ local JWSTFov = { Color = { 1.0, 1.0, 1.0 }, - Length = 25E9 + Length = 9.2E15 }, Transform = { Rotation = { @@ -155,6 +158,7 @@ local JWSTFov = { } }, }, + Tag = { "fov" }, GUI = { Name = "James Webb Space Telecope Field of View", Path = "/Solar System/Missions/JWST", diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile index afecdd0a07..db47b6e311 100644 --- a/data/profiles/jwst.profile +++ b/data/profiles/jwst.profile @@ -59,6 +59,22 @@ "key": "U", "name": "Toggle Hubble Ultra Deep Field", "script": "local list = openspace.getProperty('{hudf}.*.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end" + }, + { + "documentation": "Toggle L2 label, point and line", + "gui_path": "/JWST", + "is_local": false, + "key": "2", + "name": "Toggle L2", + "script": "local list = openspace.getProperty('{L2}.*.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end" + }, + { + "documentation": "Toggle James Webb Space Telecope field of view and view band", + "gui_path": "/JWST", + "is_local": false, + "key": "V", + "name": "Toggle JWST field of view and view band", + "script": "local list = openspace.getProperty('{fov}.*.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end" } ], "mark_nodes": [