From 0280f45e97f4470a033b024f3650443a64a5a7fd Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Fri, 20 Sep 2024 11:54:28 +0200 Subject: [PATCH] Add asset.enabled option to jwst and lagrange point assets --- .../solarsystem/planets/earth/lagrange_points/l1/l1.asset | 2 ++ .../solarsystem/planets/earth/lagrange_points/l2/l2.asset | 4 ++++ .../planets/earth/lagrange_points/l2/l2sunline.asset | 1 + .../solarsystem/planets/earth/lagrange_points/l4/l4.asset | 2 ++ .../solarsystem/planets/earth/lagrange_points/l5/l5.asset | 2 ++ .../scene/solarsystem/telescopes/jwst/fieldofview.asset | 1 + data/assets/scene/solarsystem/telescopes/jwst/label.asset | 1 + data/assets/scene/solarsystem/telescopes/jwst/trail.asset | 3 +++ .../scene/solarsystem/telescopes/jwst/viewingband.asset | 1 + 9 files changed, 17 insertions(+) diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset index 65ce36c192..c1806432eb 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l1/l1.asset @@ -15,6 +15,7 @@ local L1 = { Parent = transforms.L1Position.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", + Enabled = asset.enabled, Billboard = true, Size = 70000000, Texture = circle .. "circle.png", @@ -32,6 +33,7 @@ local L1Label = { Parent = transforms.L1Position.Identifier, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "L1", FontSize = 50, Size = 7.5, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset index 2dde9acd88..6bc01e2acc 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2.asset @@ -15,6 +15,7 @@ local L2Small = { Parent = transforms.L2Position.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", + Enabled = asset.enabled, Billboard = true, Size = 4000000, Texture = circle .. "circle.png", @@ -32,6 +33,7 @@ local L2 = { Parent = transforms.L2Position.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", + Enabled = asset.enabled, Billboard = true, Size = 70000000, Texture = circle .. "circle.png", @@ -49,6 +51,7 @@ local L2SmallLabel = { Parent = transforms.L2Position.Identifier, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "L2", FontSize = 50.0, Size = 6.0, @@ -70,6 +73,7 @@ local L2Label = { Parent = transforms.L2Position.Identifier, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "L2", FontSize = 50, Size = 7.5, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset index d3f438dc03..16c3bb83ba 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l2/l2sunline.asset @@ -9,6 +9,7 @@ local L2SunLine = { Parent = sunTransforms.SolarSystemBarycenter.Identifier, Renderable = { Type = "RenderableNodeLine", + Enabled = asset.enabled, StartNode = sun.Sun.Identifier, EndNode = transforms.L2Position.Identifier, Color = { 0.5, 0.5, 0.5 }, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset index cf59d4ec12..7dda9ff4e9 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l4/l4.asset @@ -15,6 +15,7 @@ local L4 = { Parent = transforms.L4Position.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", + Enabled = asset.enabled, Billboard = true, Size = 800000000, Texture = circle .. "circle.png", @@ -32,6 +33,7 @@ local L4Label = { Parent = transforms.L4Position.Identifier, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "L4", FontSize = 50, Size = 8.5, diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset index b454591720..a7f71a277c 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/l5/l5.asset @@ -15,6 +15,7 @@ local L5 = { Parent = transforms.L5Position.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", + Enabled = asset.enabled, Billboard = true, Size = 800000000, Texture = circle .. "circle.png", @@ -32,6 +33,7 @@ local L5Label = { Parent = transforms.L5Position.Identifier, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "L5", FontSize = 50, Size = 8.5, diff --git a/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset b/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset index 8d5364b01d..e2e1bcbd47 100644 --- a/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset +++ b/data/assets/scene/solarsystem/telescopes/jwst/fieldofview.asset @@ -12,6 +12,7 @@ local JWSTFov = { }, Renderable = { Type = "RenderablePrism", + Enabled = asset.enabled, Segments = 6, Lines = 3, Radius = 3.25, diff --git a/data/assets/scene/solarsystem/telescopes/jwst/label.asset b/data/assets/scene/solarsystem/telescopes/jwst/label.asset index 792b6909c2..21fe46a65c 100644 --- a/data/assets/scene/solarsystem/telescopes/jwst/label.asset +++ b/data/assets/scene/solarsystem/telescopes/jwst/label.asset @@ -11,6 +11,7 @@ local JWSTLabel = { }, Renderable = { Type = "RenderableLabel", + Enabled = asset.enabled, Text = "JWST", FontSize = 50, Size = 6.5, diff --git a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset index f188a19b2b..60c5902246 100644 --- a/data/assets/scene/solarsystem/telescopes/jwst/trail.asset +++ b/data/assets/scene/solarsystem/telescopes/jwst/trail.asset @@ -82,6 +82,7 @@ local JWSTTrailOrbit = { }, Renderable = { Type = "RenderableTrailOrbit", + Enabled = asset.enabled, Translation = { Type = "SpiceTranslation", Target = kernels.ID.JWST, @@ -111,6 +112,7 @@ local JWSTTrailCoRevOrbit = { }, Renderable = { Type = "RenderableTrailOrbit", + Enabled = asset.enabled, Translation = { Type = "SpiceTranslation", Target = kernels.ID.JWST, @@ -138,6 +140,7 @@ local JWSTSunTrail = { }, Renderable = { Type = "RenderableTrailOrbit", + Enabled = asset.enabled, Translation = { Type = "SpiceTranslation", Target = kernels.ID.JWST, diff --git a/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset b/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset index 6da9a9a016..507e112cb9 100644 --- a/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset +++ b/data/assets/scene/solarsystem/telescopes/jwst/viewingband.asset @@ -29,6 +29,7 @@ local JWSTBand = { }, Renderable = { Type = "RenderableSphereImageLocal", + Enabled = asset.enabled, Texture = band .. "JWST-band.png", Size = 9.2E15, Segments = 50,