diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/crab.asset b/data/assets/scene/solarsystem/missions/jwst/targets/crab.asset new file mode 100644 index 0000000000..0810866b4a --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/crab.asset @@ -0,0 +1,35 @@ +local image = asset.require("./crab_image").image + +local CrabImage = { + Identifier = "CrabImage", + Type = "ScreenSpaceImageLocal", + Name = "Crab Nebula", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "crab-nebula.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the Crab Nebula by NASA, ESA and Allison Loll/Jeff Hester. + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(CrabImage) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(CrabImage) +end) + +asset.export(CrabImage) + +asset.meta = { + Name = "Crab Nebula Image", + Version = "1.0", + Description = "Screenspace image of the Crab Nebula", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/crab_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/crab_image.asset new file mode 100644 index 0000000000..4d3ca18c7f --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/crab_image.asset @@ -0,0 +1,20 @@ +local image = asset.syncedResource({ + Name = "Crab Nebula Image", + Type = "HttpSynchronization", + Identifier = "crab_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "Crab Nebula", + Version = "1.0", + Description = "Crab Nebula Image", + Author = [[ + NASA, ESA and Allison Loll/Jeff Hester (Arizona State University). + Acknowledgement: Davide De Martin (ESA/Hubble) + ]], + URL = "https://esahubble.org/images/ann0820/", + License = "CC BY 4.0" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/hh212.asset b/data/assets/scene/solarsystem/missions/jwst/targets/hh212.asset new file mode 100644 index 0000000000..0c55fd4dee --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/hh212.asset @@ -0,0 +1,35 @@ +local image = asset.require("./hh212_image").image + +local HH212Image = { + Identifier = "HH212Image", + Type = "ScreenSpaceImageLocal", + Name = "HH 212", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "hh212.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of HH 212 by ESO/M. McCaughrean. + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(HH212Image) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(HH212Image) +end) + +asset.export(HH212Image) + +asset.meta = { + Name = "HH 212 Image", + Version = "1.0", + Description = "Screenspace image of HH 212", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/hh212_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/hh212_image.asset new file mode 100644 index 0000000000..46239614e2 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/hh212_image.asset @@ -0,0 +1,17 @@ +local image = asset.syncedResource({ + Name = "HH 212 Image", + Type = "HttpSynchronization", + Identifier = "hh212_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "HH 212", + Version = "1.0", + Description = "HH 212 Image", + Author = "ESO/M. McCaughrean", + URL = "https://www.eso.org/public/images/potw1541a/", + License = "CC BY 4.0" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/hudf.asset b/data/assets/scene/solarsystem/missions/jwst/targets/hudf.asset similarity index 92% rename from data/assets/scene/solarsystem/missions/jwst/hudf.asset rename to data/assets/scene/solarsystem/missions/jwst/targets/hudf.asset index 492fc5dafe..828d2871c5 100644 --- a/data/assets/scene/solarsystem/missions/jwst/hudf.asset +++ b/data/assets/scene/solarsystem/missions/jwst/targets/hudf.asset @@ -1,7 +1,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms") -local jwstTransforms = asset.require("./transforms") +local jwstTransforms = asset.require("scene/solarsystem/missions/jwst/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") -local image = asset.require("./image").image +local image = asset.require("./hudf_image").image local DISTANCE = 9.2E15; @@ -41,7 +41,7 @@ local HUDFImage = { UsePerspectiveProjection = false, Opacity = 1.0, TexturePath = image .. "Hubble_ultra_deep_field.png", - Tag = { "mission_jwst_hudf" }, + Tag = { "mission_jwst_hudf", "mission_jwst_target" }, Description = [[ Image of the Hubble Ultra Deep Field by NASA, ESA, and S. Beckwith (STScI) and the HUDF Team. @@ -102,6 +102,5 @@ asset.meta = { ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license", - Identifiers = {"HUDFPosition", "HUDFImage", "HUDFJWSTLine"} + License = "MIT license" } diff --git a/data/assets/scene/solarsystem/missions/jwst/image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/hudf_image.asset similarity index 66% rename from data/assets/scene/solarsystem/missions/jwst/image.asset rename to data/assets/scene/solarsystem/missions/jwst/targets/hudf_image.asset index 31142954ef..66d58b8952 100644 --- a/data/assets/scene/solarsystem/missions/jwst/image.asset +++ b/data/assets/scene/solarsystem/missions/jwst/targets/hudf_image.asset @@ -13,9 +13,5 @@ asset.meta = { Description = "Hubble Ultra Deep Field Image", Author = "NASA, ESA, and S. Beckwith (STScI) and the HUDF Team", URL = "https://esahubble.org/images/heic0611b/", - License = [[ - Original image by NASA, ESA, and S. Beckwith (STScI) and the HUDF Team, - white frame and red arrow added by OpenSpace Team.
- https://creativecommons.org/licenses/by/4.0/ - ]] + License = "CC BY 4.0" } diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/m51.asset b/data/assets/scene/solarsystem/missions/jwst/targets/m51.asset new file mode 100644 index 0000000000..8b73fd0091 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/m51.asset @@ -0,0 +1,36 @@ +local image = asset.require("./m51_image").image + +local M51Image = { + Identifier = "M51Image", + Type = "ScreenSpaceImageLocal", + Name = "M51 Galaxy", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "m51-galaxy.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the M51 Galaxy by NASA, ESA, S. Beckwith (STScI), + and The Hubble Heritage Team (STScI/AURA). + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(M51Image) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(M51Image) +end) + +asset.export(M51Image) + +asset.meta = { + Name = "M51 Galaxy Image", + Version = "1.0", + Description = "Screenspace image of the M51 Galaxy", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/m51_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/m51_image.asset new file mode 100644 index 0000000000..c8677f0a2a --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/m51_image.asset @@ -0,0 +1,19 @@ +local image = asset.syncedResource({ + Name = "M51 Galaxy Image", + Type = "HttpSynchronization", + Identifier = "m51_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "M51 Galaxy", + Version = "1.0", + Description = "M51 Galaxy Image", + Author = [[ + NASA, ESA, S. Beckwith (STScI), and The Hubble Heritage Team (STScI/AURA) + ]], + URL = "https://hubblesite.org/contents/media/images/2005/12/1677-Image.html", + License = "https://hubblesite.org/copyright" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/m82.asset b/data/assets/scene/solarsystem/missions/jwst/targets/m82.asset new file mode 100644 index 0000000000..122b628ca0 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/m82.asset @@ -0,0 +1,35 @@ +local image = asset.require("./m82_image").image + +local M82Image = { + Identifier = "M82Image", + Type = "ScreenSpaceImageLocal", + Name = "M82 Galaxy", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "m82-galaxy.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the M82 Galaxy by NASA, ESA and the Hubble Heritage Team (STScI/AURA). + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(M82Image) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(M82Image) +end) + +asset.export(M82Image) + +asset.meta = { + Name = "M82 Galaxy Image", + Version = "1.0", + Description = "Screenspace image of the M82 Galaxy", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/m82_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/m82_image.asset new file mode 100644 index 0000000000..83aa15b50b --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/m82_image.asset @@ -0,0 +1,20 @@ +local image = asset.syncedResource({ + Name = "M82 Galaxy Image", + Type = "HttpSynchronization", + Identifier = "m82_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "M82 Galaxy", + Version = "1.0", + Description = "M82 Galaxy Image", + Author = [[ + NASA, ESA and the Hubble Heritage Team (STScI/AURA). Acknowledgment: + J. Gallagher (University of Wisconsin), M. Mountain (STScI) and P. Puxley (NSF) + ]], + URL = "https://esahubble.org/images/heic0604a/", + License = "CC BY 4.0" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/orion.asset b/data/assets/scene/solarsystem/missions/jwst/targets/orion.asset new file mode 100644 index 0000000000..20168f28d7 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/orion.asset @@ -0,0 +1,35 @@ +local image = asset.require("./orion_image").image + +local OrionImage = { + Identifier = "OrionImage", + Type = "ScreenSpaceImageLocal", + Name = "Orion Nebula", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.0 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "orion-nebula.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the Orion Nebula by Bill Schoening/NOIRLab/NSF/AURA. + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(OrionImage) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(OrionImage) +end) + +asset.export(OrionImage) + +asset.meta = { + Name = "Orion Nebula Image", + Version = "1.0", + Description = "Screenspace image of the Orion Nebula", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/orion_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/orion_image.asset new file mode 100644 index 0000000000..caa9370c00 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/orion_image.asset @@ -0,0 +1,17 @@ +local image = asset.syncedResource({ + Name = "Orion Image", + Type = "HttpSynchronization", + Identifier = "orion_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "Orion Nebula", + Version = "1.0", + Description = "Orion Nebula Image", + Author = "Bill Schoening/NOIRLab/NSF/AURA", + URL = "https://noirlab.edu/public/images/noao-02677/", + License = "CC BY 4.0" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/ring.asset b/data/assets/scene/solarsystem/missions/jwst/targets/ring.asset new file mode 100644 index 0000000000..00e6042dc7 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/ring.asset @@ -0,0 +1,36 @@ +local image = asset.require("./ring_image").image + +local RingImage = { + Identifier = "RingImage", + Type = "ScreenSpaceImageLocal", + Name = "Ring Nebula", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "ring-nebula.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the Ring Nebula by NASA, ESA, C.R. O'Dell (Vanderbilt University), and + D. Thompson (Large Binocular Telescope Observatory). + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(RingImage) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(RingImage) +end) + +asset.export(RingImage) + +asset.meta = { + Name = "Ring Nebula Image", + Version = "1.0", + Description = "Screenspace image of the Ring Nebula", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/ring_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/ring_image.asset new file mode 100644 index 0000000000..d853da26ee --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/ring_image.asset @@ -0,0 +1,20 @@ +local image = asset.syncedResource({ + Name = "Ring Nebula Image", + Type = "HttpSynchronization", + Identifier = "ring_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "Ring Nebula", + Version = "1.0", + Description = "Ring Nebula Image", + Author = [[ + NASA, ESA, C.R. O'Dell (Vanderbilt University), and + D. Thompson (Large Binocular Telescope Observatory) + ]], + URL = "https://hubblesite.org/contents/media/images/2013/13/3167-Image.html?keyword=ring%2520nebula&news=true", + License = "https://hubblesite.org/copyright" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a.asset b/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a.asset new file mode 100644 index 0000000000..3a2696906f --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a.asset @@ -0,0 +1,36 @@ +local image = asset.require("./sn1987a_image").image + +local SN1987aImage = { + Identifier = "SN1987aImage", + Type = "ScreenSpaceImageLocal", + Name = "Supernova SN 1987a", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.0 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "sn1987a.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the Supernova SN 1987a by NASA/CXC/PSU/S.Park, D.Burrows + & NASA/STScI/CfA/P.Challis. + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(SN1987aImage) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(SN1987aImage) +end) + +asset.export(SN1987aImage) + +asset.meta = { + Name = "Supernova SN 1987a Image", + Version = "1.0", + Description = "Screenspace image of the Supernova SN 1987a", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a_image.asset new file mode 100644 index 0000000000..9679a0f355 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/sn1987a_image.asset @@ -0,0 +1,20 @@ +local image = asset.syncedResource({ + Name = "Supernova SN 1987a Image", + Type = "HttpSynchronization", + Identifier = "sn1987a_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "Supernova SN 1987a", + Version = "1.0", + Description = "Supernova SN 1987a Image", + Author = [[ + X-ray: NASA/CXC/PSU/S.Park & D.Burrows. + Optical: NASA/STScI/CfA/P.Challis + ]], + URL = "https://chandra.harvard.edu/photo/2007/sn87a/", + License = "https://chandra.harvard.edu/photo/image_use.html" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/targets.asset b/data/assets/scene/solarsystem/missions/jwst/targets/targets.asset new file mode 100644 index 0000000000..e1e6217c4b --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/targets.asset @@ -0,0 +1,9 @@ +asset.require("./crab") +asset.require("./hh212") +asset.require("./hudf") +asset.require("./m51") +asset.require("./m82") +asset.require("./orion") +asset.require("./ring") +asset.require("./sn1987a") +asset.require("./trifid") diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/trifid.asset b/data/assets/scene/solarsystem/missions/jwst/targets/trifid.asset new file mode 100644 index 0000000000..4a1e80da32 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/trifid.asset @@ -0,0 +1,35 @@ +local image = asset.require("./trifid_image").image + +local TrifidImage = { + Identifier = "TrifidImage", + Type = "ScreenSpaceImageLocal", + Name = "Trifid Nebula", + UseRadiusAzimuthElevation = true, + FaceCamera = false, + RadiusAzimuthElevation = { 200.0, 0.5, 0.1 }, + UsePerspectiveProjection = false, + Opacity = 1.0, + TexturePath = image .. "trifid-nebula.png", + Tag = { "mission_jwst_target" }, + Description = [[ + Image of the Trifid Nebula by ESO/Gábor Tóth. + ]], +} + +asset.onInitialize(function() + openspace.addScreenSpaceRenderable(TrifidImage) +end) +asset.onDeinitialize(function() + openspace.removeScreenSpaceRenderable(TrifidImage) +end) + +asset.export(TrifidImage) + +asset.meta = { + Name = "Trifid Nebula Image", + Version = "1.0", + Description = "Screenspace image of the Trifid Nebula", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/missions/jwst/targets/trifid_image.asset b/data/assets/scene/solarsystem/missions/jwst/targets/trifid_image.asset new file mode 100644 index 0000000000..a9ce6ba9ed --- /dev/null +++ b/data/assets/scene/solarsystem/missions/jwst/targets/trifid_image.asset @@ -0,0 +1,17 @@ +local image = asset.syncedResource({ + Name = "Trifid Nebula Image", + Type = "HttpSynchronization", + Identifier = "trifid_image", + Version = 1 +}) + +asset.export("image", image) + +asset.meta = { + Name = "Trifid Nebula", + Version = "1.0", + Description = "Trifid Nebula Image", + Author = "ESO/Gábor Tóth", + URL = "https://www.eso.org/public/images/eso1504g/", + License = "CC BY 4.0" +} diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile index 76a29f010e..63dca2a654 100644 --- a/data/profiles/jwst.profile +++ b/data/profiles/jwst.profile @@ -84,7 +84,7 @@ "scene/solarsystem/planets/earth/lagrange_points/lagrange_points", "scene/solarsystem/missions/jwst/jwst", "scene/solarsystem/missions/jwst/trail", - "scene/solarsystem/missions/jwst/hudf", + "scene/solarsystem/missions/jwst/targets/targets", "scene/solarsystem/missions/jwst/timelapse", "scene/solarsystem/missions/jwst/toggle_trail", "scene/digitaluniverse/hdf" @@ -271,8 +271,8 @@ "value": "false" }, { - "name": "ScreenSpace.HUDFImage.Enabled", - "type": "setPropertyValueSingle", + "name": "{mission_jwst_target}.Enabled", + "type": "setPropertyValue", "value": "false" }, {