Some clean up

2026-04-24 04:58:59 -05:00 · 2021-09-23 11:38:15 +02:00
parent 0076fd7613
commit de1ef3febc
6 changed files with 63 additions and 39 deletions
@@ -2,13 +2,7 @@ local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local jwstTransforms = asset.require('./transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
-
-local image = asset.syncedResource({
-  Name = "HUDF image",
-  Type = "HttpSynchronization",
-  Identifier = "hudf_image",
-  Version = 2
-})
+local image = asset.require('./image').image

 local DISTANCE = 9.2E15;

@@ -29,11 +23,11 @@ local HUDFPosition = {
    }
  },
  GUI = {
-    Name = "Hubble Ultra Deep field Position",
+    Name = "Hubble Ultra Deep Field Position",
    Path = "/Solar System/Missions/JWST/HUDF",
    Hidden = true,
    Description = [[
-      Galactic cartesian position for the Hubble Ultra Deep field
+      Galactic cartesian position for the Hubble Ultra Deep Field
    ]],
  }
 }
@@ -42,7 +36,7 @@ local HUDFImage = {
  Identifier = "HUDFImage",
  Enabled = false,
  Type = "ScreenSpaceImageLocal",
-  Name = "Hubble Ultra Deep field",
+  Name = "Hubble Ultra Deep Field",
  UseRadiusAzimuthElevation = true,
  FaceCamera = false,
  RadiusAzimuthElevation = { 200.0, 0.5, 0.15 },
@@ -50,6 +44,10 @@ local HUDFImage = {
  Opacity = 1.0,
  TexturePath = image .. "/Hubble_ultra_deep_field.png",
  Tag = { "mission_jwst_hudf" },
+  Description = [[
+    Image of the Hubble Ultra Deep Field by NASA, ESA, and S. Beckwith (STScI) and
+    the HUDF Team.
+  ]],
 }

 local HUDFJWSTLine = {
@@ -68,7 +66,7 @@ local HUDFJWSTLine = {
    Name = "JWST to HUDF Line",
    Path = "/Solar System/Missions/JWST/HUDF",
    Description = [[
-      Line from the James Webb Space Telescope to the Hubble Ultra Deep field
+      Line from the James Webb Space Telescope to the Hubble Ultra Deep Field
    ]],
  }
 }
@@ -81,3 +79,16 @@ end)
 asset.onDeinitialize(function()
  openspace.removeScreenSpaceRenderable(HUDFImage.Identifier)
 end)
+
+asset.meta = {
+  Name = "Hubble Ultra Deep Field Image and Line",
+  Version = "1.0",
+  Description = [[
+    Screenspace image of the Hubble Ultra Deep Field and a line from the
+    James Webb Space Telescope to the Hubble Ultra Deep Field position.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license",
+  Identifiers = {"HUDFPosition", "HUDFImage", "HUDFJWSTLine"}
+}
@@ -0,0 +1,22 @@
+local image = asset.syncedResource({
+  Name = "HUDF image",
+  Type = "HttpSynchronization",
+  Identifier = "hudf_image",
+  Version = 2
+})
+
+asset.export('image', image)
+
+asset.meta = {
+  Name = "Hubble Ultra Deep Field",
+  Version = "1.0",
+  Description = "Hubble Ultra Deep Field Image",
+  Author = "NASA, ESA, and S. Beckwith (STScI) and the HUDF Team",
+  URL = "https://esahubble.org/images/heic0611b/",
+  License = [[
+    https://creativecommons.org/licenses/by/4.0/<br>
+    Original image by NASA, ESA, and S. Beckwith (STScI) and the HUDF Team,
+    white frame added by OpenSpace Team.
+  ]],
+  Identifiers = {"HUDFImage"}
+}
@@ -115,3 +115,15 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
  JWSTModel,
  JWSTFov
 })
+
+asset.meta = {
+  Name = "James Webb Space Telescope",
+  Version = "1.0",
+  Description = [[
+    James Webb Space Telescope animated model, safe viewing band and field of view.
+  ]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license",
+  Identifiers = {"JWSTBand", "JWSTModel", "JWSTFov"}
+}
@@ -22,7 +22,7 @@ local JWSTTrail = {
    Color = { 0.9, 0.9, 0.0 },
    StartTime = "2018 OCT 01 13:18:00",
    EndTime = "2021 OCT 01",
-    SampleInterval = 600
+    SampleInterval = 3600
  },
  GUI = {
    Name = "JWST Trail",
@@ -60,40 +60,19 @@ local JWSTSunTrail = {
  }
 }

-local JWSTOrbitTrail = {
-  Identifier = "JWSTOrbitTrail",
-  Parent = transforms.L2.Identifier,
-  Renderable = {
-    Enabled = false,
-    Type = "RenderableTrailOrbit",
-    Translation = {
-      Type = "HorizonsTranslation",
-      HorizonsTextFile = horizons .. "/horizons_jwst.dat",
-    },
-    Color = { 0.9, 0.9, 0.0 },
-    Period = 91.3105,
-    Resolution = 100
-  },
-  GUI = {
-    Name = "JWST Orbit Trail",
-    Path = "/Solar System/Missions/JWST/Trails"
-  }
-}
-
 assetHelper.registerSceneGraphNodesAndExport(asset, {
  JWSTTrail,
-  JWSTSunTrail,
-  JWSTOrbitTrail
+  JWSTSunTrail
 })

 asset.meta = {
  Name = "James Webb Space Telescope Trails",
  Version = "1.0",
  Description = [[
-    Trail of James Webb Space Telescope in respect to L2, the Sun and as an orbit trail
+    Trail of James Webb Space Telescope in respect to L2 and the Sun
  ]],
  Author = "OpenSpace Team",
  URL = "http://openspaceproject.com",
  License = "MIT license",
-  Identifiers = {"JWSTTrail", "JWSTSunTrail", "JWSTOrbitTrail"}
+  Identifiers = {"JWSTTrail", "JWSTSunTrail"}
 }
@@ -16,11 +16,11 @@ local JWSTPosition = {
  GUI = {
    Name = "JWST Position",
    Path = "/Solar System/Missions/JWST",
+    Hidden = true,
    Description = [[
      James Webb Space Telescope Position relative to L2 based on horizons data from the
      2018 launch.
    ]],
-    Hidden = true,
  }
 }

@@ -40,10 +40,10 @@ local JWSTRotation = {
  GUI = {
    Name = "JWST Rotation",
    Path = "/Solar System/Missions/JWST",
+    Hidden = true,
    Description = [[
      James Webb Space Telescope Rotation so the sunshield always faces the Sun.
    ]],
-    Hidden = true,
  }
 }

@@ -47,7 +47,7 @@
    "scene/solarsystem/planets/earth/satellites/satellites",
    "scene/solarsystem/missions/jwst/jwst",
    "scene/solarsystem/missions/jwst/trail",
-    "scene/solarsystem/missions/jwst/HUDFImage",
+    "scene/solarsystem/missions/jwst/hudf",
    "scene/solarsystem/missions/jwst/timelaps",
    "scene/digitaluniverse/hdf"
  ],