diff --git a/data/assets/base.asset b/data/assets/base.asset
index 3f07199c09..ff5967475c 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -42,29 +42,31 @@ asset.require("scene/digitaluniverse/2dF")
asset.require("scene/digitaluniverse/2mass")
asset.require("scene/digitaluniverse/6dF")
asset.require("scene/digitaluniverse/abell")
+asset.require("scene/digitaluniverse/allsky_hydrogenalpha")
+asset.require("scene/digitaluniverse/allsky_visible")
asset.require("scene/digitaluniverse/alternatestarlabels")
asset.require("scene/digitaluniverse/backgroundradiation")
-asset.require("scene/digitaluniverse/clusters")
+asset.require("scene/digitaluniverse/brown_dwarfs")
+asset.require("scene/digitaluniverse/galaxy_clusters")
asset.require("scene/digitaluniverse/constellationbounds")
asset.require("scene/digitaluniverse/constellations")
-asset.require("scene/digitaluniverse/deepsky")
-asset.require("scene/digitaluniverse/dwarfs")
asset.require("scene/digitaluniverse/exoplanets")
asset.require("scene/digitaluniverse/exoplanets_candidates")
asset.require("scene/digitaluniverse/globularclusters")
asset.require("scene/digitaluniverse/grids")
-asset.require("scene/digitaluniverse/groups")
+asset.require("scene/digitaluniverse/galaxy_groups")
asset.require("scene/digitaluniverse/h2regions")
-asset.require("scene/digitaluniverse/localdwarfs")
+asset.require("scene/digitaluniverse/local_group_dwarfs")
asset.require("scene/digitaluniverse/milkyway")
asset.require("scene/digitaluniverse/milkyway_arm_labels")
asset.require("scene/digitaluniverse/milkyway_label")
-asset.require("scene/digitaluniverse/milkyway_sphere")
asset.require("scene/digitaluniverse/obassociations")
+asset.require("scene/digitaluniverse/oort_cloud")
asset.require("scene/digitaluniverse/openclusters")
asset.require("scene/digitaluniverse/planetarynebulae")
asset.require("scene/digitaluniverse/pulsars")
asset.require("scene/digitaluniverse/quasars")
+asset.require("scene/digitaluniverse/star_uncertainty")
asset.require("scene/digitaluniverse/starlabels")
asset.require("scene/digitaluniverse/starorbits")
asset.require("scene/digitaluniverse/stars")
@@ -72,6 +74,7 @@ asset.require("scene/digitaluniverse/superclusters")
asset.require("scene/digitaluniverse/supernovaremnants")
asset.require("scene/digitaluniverse/tully")
asset.require("scene/digitaluniverse/voids")
+asset.require("scene/digitaluniverse/white_dwarfs")
asset.require("nightsky/nightsky")
asset.require("customization/globebrowsing")
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index d266a22610..5cc6ec1214 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -1,6 +1,6 @@
local bookmarkHelper = asset.require("util/generate_bookmarks")
-local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v2/bookmarks.csv"
+local dataProvider = "http://data.openspaceproject.com/files/bookmarks/v3/bookmarks.csv"
local bookmarksCSV = asset.resource({
Identifier = "openspace_bookmarks",
diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset
index 6a2fd04120..9c6fe16962 100644
--- a/data/assets/nightsky/altaz.asset
+++ b/data/assets/nightsky/altaz.asset
@@ -25,8 +25,8 @@ local AltAzGridPosition = {
}
},
GUI = {
- Name = "Altitude/Azimuth Grid Position",
- Path = "/Other/Night Sky",
+ Name = "Altitude-Azimuth Grid Position",
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
Hidden = true
}
}
@@ -48,17 +48,17 @@ local AltAzGrid = {
Type = "RenderableSphericalGrid",
Enabled = asset.enabled,
Opacity = 0.8,
- Color = { 0.4, 0.8, 0.4 },
+ Color = { 0.2, 0.4, 0.2 },
LineWidth = 2.0,
RenderBinMode = "PostDeferredTransparent"
},
GUI = {
- Name = "Altitude/Azimuth Grid",
+ Name = "Altitude-Azimuth Grid",
Description = [[A local Altitude/Azimuth grid centered around your position on a
planetary surface. The grid can be toggled, hidden or shown using the accompanying
actions in the actions panel, under "Night Sky". Use these actions to move it to
another planet. The default is Earth.]],
- Path = "/Other/Night Sky"
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
}
}
@@ -126,6 +126,7 @@ asset.export("HideAltaz", HideAltaz.Identifier)
asset.export("ToggleAltaz", ToggleAltaz.Identifier)
+
asset.meta = {
Name = "Altitude/Azimuth Grid",
Description = [[A local Altitude/Azimuth grid centered around your position on a
diff --git a/data/assets/nightsky/cardinal_directions.asset b/data/assets/nightsky/cardinal_directions.asset
index 50d2487c15..a8c0afb512 100644
--- a/data/assets/nightsky/cardinal_directions.asset
+++ b/data/assets/nightsky/cardinal_directions.asset
@@ -33,7 +33,7 @@ local CardinalDirectionsPosition = {
},
GUI = {
Name = "Cardinal Directions Position",
- Path = "/Other/Night Sky",
+ Path = "/Night Sky",
Hidden = true
}
}
@@ -63,7 +63,7 @@ local CardinalDirectionSphere = {
Description = [[A textured sphere showing the cardinal directions.
The sphere is placed on the planet surface and follows the camera's movements.
]],
- Path = "/Other/Night Sky"
+ Path = "/Night Sky"
}
}
@@ -158,6 +158,7 @@ asset.export("ShowNeswLettersSmall", ShowNeswLettersSmall.Identifier)
asset.export("HideNesw", HideNesw.Identifier)
+
asset.meta = {
Name = "Cardinal Directions",
Description = [[Adds a sphere showing the cardinal directions, that follows the camera
diff --git a/data/assets/nightsky/ecliptic_band.asset b/data/assets/nightsky/ecliptic_band.asset
index 1f0a7d93a5..b67dd33c4a 100644
--- a/data/assets/nightsky/ecliptic_band.asset
+++ b/data/assets/nightsky/ecliptic_band.asset
@@ -22,7 +22,7 @@ local EclipticLine = {
Transform = {
Scale = {
Type = "StaticScale",
- Scale = 4.28601E17
+ Scale = 9.46377307652E17
},
Rotation = {
Type = "StaticRotation",
@@ -32,16 +32,15 @@ local EclipticLine = {
Renderable = {
Type = "RenderableRadialGrid",
Opacity = 0.8,
- Color = { 1.0, 1.0, 1.0 },
- LineWidth = 3.0,
+ Color = { 0.5, 0.24, 0.24 },
+ LineWidth = 4.0,
GridSegments = { 1, 1 },
- Radii = { 0.5, 0.5 },
Enabled = asset.enabled
},
GUI = {
- Name = "Ecliptic Line",
+ Name = "Ecliptic",
Description = "A line representation of the Ecliptic plane.",
- Path = "/Other/Lines"
+ Path = "/Night Sky/Coordinate Systems/Ecliptic"
}
}
@@ -57,7 +56,7 @@ local EclipticBand = {
Renderable = {
Type = "RenderableSphereImageLocal",
Texture = textures .. "band2x.png",
- Size = 4.28601E17,
+ Size = 9.46377307652E17,
Segments = 50,
DisableFadeInOut = true,
Orientation = "Inside",
@@ -67,7 +66,7 @@ local EclipticBand = {
GUI = {
Name = "Ecliptic Band",
Description = "A band representation of the Ecliptic plane.",
- Path = "/Other/Lines"
+ Path = "/Night Sky/Coordinate Systems/Ecliptic"
}
}
@@ -162,6 +161,7 @@ asset.export("HideEclipticBand", HideEclipticBand.Identifier)
asset.export("ToggleEclipticBand", ToggleEclipticBand.Identifier)
+
asset.meta = {
Name = "Ecliptic Band/Line",
Description = [[A line and band representation of the Ecliptic plane, including actions
diff --git a/data/assets/nightsky/equatorial_band.asset b/data/assets/nightsky/equatorial_band.asset
index 6b0084aad5..1fb892ddea 100644
--- a/data/assets/nightsky/equatorial_band.asset
+++ b/data/assets/nightsky/equatorial_band.asset
@@ -19,22 +19,21 @@ local EquatorialLine = {
},
Scale = {
Type = "StaticScale",
- Scale = 4.28601E17
+ Scale = 7.5686E17
}
},
Renderable = {
Type = "RenderableRadialGrid",
Opacity = 0.8,
- Color = { 1.0, 1.0, 1.0 },
- LineWidth = 3.0,
+ Color = { 0.6, 0.6, 0.2 },
+ LineWidth = 4.0,
GridSegments = { 1, 1 },
- Radii = { 0.5, 0.5 },
Enabled = asset.enabled
},
GUI = {
- Name = "Equatorial Line",
+ Name = "Celestial Equator",
Description = "A line representation of the Equatorial plane.",
- Path = "/Other/Lines"
+ Path = "/Night Sky/Coordinate Systems/Equatorial"
}
}
@@ -90,6 +89,7 @@ asset.export("HideEquatorialLine", HideEquatorialLine.Identifier)
asset.export("ToggleEquatorialLine", ToggleEquatorialLine.Identifier)
+
asset.meta = {
Name = "Equatorial Line",
Description = [[A line representation of the Equatorial plane, including actions
diff --git a/data/assets/nightsky/galactic_band.asset b/data/assets/nightsky/galactic_band.asset
index 6d1838cc3d..14a36db686 100644
--- a/data/assets/nightsky/galactic_band.asset
+++ b/data/assets/nightsky/galactic_band.asset
@@ -2,8 +2,8 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
-local GalacticBand = {
- Identifier = "GalacticBand",
+local GalacticLine = {
+ Identifier = "GalacticLine",
Parent = transforms.SolarSystemBarycenter.Name,
Transform = {
Scale = {
@@ -14,16 +14,15 @@ local GalacticBand = {
Renderable = {
Type = "RenderableRadialGrid",
Opacity = 0.8,
- Color = { 1.0, 1.0, 1.0 },
- LineWidth = 3.0,
+ Color = { 0.08, 0.40, 0.40 },
+ LineWidth = 4.0,
GridSegments = { 1, 1 },
- Radii = { 0.5, 0.5 },
Enabled = asset.enabled
},
GUI = {
- Name = "Galactic Equator Line",
+ Name = "Galactic Equator",
Description = "A line representation of the Galactic Equator plane.",
- Path = "/Other/Lines"
+ Path = "/Night Sky/Coordinate Systems/Galactic"
}
}
@@ -60,7 +59,7 @@ local ToggleGalacticBand = {
}
asset.onInitialize(function()
- openspace.addSceneGraphNode(GalacticBand)
+ openspace.addSceneGraphNode(GalacticLine)
openspace.action.registerAction(ShowGalacticBand)
openspace.action.registerAction(HideGalacticBand)
end)
@@ -68,14 +67,15 @@ end)
asset.onDeinitialize(function()
openspace.action.removeAction(HideGalacticBand)
openspace.action.removeAction(ShowGalacticBand)
- openspace.removeSceneGraphNode(GalacticBand)
+ openspace.removeSceneGraphNode(GalacticLine)
end)
-asset.export(GalacticBand)
+asset.export(GalacticLine)
asset.export("ShowGalacticBand", ShowGalacticBand.Identifier)
asset.export("HideGalacticBand", HideGalacticBand.Identifier)
+
asset.meta = {
Name = "Galactic Line",
Description = [[A line representation of the Galactic Equator plane, including actions
diff --git a/data/assets/nightsky/light_pollution.asset b/data/assets/nightsky/light_pollution.asset
index 84b2e6a68d..4dba3318bf 100644
--- a/data/assets/nightsky/light_pollution.asset
+++ b/data/assets/nightsky/light_pollution.asset
@@ -42,7 +42,6 @@ local LightPollutionSphere = {
Orientation = "Inside",
MirrorTexture = true,
FadeOutThreshold = 1.00,
- Background = true,
RenderBinMode = "PostDeferredTransparent",
Enabled = asset.enabled
},
@@ -51,7 +50,7 @@ local LightPollutionSphere = {
Description = [[A sphere used to simulate the effect of light pollution on
the night sky. Different pollution levels can be set using the provided actions.
These alter the opacity of the sphere.]],
- Path = "/Other/Night Sky",
+ Path = "/Night Sky/Effects",
Hidden = false
}
}
diff --git a/data/assets/nightsky/meridian.asset b/data/assets/nightsky/meridian.asset
index 79673acb00..e855406882 100644
--- a/data/assets/nightsky/meridian.asset
+++ b/data/assets/nightsky/meridian.asset
@@ -24,7 +24,7 @@ local MeridianPosition = {
},
GUI = {
Name = "Local Meridian Position",
- Path = "/Other/Lines",
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
Hidden = true
}
}
@@ -41,17 +41,16 @@ local MeridianPlane = {
Renderable = {
Type = "RenderableRadialGrid",
Opacity = 0.8,
- Color = { 1.0, 1.0, 1.0 },
- LineWidth = 3.0,
+ Color = { 0.4, 0.8, 0.4 },
+ LineWidth = 6.0,
GridSegments = { 1, 1 },
- Radii = { 0.5, 0.5 },
Enabled = asset.enabled,
RenderBinMode = "PostDeferredTransparent"
},
GUI = {
Name = "Local Meridian",
Description = [[A line representation of the Local Meridian]],
- Path = "/Other/Lines"
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
}
}
@@ -121,6 +120,7 @@ asset.export("HideMeridian", HideMeridian.Identifier)
asset.export("ToggleMeridian", ToggleMeridian.Identifier)
+
asset.meta = {
Name = "Meridian",
Description = [[A line representation of the Local Meridian, including actions
diff --git a/data/assets/nightsky/nightsky.asset b/data/assets/nightsky/nightsky.asset
index 7805b575d0..b2f428af7b 100644
--- a/data/assets/nightsky/nightsky.asset
+++ b/data/assets/nightsky/nightsky.asset
@@ -11,6 +11,7 @@ asset.require("actions/nightsky/camera", false)
asset.require("actions/nightsky/daytime", false)
+
asset.meta = {
Name = "Night Sky Assets",
Description = [[A collection of assets useful for studying the night sky.]],
diff --git a/data/assets/nightsky/planets.asset b/data/assets/nightsky/planets.asset
index 7830ac0d3d..13d88df45f 100644
--- a/data/assets/nightsky/planets.asset
+++ b/data/assets/nightsky/planets.asset
@@ -32,7 +32,7 @@ local Mercury = {
Name = "Night Sky Mercury",
Description = [[A night sky version of the planet Mercury, making it visible as
a bright object on the sky (textured representation).]],
- Path = "/Other/Night Sky/Planets"
+ Path = "/Night Sky/Planets"
}
}
@@ -54,7 +54,7 @@ local Venus = {
Name = "Night Sky Venus",
Description = [[A night sky version of the planet Venus, making it visible as
a bright object on the sky (textured representation).]],
- Path = "/Other/Night Sky/Planets"
+ Path = "/Night Sky/Planets"
}
}
@@ -74,7 +74,7 @@ local Mars = {
Tag = { "nightsky_billboard" },
GUI = {
Name = "Night Sky Mars",
- Path = "/Other/Night Sky/Planets"
+ Path = "/Night Sky/Planets"
}
}
@@ -96,7 +96,7 @@ local Jupiter = {
Name = "Night Sky Jupiter",
Description = [[A night sky version of the planet Jupiter, making it visible as
a bright object on the sky (textured representation).]],
- Path = "/Other/Night Sky/Planets"
+ Path = "/Night Sky/Planets"
}
}
@@ -118,7 +118,7 @@ local Saturn = {
Name = "Night Sky Saturn",
Description = [[A night sky version of the planet Saturn, making it visible as
a bright object on the sky (textured representation).]],
- Path = "/Other/Night Sky/Planets"
+ Path = "/Night Sky/Planets"
}
}
@@ -208,6 +208,7 @@ asset.export("HideNightSkyPlanets", HideNightSkyPlanets.Identifier)
asset.export("ToggleNightSkyPlanets", ToggleNightSkyPlanets.Identifier)
+
asset.meta = {
Name = "Night Sky Planets",
Description = [[A collection of night sky versions of the planets Mercury, Venus,
diff --git a/data/assets/nightsky/zenith.asset b/data/assets/nightsky/zenith.asset
index 4cdfd4acca..ddbdd3a760 100644
--- a/data/assets/nightsky/zenith.asset
+++ b/data/assets/nightsky/zenith.asset
@@ -33,7 +33,7 @@ local ZenithPosition = {
},
GUI = {
Name = "Zenith Position",
- Path = "/Other/Points",
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth",
Hidden = true
}
}
@@ -61,7 +61,7 @@ local ZenithDot = {
Description = [[A dot representation of the Local Zenith, based on the camera's
current position on a planet. Use the provided show or toggle action to move it
between planets. The default is Earth.]],
- Path = "/Other/Points"
+ Path = "/Night Sky/Coordinate Systems/Altitude-Azimuth"
}
}
@@ -129,6 +129,7 @@ asset.export("HideZenith", HideZenith.Identifier)
asset.export("ToggleZenith", ToggleZenith.Identifier)
+
asset.meta = {
Name = "Zenith",
Description = [[A dot representation of the Local Zenith (based on the current
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index 34602de58f..0297cc93db 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -1,8 +1,8 @@
local textures = asset.resource({
- Name = "2dF Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_2dF_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
@@ -41,20 +41,13 @@ local Object = {
},
GUI = {
Name = "2dF Galaxies",
- Path = "/Universe/Galaxies",
- Description = [[Census 229,293 galaxies. DU Version 1.7.
The Two-degree Field
- (2dF) Survey was a project designed to map portions of the extragalactic universe. The
- 2dF instrument was mounted on the 3.9-meter (12.8-foot) Anglo-Australian Telescope
- (AAT), located 450 km (280 miles) northwest of Sydney. The telescope has a two-degree
- field of view on the sky, enabling large parts of the sky to be observed at one time.
- For each pointing of the telescope, the instrument can acquire up to 400 spectra
- simultaneously via optical fibers that feed into two spectrographs. Each spectrograph
- sees light that is between 350 nm and 800 nm, spanning the visible spectrum.
- The 2dF survey has three main components: the North Galactic Pole strip, the South
- Galactic Pole strip, and the random fields that surround the South Galactic Pole
- strip. The galaxy survey is composed of about 230,000 galaxies with brightness and
- redshift measurements. (Description from URL)
Data Reference: 2dF Galaxy
- Redshift Survey (2dFGRS Team, 1998-2003)]]
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[The Two-degree Field (2dF) Survey was a project designed to map
+ portions of the extragalactic universe. The 2dF survey has three main components:
+ the North Galactic Pole strip, the South Galactic Pole strip, and the random fields
+ that surround the South Galactic Pole strip. Colors: Orange galaxies show dense
+ regions of galaxies, aqua galaxies are areas of intermediate density, and green
+ galaxies are areas of lower density. Census: 229,293 galaxies.]]
}
}
@@ -73,7 +66,7 @@ asset.export(Object)
asset.meta = {
Name = "2dF Galaxies",
- Description = "Digital Universe asset for the The Two-degree Field (2dF) Survey",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index b8ec2ba045..f05c1d84d0 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -1,8 +1,8 @@
local textures = asset.resource({
- Name = "2MASS Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_2mass_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
@@ -42,14 +42,14 @@ local Object = {
},
GUI = {
Name = "2MASS Galaxies",
- Path = "/Universe/Galaxies",
+ Path = "/Universe/Nearby Surveys",
Description = [[The Two Micron All-Sky Survey (2MASS) is an infrared survey of the
- sky published in 2003. Because it is looking in the infrared, and this is a composite
- of the 2MASS point-source catalog, most of the light from this survey is starlight. In
- visible light, clouds of gas and dust obscure our view. However, in infrared, the
- longer wavelengths of light can penetrate these clouds without being scattered,
- thereby revealing stars that would normally be hidden to our eye.
- (Description from URL)]]
+ sky published in 2003. Taken from two telescopes in Arizona and Chile, it offers an
+ all-sky view of galaxies beyond the Milky Way. Because it is infrared, the light
+ detected is mostly from cool stars within the galaxies, which comprises the majority
+ of mass in a galaxy. Colors: Orange galaxies show dense regions of galaxies, aqua
+ galaxies are areas of intermediate density, and green galaxies are areas of lower
+ density. Census: 43,533 galaxies.]]
}
}
@@ -68,7 +68,7 @@ asset.export(Object)
asset.meta = {
Name = "2MASS Galaxies",
- Description = "Digital Universe asset for the Two Micron All-Sky Survey (2MASS) survey",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index c1de5b1b9e..48039ecc6e 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -1,8 +1,8 @@
local textures = asset.resource({
- Name = "6dF Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_6dF_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
@@ -42,18 +42,13 @@ local Object = {
},
GUI = {
Name = "6dF Galaxies",
- Path = "/Universe/Galaxies",
- Description = [[Census 109,569 galaxies. DU Version 1.4.
The Six-degree Field
- (6dF) Galaxy Survey mapped nearly half the sky from the Anglo-Australian
- Observatory. Unlike previous datasets, this one is not all-sky, meaning there
- are patches of sky that are not covered. In this case, the entire northern
- hemisphere has no coverage at all. This catalog overlaps with the Tully
- dataset, and there is a noticeable difference in the quality of these
- datasets. Tully is much tighter and the structure is more apparent, while the
- 6dF data are more spread out. This is because of local motions within galaxy
- clusters have not been corrected in these data. (Description from URL)
-
Data Reference: The 6dF Galaxy Survey Redshift Catalogue
- (Jones+, 2009)]]
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[The Six-degree Field (6dF) Galaxy Survey mapped nearly half the sky
+ from the Anglo-Australian Observatory. Because it's a southern hemisphere survey,
+ there is no coverage in these data for the northern hemisphere's sky. As with all
+ galaxy surveys, the organge galaxies are in relatively dense areas, the green
+ galaxies are in relatively sparse areas, and the aqua galaxies are between. Census:
+ 109,569 galaxies.]]
}
}
@@ -72,7 +67,7 @@ asset.export(Object)
asset.meta = {
Name = "6dF Galaxies",
- Description = "Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 51d563b570..dce457d151 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -1,8 +1,8 @@
local textures = asset.resource({
- Name = "Abell Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_abell_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
@@ -30,7 +30,7 @@ local Object = {
File = speck .. "abell.label",
Opacity = 1.0,
Color = { 0.0, 0.8, 0.0 },
- Size = 22,
+ Size = 21.2,
MinMaxSize = { 10, 12 },
Unit = "Mpc",
TransformationMatrix = TransformMatrix
@@ -46,26 +46,21 @@ local Object = {
Unit = "Mpc",
TransformationMatrix = TransformMatrix,
SizeSettings = {
- ScaleExponent = 22.6,
+ ScaleExponent = 23.2,
MaxSize = 0.27,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Abell Galaxy Clusters",
- Path = "/Universe/Galaxies",
- Description = [[Census 2,246 galaxies. DU Version 1.4.
The Abell catalog
- includes all the nearby, and not so nearby, galaxy clusters. The northern
- hemisphere survey, published in 1958, was compiled by George Abell (1927-1983)
- from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog
- was published posthumously in 1989. Further analysis by Brent Tully determined
- their distance and three-dimensional distribution. Each point in this data set
- represents a cluster of tens to hundreds (possibly even thousands) of
- galaxies, similar to the Virgo or Fornax Clusters. You will notice some points
- are assigned colors while most are gray. The data set also has an arbitrary
- cut-off for completeness, resulting in the rectangular shape of the data set.
- (Description from URL)
Data Reference: Abell Clusters of Rich
- Galaxies, Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[The Abell catalog includes all the nearby, and not so nearby, galaxy
+ clusters. The northern hemisphere survey, published in 1958, was compiled by George
+ Abell from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog
+ was published posthumously in 1989. Each point in this data set represents a
+ cluster of tens to hundreds (possibly even thousands) of galaxies, similar to the
+ Virgo or Fornax Clusters. The data have an arbitrary cut-off for completeness,
+ resulting in the rectangular shape of the data set. Census: 2,246 galaxy clusters.]]
}
}
@@ -84,7 +79,7 @@ asset.export(Object)
asset.meta = {
Name = "Abell Galaxy Clusters",
- Description = "Digital Universe asset for The Abell catalog",
+ Description = Object.GUI.Description,
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset b/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset
new file mode 100644
index 0000000000..caf7cfde10
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/allsky_hydrogenalpha.asset
@@ -0,0 +1,67 @@
+local textures = asset.resource({
+ Name = "Multiwavelength Milky Way Textures",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_multiwavelength_milkyway_textures",
+ Version = 1
+})
+
+
+local Object = {
+ Identifier = "AllSky_HAlpha",
+ Transform = {
+ Rotation = {
+ Type = "StaticRotation",
+ Rotation = { 0, 0, math.pi }
+ }
+ },
+ Renderable = {
+ Type = "RenderableSphereImageLocal",
+ Enabled = false,
+ Size = 9.2E21,
+ Segments = 40,
+ Opacity = 0.4,
+ Texture = textures .. "mwHalpha-f.png",
+ Orientation = "Inside",
+ MirrorTexture = true,
+ FadeOutThreshold = 0.025
+ },
+ GUI = {
+ Name = "Hydrogen Alpha",
+ Path = "/Milky Way/All Sky Images",
+ Description = [[Hydrogen-alpha is a term that describes light from the ground state of
+ the hydrogen atom. When an electron in an atom moves from one energy level to a
+ higher one, we say the atom is excited. When the electron moves back down to the
+ lower energy level, light is released at a wavelength commensurate with the energy
+ between the two levels. For the H-alpha line, this energy difference translates to a
+ wavelength in the extreme red end of the visible spectrum. This survey of the sky is
+ a snapshot of light from this wavelength.
+
+ One distinctive element of the sky at this wavelength is the presence of large,
+ spherical bubbles surrounding hot stars. Many nebulae and star-forming regions are
+ visible, including the Great Nebula of Orion. We also see that galaxies emit H-alpha
+ light, including the Andromeda Galaxy and the faint M33, the large face-on spiral in
+ Triangulum, and the Large and Small Magellanic Clouds (LMC and SMC) in the southern
+ sky. Census: 1 all-sky image.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "Milky Way All-Sky Hydrogen Alpha",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Carter Emmart (AMNH), OpenSpace Team",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+ License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/allsky_visible.asset b/data/assets/scene/digitaluniverse/allsky_visible.asset
new file mode 100644
index 0000000000..437d4f492c
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/allsky_visible.asset
@@ -0,0 +1,59 @@
+local textures = asset.resource({
+ Name = "Milky Way All Sky Textures",
+ Type = "HttpSynchronization",
+ Identifier = "milkyway_textures",
+ Version = 2
+})
+
+
+local Object = {
+ Identifier = "AllSky_Visible",
+ Transform = {
+ Rotation = {
+ Type = "StaticRotation",
+ Rotation = { 0, 0, math.pi }
+ }
+ },
+ Renderable = {
+ Type = "RenderableSphereImageLocal",
+ Size = 9.2E21,
+ Segments = 40,
+ Opacity = 0.25,
+ Texture = textures .. "DarkUniverse_mellinger_4k.jpg",
+ Orientation = "Inside",
+ MirrorTexture = true,
+ FadeOutThreshold = 0.0015,
+ DimInAtmosphere = true
+ },
+ Tag = { "daytime_hidden" },
+ GUI = {
+ Name = "Visible Milky Way",
+ Path = "/Milky Way/All Sky Images",
+ Description = [[An all-sky image of the night sky as our eye sees it (in the visible
+ spectrum), with the stars removed. You will see the brightest part of the Galaxy if
+ you look toward Galactic center toward the constellations Scorpius and Sagittarius.
+ This bright haze is the light from millions of stars; the dark lanes are foreground
+ dust clouds, obscuring our view of the stars behind them. Census: 1 all-sky image.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "Milky Way All-Sky Visible Light",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Carter Emmart (AMNH), OpenSpace Team",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+ License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 7d14086700..04e2dff18c 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
Name = "Alternate Star Labels Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_alternatestarlabels_speck",
- Version = 2
+ Version = 3
})
@@ -13,10 +13,10 @@ local Object = {
Enabled = false,
Labels = {
Enabled = true,
- File = speck .. "altstarlabels.label",
+ File = speck .. "stars_alt_labels.label",
Color = { 0.4, 0.4, 0.4 },
Size = 14.7,
- MinMaxSize = { 6, 20 },
+ MinMaxSize = { 15, 20 },
Unit = "pc"
},
Opacity = 0.65,
@@ -25,13 +25,9 @@ local Object = {
GUI = {
Name = "Stars Labels - Alternate",
Path = "/Milky Way/Stars",
- Description = [[Census 3,395 star names. DU Version 1.8.
The main star data
- identify the accepted IAU star names for the brightest stars. However, astronomers
- have long cataloged thousands of stars beyond the brightest ones we see. Several
- attempts over thousands of years to name all the visible stars have led to two
- main catalogs: Johann Bayer's Catalog from 1603 and John Flamsteed's Catalog
- published in 1725. (Description from URL)
Data Reference: Various
- sources]]
+ Description = [[Alternate star labels for the stars. Priority goes to Bayer IDs
+ (Greek designations, like Alpha Orionis), then to Flamsteed numbers (like 1
+ Orionis).]]
}
}
@@ -49,9 +45,9 @@ asset.export(Object)
asset.meta = {
- Name = "Stars Labels - Alternate",
- Description = "Digital Universe asset for alternate start labels",
- Author = "Brian Abbott (AMNH)",
+ Name = "Alternative Labels for the Stars",
+ Description = Object.GUI.Description,
+ Author = "Zack Reeves, Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index c92e587606..e1a753a756 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -13,6 +13,38 @@ local textures = asset.resource({
})
+local COBE = {
+ Identifier = "COBE",
+ Transform = {
+ Rotation = {
+ Type = "StaticRotation",
+ Rotation = { 0, 0, math.pi }
+ }
+ },
+ Renderable = {
+ Type = "RenderableSphereImageLocal",
+ Enabled = false,
+ Size = 3975.41417036064E23,
+ Segments = 80,
+ Opacity = 0.5,
+ Texture = textures .. "COBErect.png",
+ Orientation = "Both",
+ MirrorTexture = true,
+ FadeInThreshold = 0.4
+ },
+ GUI = {
+ Name = "1990 COBE CMB",
+ Path = "/Universe/Cosmic Microwave Background",
+ Description = [[In 1990, COBE, the Cosmic Background Explorer, took the first
+ detailed map of the cosmic microwave background light. The red areas are
+ relatively hotter areas of the CMB, while the blue areas are cooler than the
+ average. The lines of latitude and longitude are baked into this image, and
+ reflect galactic coordinates. Image resolution is 7 degrees. Census: 1
+ all-sky image.]]
+ }
+}
+
+
local WMAP = {
Identifier = "WMAP",
Transform = {
@@ -33,35 +65,16 @@ local WMAP = {
FadeInThreshold = 0.4
},
GUI = {
- Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
- Path = "/Universe/Cosmic Microwave Background"
+ Name = "2003 WMAP CMB",
+ Path = "/Universe/Cosmic Microwave Background",
+ Description = [[WMAP, the Wilkinson Microwave Anisotropy Probe, released this all-sky
+ image of the cosmic microwave background light in 2003. The blue colors are slightly
+ cooler than average and red is slightly warmer, with fluctuations of about a
+ 100,000th of a degree above or below the average. The resolution on this image is
+ 0.5 degrees. Census: 1 all-sky image.]]
}
}
-local CBE = {
- Identifier = "CBE",
- Transform = {
- Rotation = {
- Type = "StaticRotation",
- Rotation = { 0, 0, math.pi }
- }
- },
- Renderable = {
- Type = "RenderableSphereImageLocal",
- Enabled = false,
- Size = 3975.41417036064E23,
- Segments = 80,
- Opacity = 0.5,
- Texture = textures .. "COBErect.png",
- Orientation = "Both",
- MirrorTexture = true,
- FadeInThreshold = 0.4
- },
- GUI = {
- Name = "Cosmic Background Explorer",
- Path = "/Universe/Cosmic Microwave Background"
- }
-}
local Planck = {
Identifier = "Planck",
@@ -83,67 +96,43 @@ local Planck = {
FadeInThreshold = 0.4
},
GUI = {
- Name = "Planck",
- Path = "/Universe/Cosmic Microwave Background"
- }
-}
-
-
-local HAlpha = {
- Identifier = "HAlpha",
- Transform = {
- Rotation = {
- Type = "StaticRotation",
- Rotation = { 0, 0, math.pi }
- }
- },
- Renderable = {
- Type = "RenderableSphereImageLocal",
- Enabled = false,
- Size = 9.2E21,
- Segments = 40,
- Opacity = 0.4,
- Texture = textures .. "mwHalpha-f.png",
- Orientation = "Inside",
- MirrorTexture = true,
- FadeOutThreshold = 0.025,
- Background = true
- },
- GUI = {
- Name = "H Alpha",
- Path = "/Milky Way/All Sky Images"
+ Name = "2013 Planck CMB",
+ Path = "/Universe/Cosmic Microwave Background",
+ Description = [[The Planck mission's 2013 image of the cosmic microwave background
+ light release is the most detailed view of the CMB we have to date. The orange
+ areas represent the slightly hotter areas, and the blue areas show the areas that
+ are slightly cooler. The resolution on this image is 0.16 degrees. Census: 1
+ all-sky image.]]
}
}
asset.onInitialize(function()
+ openspace.addSceneGraphNode(COBE)
openspace.addSceneGraphNode(WMAP)
- openspace.addSceneGraphNode(CBE)
openspace.addSceneGraphNode(Planck)
- openspace.addSceneGraphNode(HAlpha)
end)
asset.onDeinitialize(function()
- openspace.removeSceneGraphNode(HAlpha)
openspace.removeSceneGraphNode(Planck)
- openspace.removeSceneGraphNode(CBE)
openspace.removeSceneGraphNode(WMAP)
+ openspace.removeSceneGraphNode(COBE)
end)
+asset.export(COBE)
asset.export(WMAP)
-asset.export(CBE)
asset.export(Planck)
-asset.export(HAlpha)
asset.meta = {
- Name = "Background Radiation",
- Description = [[Various AllSky images for the Milky Way and observable Universe.
- Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
- Planck, and H Alpha
Data Reference: Planck/ESA and the Planck
- Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
- Finkbeiner (Princeton)]],
+ Name = "Cosmic Microwave Background",
+ Description = [[All-sky images of the Cosmic Microwave Background Light. The CMB has
+ been mapped by three main missions: COBE, WMAP, and Planck. The images are not true
+ all-sky images because the light from our own galaxy has been subtracted out of them.
+ From the discovery of the CMB in 1964, to the three space telescopes whose images we
+ see in this asset, we've gained a more detailed view of the CMB light, thereby telling
+ us more about the origin of the universe.]],
Author = "Brian Abbott (AMNH), OpenSpace Team",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/brown_dwarfs.asset b/data/assets/scene/digitaluniverse/brown_dwarfs.asset
new file mode 100644
index 0000000000..768a4791d6
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/brown_dwarfs.asset
@@ -0,0 +1,79 @@
+local textures = asset.resource({
+ Name = "Point Textures",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
+})
+
+local speck = asset.resource({
+ Name = "Brown Dwarf Speck Files",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_brown_dwarfs_speck",
+ Version = 1
+})
+
+
+local Object = {
+ Identifier = "BrownDwarfs",
+ Renderable = {
+ Type = "RenderablePointCloud",
+ Enabled = false,
+ File = speck .. "bd.speck",
+ Texture = {
+ File = textures .. "point3.png"
+ },
+ Unit = "pc",
+ Coloring = {
+ FixedColor = { 0.4, 0.0, 0.1 },
+ ColorMapping = {
+ File = speck .. "bd.cmap",
+ ParameterOptions = {
+ { Key = "typeindex", Range = { 1.0, 4.0 } }
+ }
+ }
+ },
+ SizeSettings = {
+ ScaleExponent = 15.8,
+ MaxSize = 0.7,
+ EnableMaxSizeControl = true
+ }
+ },
+ GUI = {
+ Name = "Brown Dwarfs",
+ Path = "/Milky Way/Substellar Objects",
+ Description = [[For decades it was believed that M stars were the coolest stars in
+ the Galaxy. Some M stars, called red dwarfs, make up 70% of the stars in the
+ Galaxy. However, a new class of objects, even cooler than M stars, was recently
+ discovered and given a spectral type of L. L-type objects straddle the boundary
+ between red dwarfs and brown dwarfs and they are typically very dim stars or brown
+ dwarfs. Even cooler than L-type objects are T-type objects. These are mostly brown
+ dwarfs and resemble large, massive, Jupiter-like objects, too large to be planets
+ and typically too small to be stars. Beyond the T dwarfs are the Y-type objects,
+ which are even more dim. Brown dwarfs are extremely difficult to see, mainly because
+ they are so dim in optical light. However, they appear brighter in infrared light.
+ Colors: We represent these objects as exaggeratged points and they are either red
+ for L type objects, Maroon for T type, and purple for Y type objects. Census:
+ 2,196 objects.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "Brown Dwarfs",
+ Author = "Brian Abbott, Zack Reeves, Jackie Faherty (AMNH)",
+ Description = Object.GUI.Description,
+ License = "AMNH Digital Universe",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+}
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index 1858cdd07a..b366279854 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -35,10 +35,12 @@ local Object = {
}
},
GUI = {
- Name = "Constellation Bounds",
+ Name = "Constellation Boundaries",
Path = "/Milky Way/Constellations",
- Description = [[A Spherical mesh dividing the sky into regions that fit the
- constellations]]
+ Description = [[As a continent is divided into countries, astronomers divide the sky
+ into 88 regions called constellations. Every object falls into one of these 88
+ regions. The boundaries of these regions are shown in this asset. Use these in
+ concert with the constellation labels. Census: 88 constellations.]]
}
}
@@ -57,8 +59,7 @@ asset.export(Object)
asset.meta = {
Name = "Constellation Bounds",
- Description = [[DU asset providing a Spherical mesh dividing the sky into regions that
- fit the constellations]],
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 2258107161..49a0768069 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -6,7 +6,7 @@ local speck = asset.resource({
Name = "Constellation Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_constellations_data",
- Version = 2
+ Version = 3
})
@@ -35,31 +35,6 @@ local function zodiacsString(zodiacsList)
return zodiacsString
end
-local ConstellationsExtragalactic = {
- Identifier = "ConstellationsExtragalactic",
- Renderable = {
- Type = "RenderableConstellationLines",
- Enabled = false,
- Labels = {
- File = speck .. "constellationsEXGAL.label",
- Opacity = 0.4,
- Color = { 0.8, 0.8, 0.8 },
- Size = 20.0,
- MinMaxSize = { 20, 30 },
- Unit = "Mpc"
- },
- Opacity = 0.4,
- File = speck .. "constellationsEXGAL.speck",
- NamesFile = speck .. "constellations.dat",
- Colors = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
- Unit = "Mpc",
- -- Selection = zodiacs
- },
- GUI = {
- Name = "Constellations (Extragalactic)",
- Path = "/Milky Way/Constellations"
- }
-}
local Constellations = {
Identifier = "Constellations",
@@ -67,7 +42,7 @@ local Constellations = {
Type = "RenderableConstellationLines",
Enabled = false,
Labels = {
- File = speck .. "constellations.label",
+ File = speck .. "constellation_lines.label",
Opacity = 0.3,
Color = { 0.8, 0.8, 0.8 },
Size = 14.5,
@@ -75,7 +50,7 @@ local Constellations = {
Unit = "pc"
},
Opacity = 0.3,
- File = speck .. "constellations.speck",
+ File = speck .. "constellation_lines.speck",
NamesFile = speck .. "constellations.dat",
Colors = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
Unit = "pc",
@@ -83,17 +58,14 @@ local Constellations = {
},
Tag = { "daytime_hidden" },
GUI = {
- Name = "Constellations",
+ Name = "Constellation Lines",
Path = "/Milky Way/Constellations",
- Description = [[Census 88 constellations and labels. DU Version 3.4.
These
- modern constellations are largely based on those of the Babylonians and
- Greeks; however, most cultures have their own figures and stories of the sky.
- More than half the official constellations adopted by scientists in 1930 were
- known to the ancients over 2,000 years ago. Each star falls into one of these
- 88 regions. Of course, today we know the stars in any given constellation do
- not necessarily have any physical relationship with one another. One star may
- be nearby, while an adjacent star in the sky may be far away.(Description
- from URL)
Data Reference: various]]
+ Description = [[Lines connecting the stars that make up the constellation figures.
+ We represent the constellations by connecting the main stars that make up the
+ constellation "stick figures," as seen from Earth. Colors: most constellations
+ are pink, while the zodical constellations are red. We also color Orion and Ursa
+ Major blue as two recognizable constellations in the night sky. Census: 88
+ constellations.]]
}
}
@@ -137,7 +109,6 @@ local ShowZodiacs = {
asset.onInitialize(function()
- openspace.addSceneGraphNode(ConstellationsExtragalactic)
openspace.addSceneGraphNode(Constellations)
openspace.action.registerAction(ShowConstellations)
@@ -151,10 +122,8 @@ asset.onDeinitialize(function()
openspace.action.removeAction(ShowConstellations)
openspace.removeSceneGraphNode(Constellations)
- openspace.removeSceneGraphNode(ConstellationsExtragalactic)
end)
-asset.export(ConstellationsExtragalactic)
asset.export(Constellations)
asset.export("ShowConstellations", ShowConstellations.Identifier)
asset.export("HideConstellations", HideConstellations.Identifier)
@@ -163,9 +132,8 @@ asset.export("ShowZodiacs", ShowZodiacs.Identifier)
asset.meta = {
- Name = "Constellations",
- Description = "Digital Universe asset for constellation lines",
- Author = "Brian Abbott (AMNH)",
+ Description = Constellations.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index f7d75e7f3e..3973a79262 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -49,7 +49,7 @@ local DeepSkyObjects = {
},
GUI = {
Name = "Deep Sky Objects Points",
- Path = "/Universe/Galaxies",
+ Path = "/Universe/Nearby Surveys",
Description = "Point cloud and labels for Deep Sky Objects"
}
}
@@ -87,7 +87,7 @@ local DeepSkyObjectsImages = {
},
GUI = {
Name = "Deep Sky Objects Images",
- Path = "/Universe/Galaxies",
+ Path = "/Universe/Nearby Surveys",
Description = [[Census: 63 images and labels. DU Version 1.3.
These data are
2-D images of Messier objects placed in 3-D space. Not only do we place these
images at the proper location and give them the correct orientation, we also
diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset
index 2c7c8ef4dc..36ff48a180 100644
--- a/data/assets/scene/digitaluniverse/digitaluniverse.asset
+++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset
@@ -3,44 +3,46 @@ asset.require("./2dF")
asset.require("./2mass")
asset.require("./6dF")
asset.require("./abell")
-asset.require("./alternatestarlabels")
+asset.require("./allsky_hydrogenalpha")
+asset.require("./allsky_visible")
asset.require("./backgroundradiation")
asset.require("./backgroundradiation_multiverse")
-asset.require("./clusters")
+asset.require("./brown_dwarfs")
+asset.require("./galaxy_clusters")
asset.require("./constellationbounds")
asset.require("./constellations")
-asset.require("./deepsky")
-asset.require("./dwarfs")
asset.require("./exoplanets")
asset.require("./exoplanets_candidates")
asset.require("./globularclusters")
asset.require("./grids")
-asset.require("./groups")
+asset.require("./galaxy_groups")
asset.require("./h2regions")
-asset.require("./localdwarfs")
+asset.require("./local_group_dwarfs")
asset.require("./milkyway")
asset.require("./milkyway_arm_labels")
asset.require("./milkyway_label")
-asset.require("./milkyway_sphere")
asset.require("./obassociations")
+asset.require("./oort_cloud")
asset.require("./openclusters")
asset.require("./planetarynebulae")
asset.require("./pulsars")
asset.require("./quasars")
asset.require("./starlabels")
+asset.require("./alternatestarlabels")
asset.require("./starorbits")
+asset.require("./star_uncertainty")
asset.require("./stars")
asset.require("./superclusters")
asset.require("./supernovaremnants")
asset.require("./tully")
asset.require("./voids")
+asset.require("./white_dwarfs")
asset.meta = {
Name = "Digital Universe",
- Description = [[This asset is a meta asset, containing all the assets from the AMNH
- Digital Universe]],
+ Description = [[This asset is a meta asset, containing all the assets from the AMNH Digital Universe.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
deleted file mode 100644
index 4d7d93caf0..0000000000
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ /dev/null
@@ -1,91 +0,0 @@
-local textures = asset.resource({
- Name = "Brown Dwarf Textures",
- Type = "HttpSynchronization",
- Identifier = "digitaluniverse_dwarfs_textures",
- Version = 1
-})
-
-local speck = asset.resource({
- Name = "Brown Dwarf Speck Files",
- Type = "HttpSynchronization",
- Identifier = "digitaluniverse_dwarfs_speck",
- Version = 3
-})
-
-
-local Object = {
- Identifier = "Dwarfs",
- Renderable = {
- Type = "RenderablePointCloud",
- Enabled = false,
- File = speck .. "dwarfs.speck",
- Labels = {
- File = speck .. "dwarfs.label",
- Color = { 0.5, 0.1, 0.2 },
- Size = 14.6,
- MinMaxSize = { 10, 20 },
- Unit = "pc"
- },
- Opacity = 1.0,
- Texture = {
- File = textures .. "point3.png",
- },
- Unit = "pc",
- Coloring = {
- FixedColor = { 0.4, 0.0, 0.1 },
- ColorMapping = {
- File = speck .. "dwarfs.cmap",
- ParameterOptions = {
- { Key = "typeindex", Range = { 1.0, 4.0 } }
- }
- }
- },
- SizeSettings = {
- ScaleExponent = 16.2,
- MaxSize = 0.7,
- EnableMaxSizeControl = true
- }
- },
- GUI = {
- Name = "Brown Dwarfs",
- Path = "/Milky Way",
- Description = [[Census: 785 L dwarfs, 101 T dwarfs, 17 Y dwarfs. DU Version 6.4.
-
In astronomy, there are dwarf stars-red, white, and brown-dwarf novae,
- and even dwarf galaxies. As you might imagine, astronomers use the term dwarf
- when they refer to the smaller objects in any given class. For decades it was
- believed that M stars were the coolest stars in the Galaxy. Some M stars,
- called red dwarfs, make up 70% of the stars in the Galaxy, including our
- nearest known neighbor, Proxima Centauri. However, a new class of objects,
- even cooler than M stars, was recently discovered and given a spectral type
- of L. L-type objects straddle the boundary between red dwarfs and brown
- dwarfs, the latter of which are not massive enough to ignite the nuclear
- processes necessary for it to shine as a star. L-type objects are typically
- very dim stars or brown dwarfs. Even cooler than L-type objects are T-type
- objects. These are mostly brown dwarfs and resemble large, massive,
- Jupiter-like objects, too large to be planets and typically too small to be
- stars. Beyond the T dwarfs are the Y-type objects, which are even more
- dim.(Description from URL)
Data Reference: The Brown Dwarf Kinematics
- Project (Faherty+ 2019)]]
- }
-}
-
-
-asset.onInitialize(function()
- openspace.addSceneGraphNode(Object)
-end)
-
-asset.onDeinitialize(function()
- openspace.removeSceneGraphNode(Object)
-end)
-
-asset.export(Object)
-
-
-
-asset.meta = {
- Name = "Brown Dwarfs",
- Description = "Digital Universe asset for Brown Dwarfs",
- Author = "Brian Abbott (AMNH)",
- URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
- License = "AMNH Digital Universe"
-}
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 933465dbdb..ec0dcdfdf7 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Exoplanets Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_speck",
- Version = 3
+ Version = 4
})
@@ -22,7 +22,7 @@ local Object = {
Labels = {
File = speck .. "expl.label",
Color = { 0.3, 0.3, 0.8 },
- Size = 14.8,
+ Size = 13.75,
MinMaxSize = { 10, 100 },
Unit = "pc"
},
@@ -40,13 +40,14 @@ local Object = {
GUI = {
Name = "Exoplanets",
Path = "/Milky Way/Exoplanets",
- Description = [[Census: 5,361 planets in 3,982 systems. DU Version 20.12.
- Extrasolar planets, or exoplanets, are a relatively new phenomenon in
- astronomy. While many astronomers believed in their existence, no
- observational evidence was available until 1995. Since that time, scientists
- have discovered thousands of systems consisting of one or more planets around
- a host star.(Description from URL)
Data Reference: NASA Exoplanet
- Archive (CalTech/NASA)]]
+ Description = [[Extrasolar planets, or exoplanets, are a relatively new phenomenon in
+ astronomy - no observational evidence was available until 1995. To the eye,
+ exoplanets are lost in the glare of their host star. Unconventional techniques are
+ required to infer or observe them. Here, exoplanet systems are represented by a blue
+ ring centered on each host star. The ring is not intended to signify an orbit, but
+ serve only as a marker. The labels list the host star name, and if there is more
+ than one planet, will list the number of planets in parentheses. Census: 5,589
+ planets in 4,139 systems.]]
}
}
@@ -65,8 +66,8 @@ asset.export(Object)
asset.meta = {
Name = "Exoplanets",
- Description = "Digital Universe asset for Exoplanets",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
index abca6cf097..91d8dcaba8 100644
--- a/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets_candidates.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Exoplanets Candidates Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_exoplanets_candidates_speck",
- Version = 1
+ Version = 2
})
@@ -19,13 +19,19 @@ local Object = {
Type = "RenderablePointCloud",
Enabled = false,
Opacity = 0.99,
- File = speck .. "exoplanet_candidates.speck",
+ File = speck .. "expl_candidates.speck",
Unit = "pc",
Texture = {
File = textures .. "halo.png",
},
Coloring = {
- FixedColor = { 1.0, 1.0, 0.0 }
+ FixedColor = { 1.0, 1.0, 0.0 },
+ ColorMapping = {
+ File = speck .. "expl_candidates.cmap",
+ ParameterOptions = {
+ { Key = "survey_num" }
+ }
+ }
},
SizeSettings = {
ScaleExponent = 17.8,
@@ -34,18 +40,16 @@ local Object = {
}
},
GUI = {
- Name = "Planetary Candidates",
+ Name = "Exoplanetary Candidates",
Path = "/Milky Way/Exoplanets",
- Description = [[Census: 6,082 stars with candidate planetary systems. DU Version 11.8.
-
The exoplanet candidate stars are likely hosts for exoplanets. These are stars
- plucked from NASA's Kepler and TESS space telescopes. The Kepler mission was
- designed to stare at one spot, roughly twelve degrees across, in the constellation
- Cygnus. By staring at one spot, the spacecraft could monitor over 500,000 stars in
- that field for subtle variations in brightness. The data included here are the stars
- that are considered good candidates to host planets. Rather than represent them
+ Description = [[The exoplanet candidate stars are likely hosts for exoplanets. These
+ are stars plucked from NASA's Kepler and TESS space telescopes. Further observations
+ are needed to confirm a planet's existence. Rather than represent them
photo-realistically, with accurate colors, we choose to visualize them as generic,
- pure yellow stars. (Description from URL)
Data Reference: NASA Exoplanet
- Archive (CalTech/NASA)]]
+ colored stars. The nature of these stars is not important, it is the sheer numbers
+ of potential exoplanets that allows us to wonder just how many we will find in the
+ entire Galaxy. Colors: Yellow denote Kepler candidates, Orange stars are from the K2
+ mission, and green stars are from TESS. Census: 7,225 candidate stars.]]
}
}
@@ -63,9 +67,9 @@ asset.export(Object)
asset.meta = {
- Name = "Planetary Candidates",
- Description = "Digital Universe asset for Planetary Candidates",
- Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
+ Name = "Exoplanetary Candidates",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves, Emily Rice, and Jason No (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
similarity index 70%
rename from data/assets/scene/digitaluniverse/clusters.asset
rename to data/assets/scene/digitaluniverse/galaxy_clusters.asset
index 7b8e34a08d..82ca6b29c9 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_clusters.asset
@@ -21,9 +21,9 @@ local Object = {
Labels = {
Enabled = true,
File = speck .. "galclust.label",
- Color = { 1.0, 0.44, 0.0 },
+ Color = { 0.9, 0.5, 0.22 },
Size = 22,
- MinMaxSize = { 8, 20 },
+ MinMaxSize = { 8, 15 },
Unit = "Mpc",
TransformationMatrix = TransformMatrix
},
@@ -33,12 +33,10 @@ local Object = {
},
GUI = {
Name = "Galaxy Cluster Labels",
- Path = "/Universe/Galaxies",
- Description = [[Census 15 galaxy cluster labels. DU Version 1.2.
The Galaxy
- clusters dataset is a series of labels that mark where the large clusters of
- galaxies are in the nearby universe. These labels must be used in conjunction
- with the Tully galaxy group.(Description from URL)
Data Reference:
- Brian Abbott (AMNH)]]
+ Path = "/Universe/Nearby Surveys",
+ Description = [[The galaxy clusters dataset is a series of labels that mark where the
+ large clusters of galaxies are in the nearby universe. These labels must be used in
+ conjunction with the Tully galaxy group. Census: 15 galaxy cluster labels.]]
}
}
@@ -57,7 +55,7 @@ asset.export(Object)
asset.meta = {
Name = "Galaxy Clusters Labels",
- Description = "Digital Universe asset for Galaxy Clusters",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/galaxy_groups.asset
similarity index 72%
rename from data/assets/scene/digitaluniverse/groups.asset
rename to data/assets/scene/digitaluniverse/galaxy_groups.asset
index 6039b93fca..e56532083a 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/galaxy_groups.asset
@@ -21,8 +21,8 @@ local Object = {
Labels = {
Enabled = true,
File = speck .. "groups.label",
- Color = { 0.1, 0.6, 0.2 },
- Size = 21.5,
+ Color = { 0.1, 0.4, 0.2 },
+ Size = 20.4,
MinMaxSize = { 8, 20 },
Unit = "Mpc",
TransformationMatrix = TransformMatrix
@@ -33,11 +33,10 @@ local Object = {
},
GUI = {
Name = "Galaxy Group Labels",
- Path = "/Universe/Galaxies",
- Description = [[Census: 62 galaxy group labels. DU Version 1.2.
The Galaxy
- Groups data are a set of labels that mark the nearby galaxy groups. The Milky Way
- is in the Local Group, and we are surrounded by many other groups.(Description
- from URL)
Data Reference: Brian Abbott (AMNH)]]
+ Path = "/Universe/Nearby Surveys",
+ Description = [[The Galaxy Groups data are a set of labels that mark the nearby
+ galaxy groups. The Milky Way is in the Local Group, and we are surrounded by
+ many other groups delineated by these labels. Census: 62 galaxy group labels.]]
}
}
@@ -57,7 +56,7 @@ asset.export(Object)
asset.meta = {
Name = "Galaxy Group Labels",
Author = "Brian Abbott (AMNH)",
- Description = "Digital Universe asset for Galaxy Groups",
+ Description = Object.GUI.Description,
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index ccc07cc910..c2f97e6a63 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Globular Clusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_globularclusters_speck",
- Version = 2
+ Version = 3
})
@@ -20,7 +20,7 @@ local Object = {
Enabled = false,
Labels = {
File = speck .. "gc.label",
- Color = { 0.5, 0.5, 0.0 },
+ Color = { 0.36, 0.36, 0.0 },
Size = 16.7,
MinMaxSize = { 4, 20 },
Unit = "pc"
@@ -28,32 +28,23 @@ local Object = {
Coloring = {
FixedColor = { 0.8, 0.8, 0.0 }
},
- Opacity = 0.4,
+ Opacity = 0.65,
File = speck .. "gc.speck",
PolygonSides = 5,
Unit = "pc",
SizeSettings = {
- ScaleExponent = 18.9,
+ ScaleExponent = 18.6,
MaxSize = 13.0,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Globular Clusters",
- Path = "/Milky Way",
- Description = [[Census: 157 globular clusters. DU Version 2.6.
Globular star
- clusters are gravitationally bound groups of 100,000 to 1 million stars. They
- are compact, spherical "balls" of stars with very high stellar densities in
- their centers (stars near their center are within a light year of one
- another). These clusters are typically 30 to 100 light years in diameter. If
- Earth were located inside one of these clusters, our sky would be lit by an
- abundance of stars brighter than the Sun. The globular clusters form one of
- the most complete data sets in the Atlas. Data for the clusters represent
- almost all the clusters in our Galaxy—several on the opposite side of Galactic
- center may be invisible to us. The clusters orbit the Milky Way in random
- orientations, as comets orbit the Sun.(Description from URL)
Data
- Reference: Properties of Galactic Globular Clusters, C. Francis+
- (U Cambridge)]]
+ Path = "/Milky Way/Star Clusters",
+ Description = [[Globular star clusters are gravitationally bound groups of 100,000
+ to 1 million stars. They are compact, spherical "balls" of stars with very high
+ stellar densities. These clusters are typically 30 to 100 light years in diameter.
+ Census: 161 globular clusters.]]
}
}
@@ -72,18 +63,8 @@ asset.export(Object)
asset.meta = {
Name = "Globular Clusters",
- Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters
- are gravitationally bound groups of 100,000 to 1 million stars. They are compact,
- spherical "balls" of stars with very high stellar densities in their centers (stars
- near their center are within a light year of one another). These clusters are
- typically 30 to 100 light years in diameter. If Earth were located inside one of these
- clusters, our sky would be lit by an abundance of stars brighter than the Sun. The
- globular clusters form one of the most complete data sets in the Atlas. Data for the
- clusters represent almost all the clusters in our Galaxy—several on the opposite side
- of Galactic center may be invisible to us. The clusters orbit the Milky Way in random
- orientations, as comets orbit the Sun.(Description from URL)
Data Reference:
- Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]],
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index c0b5341290..d36526ba0d 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -66,84 +66,20 @@ local RadioSphere = {
},
GUI = {
Name = "Radio Sphere",
- Path = "/Other/Grids"
- }
-}
-
-local OortSphere = {
- Identifier = "OortSphere",
- Parent = transforms.SolarSystemBarycenter.Name,
- Transform = {
- Scale = {
- Type = "StaticScale",
- Scale = 7.47989845E15
- },
- Rotation = {
- Type = "StaticRotation",
- Rotation = EclipticRotationMatrix
- }
- },
- Renderable = {
- Type = "RenderableSphericalGrid",
- Enabled = false,
- Opacity = 0.8,
- Color = { 0.8, 0.4, 0.4 },
- LineWidth = 2.0
- },
- GUI = {
- Name = "Oort Sphere",
- Path = "/Other/Grids"
- }
-}
-
-local EclipticSphere = {
- Identifier = "EclipticSphere",
- Parent = transforms.SolarSystemBarycenter.Name,
- Transform = {
- Scale = {
- Type = "StaticScale",
- Scale = 9.46377307652E17
- },
- Rotation = {
- Type = "StaticRotation",
- Rotation = EclipticRotationMatrix
- }
- },
- Renderable = {
- Type = "RenderableSphericalGrid",
- Enabled = false,
- Opacity = 1.0,
- Color = { 0.74, 0.26, 0.26 },
- LineWidth = 2.0
- },
- GUI = {
- Name = "Ecliptic Sphere",
- Path = "/Other/Grids"
- }
-}
-
-local EclipticSphereLabels = {
- Identifier = "EclipticSphereLabels",
- Parent = transforms.SolarSystemBarycenter.Name,
- Renderable = {
- Type = "RenderablePointCloud",
- Enabled = false,
- Labels = {
- Enabled = true,
- File = speck .. "eclip.label",
- Color = { 0.5, 0.5, 0.5 },
- Size = 14.75,
- MinMaxSize = { 1, 50 },
- Unit = "pc",
- TransformationMatrix = EclipticTransformationMatrix
- },
- Opacity = 0.65,
- Unit = "pc",
- TransformationMatrix = EclipticTransformationMatrix
- },
- GUI = {
- Name = "Ecliptic Sphere Labels",
- Path = "/Other/Grids"
+ Path = "/Milky Way/Grids",
+ Description = [[The radio sphere describes the theoretical extent of Earth's radio
+ signals in space. Before television carrier waves, early-warning radar first used
+ in World War II, and the detonation of atomic weapons, Earth was radio-quiet to the
+ universe (AM and FM radio signals bounce off the atmosphere and do not escape it).
+ After the use of these and other radio emitters began, in the late 1930s and early
+ 1940s, signals were able to escape the atmosphere and travel into space at the speed
+ of light. Since then, we have been broadcasting to the universe. We mention earlier
+ that this is the theoretical extent of these signals. In reality, these signals
+ will dissipate rapidly into the ambient cosmic noise of the universe. All light
+ falls off as the square of the distance, and radio waves are no different. The
+ signals that emanate from Earth are likely lost in the noise before they leave the
+ solar system, but the radio sphere remains a visually compelling astronomical
+ concept.]]
}
}
@@ -153,7 +89,7 @@ local EquatorialSphere = {
Transform = {
Scale = {
Type = "StaticScale",
- Scale = 4.28601E17
+ Scale = 80 * LightYear
},
Rotation = {
Type = "StaticRotation",
@@ -163,13 +99,16 @@ local EquatorialSphere = {
Renderable = {
Type = "RenderableSphericalGrid",
Enabled = false,
- Opacity = 0.8,
- Color = { 0.69, 0.68, 0.29 },
- LineWidth = 2.0
+ Opacity = 1.0,
+ Color = { 0.3, 0.3, 0.15 },
+ LineWidth = 2.0,
+ GridSegments = { 18, 24 },
},
GUI = {
- Name = "Equatorial Sphere",
- Path = "/Other/Grids"
+ Name = "Equatorial Coordinates",
+ Path = "/Night Sky/Coordinate Systems/Equatorial",
+ Description = [[An 80-light-year sphere representing equatorial coordinates (right
+ ascension and declination).]]
}
}
@@ -193,8 +132,65 @@ local EquatorialSphereLabels = {
TransformationMatrix = EquatorialTransformationMatrix
},
GUI = {
- Name = "Equatorial Sphere Labels",
- Path = "/Other/Grids"
+ Name = "Equatorial Coordinates Labels",
+ Path = "/Night Sky/Coordinate Systems/Equatorial",
+ Description = [[Labels on a sphere representing right ascension in hours and
+ declination in degrees.]]
+ }
+}
+
+local EclipticSphere = {
+ Identifier = "EclipticSphere",
+ Parent = transforms.SolarSystemBarycenter.Name,
+ Transform = {
+ Scale = {
+ Type = "StaticScale",
+ Scale = 100 * LightYear
+ },
+ Rotation = {
+ Type = "StaticRotation",
+ Rotation = EclipticRotationMatrix
+ }
+ },
+ Renderable = {
+ Type = "RenderableSphericalGrid",
+ Enabled = false,
+ Opacity = 1.0,
+ Color = { 0.3, 0.15, 0.15 },
+ LineWidth = 2.0
+ },
+ GUI = {
+ Name = "Ecliptic Coordinates",
+ Path = "/Night Sky/Coordinate Systems/Ecliptic",
+ Description = [[A 100-light-year sphere representing ecliptic coordinates (ecliptic
+ longitude and latitude).]]
+ }
+}
+
+local EclipticSphereLabels = {
+ Identifier = "EclipticSphereLabels",
+ Parent = transforms.SolarSystemBarycenter.Name,
+ Renderable = {
+ Type = "RenderablePointCloud",
+ Enabled = false,
+ Labels = {
+ Enabled = true,
+ File = speck .. "eclip.label",
+ Color = { 0.5, 0.5, 0.5 },
+ Size = 14.5,
+ MinMaxSize = { 1, 50 },
+ Unit = "pc",
+ TransformationMatrix = EclipticTransformationMatrix
+ },
+ Opacity = 0.65,
+ Unit = "pc",
+ TransformationMatrix = EclipticTransformationMatrix
+ },
+ GUI = {
+ Name = "Ecliptic Coordinates Labels",
+ Path = "/Night Sky/Coordinate Systems/Ecliptic",
+ Description = [[Labels on a sphere representing ecliptic longitude and latitude in
+ degrees.]]
}
}
@@ -204,7 +200,7 @@ local GalacticSphere = {
Transform = {
Scale = {
Type = "StaticScale",
- Scale = 9.46377307652E18
+ Scale = 1000 * LightYear
}
},
Renderable = {
@@ -212,11 +208,13 @@ local GalacticSphere = {
Enabled = false,
LineWidth = 2.0,
Opacity = 1.0,
- Color = { 0.0, 0.6, 0.6 }
+ Color = { 0.05, 0.25, 0.25 }
},
GUI = {
- Name = "Galactic Sphere",
- Path = "/Other/Grids"
+ Name = "Galactic Coordinates",
+ Path = "/Night Sky/Coordinate Systems/Galactic",
+ Description = [[A 1000-light-year sphere representing galactic coordinates (galactic
+ longitude and latitude).]]
}
}
@@ -230,7 +228,7 @@ local GalacticSphereLabels = {
Enabled = true,
File = speck .. "galac.label",
Color = { 0.5, 0.5, 0.5 },
- Size = 15.8,
+ Size = 15.5,
MinMaxSize = { 1, 100 },
Unit = "pc"
},
@@ -238,8 +236,10 @@ local GalacticSphereLabels = {
Unit = "pc"
},
GUI = {
- Name = "Galactic Sphere Labels",
- Path = "/Other/Grids"
+ Name = "Galactic Coordinates Labels",
+ Path = "/Night Sky/Coordinate Systems/Galactic",
+ Description = [[Labels on a sphere representing galactic longitude and latitude in
+ degrees.]]
}
}
@@ -258,7 +258,7 @@ local Plane1lh = {
Labels = {
File = speck .. "1lh.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 9.5,
+ Size = 8.9,
MinMaxSize = { 0, 30 },
Unit = "Km"
},
@@ -269,8 +269,9 @@ local Plane1lh = {
Size = { 2 * LightHour, 2 * LightHour }
},
GUI = {
- Name = "1lh Grid",
- Path = "/Other/Grids",
+ Name = "1-light-hour Grid",
+ Path = "/Solar System/Grids",
+ Description = [[A 1-light-hour Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = LightHour
}
}
@@ -301,8 +302,9 @@ local Plane1ld = {
Size = { 2 * LightDay, 2 * LightDay }
},
GUI = {
- Name = "1ld Grid",
- Path = "/Other/Grids",
+ Name = "1-light-day Grid",
+ Path = "/Solar System/Grids",
+ Description = [[A 1-light-day Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = LightDay
}
}
@@ -333,8 +335,9 @@ local Plane1lm = {
Size = { 2 * LightMonth, 2 * LightMonth }
},
GUI = {
- Name = "1lm Grid",
- Path = "/Other/Grids",
+ Name = "1-light-month Grid",
+ Path = "/Solar System/Grids",
+ Description = [[A 1-light-month Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = LightMonth
}
}
@@ -365,8 +368,9 @@ local Plane1ly = {
Size = { 2 * LightYear, 2 * LightYear }
},
GUI = {
- Name = "1ly Grid",
- Path = "/Other/Grids",
+ Name = "1-light-year Grid",
+ Path = "/Solar System/Grids",
+ Description = [[A 1-light-year Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = LightYear
}
}
@@ -397,8 +401,9 @@ local Plane10ly = {
Size = { 10 * 2 * LightYear, 10 * 2 * LightYear }
},
GUI = {
- Name = "10ly Grid",
- Path = "/Other/Grids",
+ Name = "10-light-year Grid",
+ Path = "/Milky Way/Grids",
+ Description = [[A 10-light-year Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = 10 * LightYear
}
}
@@ -429,8 +434,9 @@ local Plane100ly = {
Size = { 100 * 2 * LightYear, 100 * 2 * LightYear }
},
GUI = {
- Name = "100ly Grid",
- Path = "/Other/Grids",
+ Name = "100-light-year Grid",
+ Path = "/Milky Way/Grids",
+ Description = [[A 100-light-year Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = 100 * LightYear
}
}
@@ -461,8 +467,9 @@ local Plane1kly = {
Size = { 1000 * 2 * LightYear, 1000 * 2 * LightYear }
},
GUI = {
- Name = "1kly Grid",
- Path = "/Other/Grids",
+ Name = "1,000-light-year Grid",
+ Path = "/Milky Way/Grids",
+ Description = [[A 1,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = 1000 * LightYear
}
}
@@ -493,8 +500,9 @@ local Plane10kly = {
Size = { 10000 * 2 * LightYear, 10000 * 2 * LightYear }
},
GUI = {
- Name = "10kly Grid",
- Path = "/Other/Grids",
+ Name = "10,000-light-year Grid",
+ Path = "/Milky Way/Grids",
+ Description = [[A 10,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
OrderingNumber = 10000 * LightYear
}
}
@@ -507,7 +515,7 @@ local Plane100kly = {
Labels = {
File = speck .. "100kly.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 18.6,
+ Size = 18.0,
MinMaxSize = { 0, 30 },
Unit = "Mpc"
},
@@ -520,8 +528,9 @@ local Plane100kly = {
Size = { 100000 * 2 * LightYear, 100000 * 2 * LightYear }
},
GUI = {
- Name = "100kly Grid",
- Path = "/Other/Grids",
+ Name = "100,000-light-year Grid",
+ Path = "/Universe/Grids",
+ Description = [[A 100,000-light-year Cartesian grid aligned on the plane of the Milky Way.]],
OrderingNumber = 100000 * LightYear
}
}
@@ -534,7 +543,7 @@ local Plane1Mly = {
Labels = {
File = speck .. "1Mly.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 19.6,
+ Size = 19.0,
MinMaxSize = { 0, 30 },
Unit = "Mpc"
},
@@ -547,8 +556,9 @@ local Plane1Mly = {
Size = { 1E6 * 2 * LightYear, 1E6 * 2 * LightYear }
},
GUI = {
- Name = "1Mly Grid",
- Path = "/Other/Grids",
+ Name = "1-million-light-year Grid",
+ Path = "/Universe/Grids",
+ Description = [[A 1-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
OrderingNumber = 1E6 * LightYear
}
}
@@ -561,7 +571,7 @@ local Plane10Mly = {
Labels = {
File = speck .. "10Mly.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 20.6,
+ Size = 20.3,
MinMaxSize = { 0, 30 },
Unit = "Mpc"
},
@@ -574,8 +584,9 @@ local Plane10Mly = {
Size = { 10E6 * 2 * LightYear, 10E6 * 2 * LightYear }
},
GUI = {
- Name = "10Mly Grid",
- Path = "/Other/Grids",
+ Name = "10-million-light-year Grid",
+ Path = "/Universe/Grids",
+ Description = [[A 10-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
OrderingNumber = 10E6 * LightYear
}
}
@@ -588,7 +599,7 @@ local Plane100Mly = {
Labels = {
File = speck .. "100Mly.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 21.6,
+ Size = 20.9,
MinMaxSize = { 0, 30 },
Unit = "Mpc"
},
@@ -601,8 +612,9 @@ local Plane100Mly = {
Size = { 100E6 * 2 * LightYear, 100E6 * 2 * LightYear }
},
GUI = {
- Name = "100Mly Grid",
- Path = "/Other/Grids",
+ Name = "100-million-light-year Grid",
+ Path = "/Universe/Grids",
+ Description = [[A 100-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
OrderingNumber = 100E6 * LightYear
}
}
@@ -615,7 +627,7 @@ local Plane20Gly = {
Labels = {
File = speck .. "20Gly.label",
Color = { 0.0, 0.2, 0.5 },
- Size = 23.6,
+ Size = 23.1,
MinMaxSize = { 0, 30 },
Unit = "Mpc"
},
@@ -628,8 +640,9 @@ local Plane20Gly = {
Size = { 20E9 * 2 * LightYear, 20E9 * 2 * LightYear }
},
GUI = {
- Name = "20Gly Grid",
- Path = "/Other/Grids",
+ Name = "20-billion-light-year Grid",
+ Path = "/Universe/Grids",
+ Description = [[A 20-billion-light-year Cartesian grid aligned on the plane of the Milky Way.]],
OrderingNumber = 20E9 * LightYear
}
}
@@ -637,7 +650,6 @@ local Plane20Gly = {
asset.onInitialize(function()
openspace.addSceneGraphNode(RadioSphere)
- openspace.addSceneGraphNode(OortSphere)
openspace.addSceneGraphNode(EclipticSphere)
openspace.addSceneGraphNode(EclipticSphereLabels)
openspace.addSceneGraphNode(EquatorialSphere)
@@ -679,12 +691,10 @@ asset.onDeinitialize(function()
openspace.removeSceneGraphNode(EquatorialSphere)
openspace.removeSceneGraphNode(EclipticSphereLabels)
openspace.removeSceneGraphNode(EclipticSphere)
- openspace.removeSceneGraphNode(OortSphere)
openspace.removeSceneGraphNode(RadioSphere)
end)
asset.export(RadioSphere)
-asset.export(OortSphere)
asset.export(EclipticSphere)
asset.export(EclipticSphereLabels)
asset.export(EquatorialSphere)
@@ -709,13 +719,14 @@ asset.export(Plane20Gly)
asset.meta = {
Name = "Grids",
- Description = [[Various grids for showing size reference. Included: 10,000 light year
- grid, 10 light year grid, 20 billion light year grid, 10 million light year grid,
- 100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere
- (500-light-year radius), Galactic Coordinate Sphere (1000-light-year radius),
- Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere (dynamic radius), 1
- billion light year grid, Celestial Coordinate Sphere (1000000-light-year radius),
- 1,000 light year grid, 1 million light year grid, 1 light year grid]],
+ Description = [[Various grids and spheres for showing size reference. Included:
+ 10,000 light year grid, 10 light year grid, 20 billion light year grid, 10 million
+ light year grid, 100 light year grid, 100 million light year grid, Ecliptic
+ Coordinate Sphere (500-light-year radius), Galactic Coordinate Sphere
+ (1000-light-year radius), Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere
+ (dynamic radius), 1 billion light year grid, Celestial Coordinate Sphere
+ (1000000-light-year radius), 1,000 light year grid, 1 million light year grid,
+ 1 light year grid.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index 000ca7c6f1..21f88f9a7f 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "HII Regions Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_h2regions_speck",
- Version = 3
+ Version = 4
})
@@ -33,25 +33,23 @@ local Object = {
PolygonSides = 6,
Unit = "pc",
SizeSettings = {
- ScaleExponent = 18.24,
+ ScaleExponent = 18.5,
MaxSize = 8.0,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "HII Regions",
- Path = "/Milky Way",
- Description = [[Census: 1,271 nebulae. DU Version 4.6.
H ii (pronounced
- H-two) regions are stellar nurseries for newborn stars. Stars are born from
- condensing clouds of hydrogen gas. As these clouds condense, the densities
- become high enough to form stars. From Earth's perspective, you'll notice that
- the H ii regions all lie close to the Galactic plane. This is not an accident
- of nature. These star-forming regions lie in the plane of the Galaxy because
- that is where star formation occurs in spiral galaxies such as our Milky Way.
- Because of this, they are great tracers of the spiral arms of the Galaxy, and
- were instrumental in our understanding of the Galaxy's overall structure
- (Description from URL)
Data Reference: The WISE catalog of Galactic
- HII Regions (Anderson+, 2014)]]
+ Path = "/Milky Way/Nebulae",
+ Description = [[HII (pronounced "H-two") regions are stellar nurseries for newborn
+ stars. Stars are born from condensing clouds of hydrogen gas. As these clouds
+ condense, the densities become high enough to form stars. An HII region is the
+ surrounding clouds of hydrogen that glow from the stars born within them. The
+ result is a bright, glowing nebula which is seen to great distances. One local
+ celebrity among HII regions is the Orion Nebula (M42). These star-forming regions
+ lie in the plane of the Galaxy because that is where star formation occurs in
+ spiral galaxies such as our Milky Way. Because of this, they are great tracers of
+ the spiral arms of the Galaxy. Census: 1,108 star-forming regions.]]
}
}
@@ -70,8 +68,7 @@ asset.export(Object)
asset.meta = {
Name = "HII Regions",
- Description = "Digital Universe asset for HII Regions",
- Author = "Carter Emmart, Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/local_group_dwarfs.asset
similarity index 55%
rename from data/assets/scene/digitaluniverse/localdwarfs.asset
rename to data/assets/scene/digitaluniverse/local_group_dwarfs.asset
index 23ad7fadb8..4535910ce0 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/local_group_dwarfs.asset
@@ -23,12 +23,12 @@ local Object = {
Labels = {
File = speck .. "localgroup.label",
Color = { 0.3, 0.3, 1.0 },
- Size = 18.3,
+ Size = 18.4,
MinMaxSize = { 7, 20 },
Unit = "Mpc"
},
Coloring = {
- FixedColor = { 0.0, 1.0, 0.0 },
+ FixedColor = { 0.5, 1.0, 1.0 },
ColorMapping = {
File = speck .. "localgroup.cmap",
ParameterOptions = {
@@ -39,25 +39,25 @@ local Object = {
PolygonSides = 12,
Unit = "Mpc",
SizeSettings = {
- ScaleExponent = 20.2,
+ ScaleExponent = 20.77,
MaxSize = 0.7,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Local Group",
- Path = "/Universe/Galaxies",
- Description = [[Census: 102 galaxies. DU Version 6.4.
A group of galaxies is
- a small number of large galaxies that are typically surrounded by a large
- number of small galaxies. The Milky Way belongs to the Local Group, and is one
- of roughly 100 galaxies in that group. The Milky Way, the Andromeda Galaxy
- (also known as Messier 31, or M31), and the Triangulum Galaxy (M33) are three
- of the largest galaxies in the Local Group. Each is a spiral galaxy containing
- hundreds of billions of stars. Surrounding the Milky Way and Andromeda are a
- bevy of dwarf galaxies-smaller, often irregular galaxies, that contain
- hundreds of millions to a few billion stars. (Description from URL)
- Data Reference: Properties of dwarf galaxies in the Local Group
- (McConnachie+, 2012)]]
+ Path = "/Universe/Nearby Surveys",
+ Description = [[A group of galaxies is typically composed of a small number of large
+ galaxies that are surrounded by a large number of small galaxies. The Milky Way
+ belongs to the Local Group, and is one of roughly 100 galaxies in that group. The
+ Milky Way, the Andromeda Galaxy (also known as Messier 31, or M31), and the
+ Triangulum Galaxy (M33) are three of the largest galaxies in the Local Group. Each
+ is a spiral galaxy containing hundreds of billions of stars. Surrounding the Milky
+ Way and Andromeda are a bevy of dwarf galaxies--smaller, often irregular galaxies,
+ that contain hundreds of millions to a few billion stars. Colors: Aqua are galaxies
+ associated with the Milky Way, Yellow shows galaxies huddled around the Andromeda
+ Galaxy, Green are other Local Group members, and Gray are neighboring galaxies not
+ in the Local Group. Census: 102 galaxies.]]
}
}
@@ -76,7 +76,7 @@ asset.export(Object)
asset.meta = {
Name = "Local Group",
- Description = "Digital Universe asset for the Local Goup",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index 64ff019b9a..dd9cf291d0 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -39,15 +39,14 @@ local Object = {
},
GUI = {
Name = "Milky Way Galaxy Image",
- Path = "/Milky Way",
- Description = [[Census: 1 image. DU Version 2.2.
The exterior view of the
- Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a
- galaxy thought to resemble our Milky Way. The image has been properly sized
- and approximately oriented to function as a placeholder, allowing one to see
- the context of the Galaxy relative to other data in the atlas. The features
- you see in the image, of course, do not represent our Galaxy, per se, but
- resemble similar features found in our Galaxy.(Description from URL)
-
Data Reference: European Southern Observatory]]
+ Path = "/Milky Way/Galaxy",
+ Description = [[The exterior view of the Milky Way is represented here by a
+ two-dimensional image. The image is that of NGC 1232, a galaxy thought to resemble
+ our Milky Way. The image has been properly sized and approximately oriented to
+ function as a placeholder, allowing one to see the context of the Galaxy relative
+ to other data in the atlas. The features you see in the image, of course, do not
+ represent our Galaxy, per se, but resemble similar features found in our Galaxy.
+ Census: 1 image.]]
}
}
@@ -66,8 +65,7 @@ asset.export(Object)
asset.meta = {
Name = "MilkyWay Galaxy",
- Description = [[Digital Universe asset containt 2D image of the MilkyWay. For
- extragalactic viewing]],
+ Description = Object.GUI.Description,
Author = "Brian Abbott, Carter Emmart (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
index d55bc511a7..10e31e117c 100644
--- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset
@@ -40,12 +40,15 @@ local Object = {
},
GUI = {
Name = "Milky Way Arms Labels",
- Path = "/Milky Way",
- Description = [[Census: 1 image. DU Version: 1.2. This image contains labels for
- the Milky Way's spiral arms. We label them in this manner ("hard coding" the
- labels into an image rather than having native labels) so that they can retain
- their size, shape, and location as they overlay the galaxy. (Description from
- Digital Universe Data Profiles)]]
+ Path = "/Milky Way/Galaxy",
+ Description = [[This is an image that contains labels for the Milky Way's spiral
+ arms. We label them in this manner--"hard-coding" the labels into an image rather
+ than having native labels--so that they can retain their size, shape, and location
+ as they overlay the galaxy. These labels are designed to be a guide, and they map
+ more accurately to the various datasets in the Digital Universe. For example, the
+ pulsars, the star-forming (HII) regions, and open clusters all show the local spiral
+ structure. We can use trends in these data sets to map the arms of the Milky Way.
+ Census: 1 image.]]
}
}
@@ -64,27 +67,8 @@ asset.export(Object)
asset.meta = {
Name = "Milky Way Arms Labels",
- Description = "Image with arm labels for the Milky Way galaxy",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
- License = [[Copyright © American Museum of Natural History. All rights reserved.
-
Downloading the Atlas: AMNH offers the Atlas free of charge via our
- website, http://www.haydenplanetarium.org/. The User is free to download and/or
- duplicate verbatim copies of the Atlas provided this license and copyright
- information accompany the Atlas.
Modifying the Atlas: The user is free to
- modify the Atlas by either adding data or altering existing data, provided it is
- for personal use only. Once the user modifies the Atlas, it is no longer part of
- AMNH's Atlas and cannot be used publicly alongside or within the Atlas without
- written permission from AMNH.
Distributing the Atlas: The user is
- forbidden to distribute and use the Atlas for profit, as part of a software and/or
- production system that will subsequently be redistributed, or for public
- consumption (via print, electronic media, or broadcast/produced pieces) without
- written permission from AMNH.
Neither the names of American Museum of
- Natural History and Hayden Planetarium nor the names of their contributors may be
- used to endorse or promote products derived from this Atlas without specific,
- prior written permission.
The Atlas is free but is offered WITHOUT ANY
- WARRANTY of any kind. We provide the Atlas as is and take no responsibility for
- any damage resulting from the use of this Atlas. The entire risk as to the quality
- and performance of this product is with the user.
For more information,
- please visit http://www.haydenplanetarium.org/universe]]
+ License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index 68b6b07559..41a7752969 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -13,7 +13,7 @@ local TransformMatrix = {
}
-local HomeLabel = {
+local Object = {
Identifier = "HomeLabel",
Renderable = {
Type = "RenderablePointCloud",
@@ -30,27 +30,28 @@ local HomeLabel = {
},
GUI = {
Name = "Home Label",
- Path = "/Universe/Galaxies",
- Description = "Label for the Milky Way titled 'Home', sided for the galactic level"
+ Path = "/Universe/Nearby Surveys",
+ Description = [[Label for the Milky Way titled 'Home', sized for viewing outside
+ the Milky Way Galaxy.]]
}
}
asset.onInitialize(function()
- openspace.addSceneGraphNode(HomeLabel)
+ openspace.addSceneGraphNode(Object)
end)
asset.onDeinitialize(function()
- openspace.removeSceneGraphNode(HomeLabel)
+ openspace.removeSceneGraphNode(Object)
end)
-asset.export(HomeLabel)
+asset.export(Object)
asset.meta = {
Name = "Home Label",
- Description = "Label for the Milky Way titled 'Home', sided for the galactic level",
+ Description = Object.GUI.Description,
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
deleted file mode 100644
index 3bb9723354..0000000000
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ /dev/null
@@ -1,57 +0,0 @@
-local sphereTextures = asset.resource({
- Name = "Milky Way Sphere Textures",
- Type = "HttpSynchronization",
- Identifier = "milkyway_textures",
- Version = 2
-})
-
-
-local Sphere = {
- Identifier = "MilkyWay",
- Transform = {
- Rotation = {
- Type = "StaticRotation",
- Rotation = { 0, 0, math.pi }
- }
- },
- Renderable = {
- Type = "RenderableSphereImageLocal",
- Size = 9.2E21,
- Segments = 40,
- Opacity = 0.25,
- Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
- Orientation = "Inside",
- MirrorTexture = true,
- FadeOutThreshold = 0.0015,
- Background = true,
- DimInAtmosphere = true
- },
- Tag = { "daytime_hidden" },
- GUI = {
- Name = "Milky Way Sphere",
- Path = "/Milky Way",
- Description = [[All sky image of the Milky Way that is visible when inside. Fades
- out when zooming away from the Milky Way]]
- }
-}
-
-
-asset.onInitialize(function()
- openspace.addSceneGraphNode(Sphere)
-end)
-
-asset.onDeinitialize(function()
- openspace.removeSceneGraphNode(Sphere)
-end)
-
-asset.export(Sphere)
-
-
-
-asset.meta = {
- Name = "Milky Way Galaxy Sphere",
- Description = "All sky image of the Milky Way",
- Author = "OpenSpace Team",
- URL = "http://openspaceproject.com",
- License = "MIT license"
-}
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index c8ceffb51d..ad3a01a619 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -48,18 +48,14 @@ local Object = {
},
GUI = {
Name = "OB Associations",
- Path = "/Milky Way",
- Description = [[Census: 61 OB associations. DU Version 2.4.
OB associations
- are young groups of stars that were formed within a giant molecular cloud, but
- have dispersed after the original gas and dust from the cloud was blown away
- by the star's radiation pressure. Although an association's stars are no
- longer gravitationally bound to one another, they share a common motion in
- space because they were formed from the same cloud. This allows astronomers to
- easily determine OB association membership stars. These objects are color
- coded by their spiral arm membership. Blue associations trace the Sagittarius
- Arm. Purple associations are in the local Orion Spur. Orange associations are
- in the Perseus Arm (Description from URL)
Data Reference: New List of
- OB Associations (Melnik+)]]
+ Path = "/Milky Way/Star Clusters",
+ Description = [[Stellar associations are loose agglomerations of stars that form from
+ the same gas cloud. OB associations typically have on the order of dozens of O and
+ B stars in them (hotter, massive, younger stars) in addition to cooler stars. Over
+ time the stars dispurse and the association is less concentrated. These associations
+ track relatviey recent star formation. Colors: Blue trace the Sagittarius Arm,
+ Purple are in the local Orion Spur, and Orange are in the Perseus Arm. Census: 61 OB
+ associations.]]
}
}
@@ -78,8 +74,8 @@ asset.export(Object)
asset.meta = {
Name = "OB Associations",
- Description = "Digital Universe asset for OB Associations",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/oort_cloud.asset b/data/assets/scene/digitaluniverse/oort_cloud.asset
new file mode 100644
index 0000000000..52c9e45384
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/oort_cloud.asset
@@ -0,0 +1,72 @@
+local transforms = asset.require("scene/solarsystem/sun/transforms")
+
+
+
+local speck = asset.resource({
+ Name = "Grids Speck Files",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_grids_speck",
+ Version = 3
+})
+
+
+local EclipticRotationMatrix = {
+ -0.05487554, 0.4941095, -0.8676661,
+ -0.9938214 , -0.1109906, -0.0003515167,
+ -0.09647644, 0.8622859, 0.4971472
+}
+
+local Object = {
+ Identifier = "OortSphere",
+ Parent = transforms.SolarSystemBarycenter.Name,
+ Transform = {
+ Scale = {
+ Type = "StaticScale",
+ Scale = 7.47989845E15
+ },
+ Rotation = {
+ Type = "StaticRotation",
+ Rotation = EclipticRotationMatrix
+ }
+ },
+ Renderable = {
+ Type = "RenderableSphericalGrid",
+ Enabled = false,
+ Opacity = 0.8,
+ Color = { 0.4, 0.3, 0.2 },
+ LineWidth = 2.0,
+ Segments = 24
+ },
+ GUI = {
+ Name = "Oort Sphere",
+ Path = "/Solar System/Comets",
+ Description = [[The Oort cloud is a region of space surrounding the Sun where comets
+ are believed to originate. It is believed to extend from 20,000-100,000 Astronomical
+ Units (AU), with its greatest concentration around 50,000 AU (1 AU is the average
+ Earth-Sun distance, which equals 149 million kilometers, or 93 million miles). We
+ represent the Oort cloud with a 50,000-AU-radius, wire-frame sphere representing
+ the location of the central concentration. Fifty thousand astronomical units is
+ equal to about 10 light months, which is 0.8 light years, or 4.8 trillion miles.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "Oort Cloud Sphere",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott (AMNH)",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+ License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index 6069a90547..035b42cda3 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Open Clusters Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_openclusters_speck",
- Version = 3
+ Version = 4
})
@@ -20,39 +20,33 @@ local Object = {
Enabled = false,
Labels = {
File = speck .. "oc.label",
- Color = { 0.05, 0.4, 0.2 },
+ Color = { 0.0, 0.36, 0.14 },
Size = 15.5,
MinMaxSize = { 4, 30 },
Unit = "pc"
},
Coloring = {
- FixedColor = { 0.1, 0.8, 0.4 }
+ FixedColor = { 0.13, 0.99, 0.50 }
},
- Opacity = 0.5,
+ Opacity = 0.9,
File = speck .. "oc.speck",
Unit = "pc",
PolygonSides = 12,
SizeSettings = {
- ScaleExponent = 17.6,
+ ScaleExponent = 17.8,
MaxSize = 23.0,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Open Star Clusters",
- Path = "/Milky Way",
- Description = [[Census: 1,867 clusters. DU Version 7.8.
An open star cluster is a
- loose assemblage of stars numbering from hundreds to thousands that are bound by
- their mutual gravitation. Astronomers know from their stellar spectra that stars in
- open clusters are typically young. (With a star's spectrum, we can determine the
- spectral type and the luminosity class, revealing the star's age.) Because these are
+ Path = "/Milky Way/Star Clusters",
+ Description = [[An open star cluster is a loose assemblage of stars numbering from
+ hundreds to thousands that are bound by their mutual gravitation. Because these are
young stars, we expect to see them in the star-forming regions of our Galaxy, namely
in the spiral arms. For this reason, open clusters exist, for the most part, in the
- plane of the Galaxy, where we view the arms edge-on as that band of light in the
- night sky. Because of this, open clusters were originally known as Galactic
- clusters, but this term fell out of favor once astronomers began to understand that
- the Galaxy includes objects beyond the Milky Way's disk.
Data Reference:
- Galactic spiral structure revealed by Gaia EDR3 (Poggio+, 2021)]]
+ plane of the Galaxy and indicate relatively recent star formation. Census: 1,867 star
+ clusters.]]
}
}
@@ -71,8 +65,8 @@ asset.export(Object)
asset.meta = {
Name = "Open Star Clusters",
- Description = "Digital Universe asset for Open Star Clusters",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index 09b64c8215..68ce205538 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Planetary Nebulae Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_planetarynebulae_speck",
- Version = 2
+ Version = 3
})
@@ -20,7 +20,7 @@ local Object = {
Enabled = false,
Labels = {
File = speck .. "pn.label",
- Color = { 0.25, 0.25, 0.65 },
+ Color = { 0.35, 0.35, 0.60 },
Size = 16.24,
MinMaxSize = { 4, 25 },
Unit = "pc"
@@ -28,27 +28,29 @@ local Object = {
Coloring = {
FixedColor = { 0.4, 0.4, 0.9 }
},
- Opacity = 0.65,
+ Opacity = 0.99,
File = speck .. "pn.speck",
PolygonSides = 3,
Unit = "pc",
SizeSettings = {
- ScaleExponent = 18.46,
+ ScaleExponent = 18.2,
MaxSize = 19.0,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Planetary Nebulae",
- Path = "/Milky Way",
- Description = [[Census: 283 nebulae. DU Version 2.8.
A planetary nebula is an
- expanding shell of gas ejected from a star late in its life cycle. Appearing
- like greenish disks to a telescopic observer, planetary nebulae received their
- name from their resemblance to the gaseous planets of our solar system. In no
- way are they related to planets, rather, they are products of dying stars.
- (Description from URL)
Data Reference: Planetary Nebulae distances
- in Gaia DR2 (Kimeswenger+, 2018), Strasbourg-ESO Catalog of Planetary Nebulae
- (Acker+ 1992)]]
+ Path = "/Milky Way/Nebulae",
+ Description = [[A planetary nebula is an expanding shell of gas ejected from an
+ average-sized star late in its life cycle. Appearing like greenish disks to a
+ telescopic observer, planetary nebulae received their name from their resemblance to
+ the gaseous planets of our solar system. In no way are they related to planets,
+ rather, they are products of dying stars. As the gas from the star expands, it
+ sweeps up the cooler gas like a snowplow. The gas glows because of the ultraviolet
+ light from the stellar remnant at the center. Because the planetary nebula phase of
+ a star's evolution is relatively short, we observe only those that have occurred
+ recently in the younger stellar population. Therefore, we expect to see planetary
+ nebulae in the disk of the Galaxy. Census: 1,657 planetary nebulae.]]
}
}
@@ -67,8 +69,8 @@ asset.export(Object)
asset.meta = {
Name = "Planetary Nebulae",
- Description = "Digital Universe asset for Planetary Nebulae",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index 6e40f56363..82be71fa9b 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Pulsars Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_pulsars_speck",
- Version = 2
+ Version = 3
})
@@ -19,9 +19,9 @@ local Object = {
Type = "RenderablePolygonCloud",
Enabled = false,
Labels = {
- File = speck .. "pulsar.label",
- Color = { 0.7, 0.2, 0.2 },
- Size = 15.77,
+ File = speck .. "pulsars.label",
+ Color = { 0.75, 0.21, 0.21 },
+ Size = 15.27,
MinMaxSize = { 4, 20 },
Unit = "pc"
},
@@ -29,30 +29,27 @@ local Object = {
FixedColor = { 0.7, 0.0, 0.0 }
},
Opacity = 1.0,
- File = speck .. "pulsar.speck",
+ File = speck .. "pulsars.speck",
PolygonSides = 4,
Unit = "pc",
SizeSettings = {
- ScaleExponent = 18.4,
+ ScaleExponent = 18.1,
MaxSize = 19.0,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Pulsars",
- Path = "/Milky Way",
- Description = [[Census: 2,498 pulsars. DU Version 5.6.
Upon death, stars
- leave behind one of three possible remnants: a white dwarf, a neutron star, or
- a black hole. Stars that are more massive than the sun will often become
- neutron stars in a violent explosion called a supernova. During a supernova,
- the core of the star collapses under such high pressure that the electrons,
- which normally remain outside the atomic nucleus, are forced to combine with
- the protons in the nucleus. Atomic nuclei break apart, producing what is
- called a degenerate state of matter. The collapse is halted when the material
- cannot be packed any tighter. At this point, the star has a radius of about
- 10-15 kilometers. The density of this material is so high that a teaspoonful
- would weigh about 100 million tons on Earth. (Description from URL)
- Data Reference: ATNF Pulsar Catalogue, (Manchester+, 2005)]]
+ Path = "/Milky Way/Stellar Remnants",
+ Description = [[A pulsar is a spinning neutron star, an ultra-dense stellar remnant
+ resulting from a supernova-driven collapse of the stellar core. Upon death, stars
+ leave behind one of three possible remnants: a white dwarf, a neutron star, or a
+ black hole. Stars that are more massive than the sun will often become neutron
+ stars in a violent explosion called a supernova. Pulsars are not pulsing but are
+ spinning neutron stars whose beams of radiation point toward Earth just as a
+ lighthouse sweeps the horizon. Their strong magnetic fields funnel beams of light
+ from its poles. When these beams point to Earth, we see a strong radio signal.
+ Census: 3,221 pulsars.]]
}
}
@@ -71,8 +68,8 @@ asset.export(Object)
asset.meta = {
Name = "Pulsars",
- Description = "Digital Universe asset for Pulsars",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 7815c2acdb..d9482df27a 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -1,15 +1,15 @@
local textures = asset.resource({
- Name = "Quasars Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_quasars_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
Name = "Quasars Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_quasars_speck",
- Version = 2
+ Version = 3
})
local colormaps = asset.resource({
@@ -26,7 +26,7 @@ local Object = {
Type = "RenderablePointCloud",
Enabled = true,
Opacity = 0.95,
- File = speck .. "quasars.speck",
+ File = speck .. "qso.speck",
Texture = {
File = textures .. "point3A.png",
},
@@ -35,14 +35,12 @@ local Object = {
FadeInDistances = { 1000.0, 10000.0 } -- Fade in value in the same unit as "Unit"
},
Coloring = {
- FixedColor = { 1.0, 0.4, 0.2 },
+ FixedColor = { 0.85, 0.35, 0.18 },
ColorMapping = {
Enabled = false,
File = colormaps .. "viridis.cmap",
ParameterOptions = {
- { Key = "distMpc", Range = { 440.5, 8852.099609 } },
- { Key = "redshift", Range = { 0.102, 7.085 } },
- { Key = "Tlookback", Range = { 1.4, 13.0 } }
+ { Key = "lookback_time", Range = { 1.4, 13.0 } }
}
}
},
@@ -54,15 +52,11 @@ local Object = {
},
GUI = {
Name = "Quasars",
- Path = "/Universe",
- Description = [[Census: 569,442 quasars. DU Version 2.2.
- Quasars are the most distant objects we can see. They are extremely active
- galaxies that contain supermassive black holes which are gobbling up material
- at a furious rate. The Million Quasars Catalogue is an aggregate catalog of
- several surveys, including 2dF and Sloan. So, it should not be surprising that
- the shape of these data mimic the shape of the Sloan and 2dF galaxy surveys,
- with large parts of the sky unobserved.(Description from URL)
Data
- Reference: The Million Quasars catalog (Flesch, 2017)]]
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[Quasars are the most distant objects we see. They are extremely
+ active galaxies that contain supermassive black holes which gobble up material at a
+ furious rate. As the material falls into the black hole, it forms a disk and emits
+ high-energy light that we see to great distances. Census: 755,850 quasars.]]
}
}
@@ -81,8 +75,8 @@ asset.export(Object)
asset.meta = {
Name = "Quasars",
- Description = "Digital Universe asset for Quasars",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Sohum Udani (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 7bd45ca637..7d59a9d162 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -1,15 +1,15 @@
local textures = asset.resource({
- Name = "Sloan Digital Sky Survey Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_sloandss_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
Name = "Sloan Digital Sky Survey Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_sloandss_speck",
- Version = 3
+ Version = 4
})
@@ -19,14 +19,13 @@ local Object = {
Type = "RenderablePointCloud",
Enabled = true,
Opacity = 0.8,
- File = speck .. "SDSSgals.speck",
+ File = speck .. "sdss.speck",
Coloring = {
FixedColor = { 0.8, 0.8, 1.0 },
ColorMapping = {
File = speck .. "SDSSgals.cmap",
ParameterOptions = {
- { Key = "proximity", Range = { 1.0, 50.0 } },
- { Key = "redshift", Range = { 0.0, 0.075 } }
+ { Key = "num_nearby_galaxies", Range = { 1.0, 25.0 } }
}
}
},
@@ -45,22 +44,16 @@ local Object = {
},
GUI = {
Name = "Sloan Digital Sky Survey",
- Path = "/Universe/Galaxies",
- Description = [[Census: 2,600,258 galaxies. DU Version 10.6.
The Sloan Digital
- Sky Survey (SDSS) is an ambitious project to image about 35% of the sky, deep
- into the universe. The survey measured the position and brightness of almost 1
- billion objects, and obtained spectra to more than 4 million objects. This is
- not an all-sky survey, so there are large parts of the sky that remain
- unobserved, which produces the bow tie distribution and the black areas where
- there surely are galaxies, but we have yet to observe them. These galaxies
- appear to extend beyond the 2dF survey to distances that exceed 5 billion
- light years. However, the weblike structure of clusters, filaments, and voids
- seems to fade by about 2 billion light years. Beyond this distance, the
- completeness of the survey drops so that only the intrinsically bright
- galaxies are visible. The weblike cosmic structure is echoed in these data,
- with orange clusters standing out among the less dense aqua-colored galaxies
- and the less dense regions of green-colored galaxies. (Description from URL)
-
Data Reference: Sloan Digital Sky Survey (http://www.sdss.org/)]]
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[The Sloan Digital Sky Survey (SDSS) is an ambitious project to image
+ about 35% of the sky, deep into the universe. The SDSS galaxies form triangular
+ wedges, revealing those parts of the sky observed by the telescope. If the entire
+ sky were covered, you would see a spherical distribution of galaxies surrounding
+ the Milky Way. With only 35% of the entire sky observed, we see only a few select
+ slices or larger wedgelike portions from that sphere. The weblike cosmic structure
+ is echoed in these data, with orange clusters standing out among the less dense
+ aqua-colored galaxies and the less dense regions of green-colored galaxies.
+ Census: 2,862,767 galaxies.]]
}
}
@@ -78,9 +71,9 @@ asset.export(Object)
asset.meta = {
- Name = "Sloan Digital Sky Survey",
- Description = "Digital Universe asset for The Sloan Digital Sky Survey (SDSS)",
- Author = "Brian Abbott (AMNH)",
+ Name = "Sloan Digital Sky Survey Galaxies",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH), Eric Gawiser (Rutgers)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/star_uncertainty.asset b/data/assets/scene/digitaluniverse/star_uncertainty.asset
new file mode 100644
index 0000000000..2273022321
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/star_uncertainty.asset
@@ -0,0 +1,65 @@
+local speck = asset.resource({
+ Name = "Star Uncertainty Files",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_star_uncertainty_data",
+ Version = 1
+})
+
+
+local Object = {
+ Identifier = "StarUncertainty",
+ Renderable = {
+ Type = "RenderableConstellationLines",
+ Enabled = false,
+ Labels = {
+ File = speck .. "star_uncertainty.label",
+ Opacity = 0.75,
+ Color = { 0.6, 0.6, 1.0 },
+ Size = 14.1,
+ MinMaxSize = { 8, 170 },
+ Unit = "pc"
+ },
+ Opacity = 0.8,
+ LineWidth = 5.0,
+ File = speck .. "star_uncertainty.speck",
+ NamesFile = speck .. "star_uncertainty.dat",
+ Colors = { { 1.0, 1.0, 0.0 }, { 0.0, 0.8, 1.0 }, { 0.957, 0.51, 0.10 } },
+ Unit = "pc",
+ DimInAtmosphere = true
+ },
+ Tag = { "daytime_hidden" },
+ GUI = {
+ Name = "Star Distance Uncertainty",
+ Path = "/Milky Way/Stars",
+ Description = [[The uncertainty of a star's position is derived from the uncertainty
+ in its parallax measurement. This results in a range in distance where the star
+ could exist. Here we draw lines on top of select stars which give us a visual cue
+ of the range in possible distances for that star. Colors: Aqua lines are stars with
+ Gaia geometric parallax measurements (the most accurate), orange lines indicate
+ stars with Hipparcos geometric parallaxes, and yellow lines are stars with Gaia
+ photogeomentric parallaxes (the least accurate). The label includes the star name
+ and the length of the uncertainty in light years. Census: 3,440 stars with
+ uncertainty.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "Star Distance Uncertainty",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+ License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 85c3d64c0e..368ec4a330 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
Name = "Star Labels Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_starlabels_speck",
- Version = 2
+ Version = 3
})
@@ -15,7 +15,7 @@ local Object = {
Enabled = true,
File = speck .. "stars.label",
Color = { 0.4, 0.4, 0.4 },
- Size = 14.7,
+ Size = 14.4,
MinMaxSize = { 6, 50 },
Unit = "pc"
},
@@ -25,7 +25,8 @@ local Object = {
GUI = {
Name = "Stars Labels",
Path = "/Milky Way/Stars",
- Description = "Labels for stars in the Milky Way. See 'Stars' for more info"
+ Description = [[Common name labels for nearby stars in the Milky Way. See 'Stars'
+ for more information.]]
}
}
@@ -44,8 +45,8 @@ asset.export(Object)
asset.meta = {
Name = "Star Labels",
- Description = "Digital Universe asset for labels of the stars",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves, Andrew Ayala, Jackie Faherty (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index ecf8a63b95..4efbe36beb 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -4,163 +4,136 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transfor
local speck = asset.resource({
- Name = "Grids Speck Files",
+ Name = "Star Orbits Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_starorbits_speck",
- Version = 1
+ Version = 2
})
local SunOrbit = {
Identifier = "SunOrbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-Sun.speck",
MeshColor = { { 1.0, 0.65, 0.0 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "Sun Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of the Sun around the Milky Way"
+ Description = [[Projected orbit of the Sun around the Milky Way over the next 1
+ billion years.]]
}
}
local BarnardsOrbit = {
Identifier = "BarnardsOrbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-BarnardsStar.speck",
MeshColor = { { 0.39, 0.58, 0.93 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "Barnards Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of Barnard's Star around the Milky Way"
+ Description = [[Projected orbit of Barnard's Star around the Milky Way over the next
+ 1 billion years.]]
}
}
local KapteynsOrbit = {
Identifier = "KapteynsOrbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-KapteynsStar.speck",
MeshColor = { { 0.6, 0.6, 0.6 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "Kapteyns Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of Kapteyn's Star around the Milky Way"
+ Description = [[Projected orbit of Kapteyn's Star around the Milky Way over the next
+ 1 billion years.]]
}
}
local Lacaille9352Orbit = {
Identifier = "Lacaille9352Orbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-Lacaille9352.speck",
MeshColor = { { 0.58, 0.0, 0.83 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "Lacaille 9352 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of Lacaille9352 around the Milky Way"
+ Description = [[Projected orbit of Lacaille9352 around the Milky Way over the next
+ 1 billion years.]]
}
}
local LSR1826Orbit = {
Identifier = "LSR1826Orbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-LSR1826+3014.speck",
MeshColor = { { 0.0, 0.39, 0.0 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "LSR1826+3014 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of LSR1826+3014 around the Milky Way"
+ Description = [[Projected orbit of LSR1826+3014 around the Milky Way over the next 1
+ billion years.]]
}
}
local LSRJ0822Orbit = {
Identifier = "LSRJ0822Orbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-LSRJ0822+1700.speck",
MeshColor = { { 0.5, 1.0, 0.0 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "LSRJ0822+1700 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of LSRJ0822+1700 around the Milky Way"
+ Description = [[Projected orbit of LSRJ0822+1700 around the Milky Way over the next 1
+ billion years.]]
}
}
local PM_J13420Orbit = {
Identifier = "PM_J13420Orbit",
- --Parent = transforms.SolarSystemBarycenter.Name,
Renderable = {
Type = "RenderableDUMeshes",
Enabled = false,
Opacity = 1.0,
File = speck .. "starorbits-PM_J13420-3415.speck",
MeshColor = { { 0.70, 0.13, 0.13 } },
- --LabelFile = speck .. "1ld.label",
- -- TextColor = { 0.0, 0.2, 0.5 },
- -- TextSize = 10.3,
- -- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
Name = "PM_J13420-3415 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
- Description = "Orbits of PM_J13420-3415 around the Milky Way"
+ Description = [[Projected orbit of PM_J13420-3415 around the Milky Way over the next
+ 1 billion years.]]
}
}
@@ -197,11 +170,8 @@ asset.export(PM_J13420Orbit)
asset.meta = {
Name = "Star Orbits",
- Description = [[Select Star Orbital paths that delineate their trajectory around the
- Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns,
- Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415.
Data
- Reference: Sebastien Lepine (AMNH)]],
- Author = "Brian Abbott (AMNH)",
+ Description = [[Projected star orbits for selected stars over the next 1 billion years. Census: 7 star orbits.]],
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 0d5ff15e04..ef29bce444 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -2,7 +2,7 @@ local speck = asset.resource({
Name = "Stars Speck Files",
Type = "HttpSynchronization",
Identifier = "stars_du",
- Version = 5
+ Version = 6
})
local sunspeck = asset.resource({
@@ -62,13 +62,13 @@ local Stars = {
GUI = {
Name = "Stars",
Path = "/Milky Way/Stars",
- Description = [[Census: 116,584 stars with 321 labels.
DU Version 8.10. This
- star catalog is a combination of all available star catalogs, wherein we
- choose the best distance available to place the stars around the Sun as
- accurately as is possible. (Description from URL)
Data Reference:
- Gaia Data Release 3 (Gaia Collaboration, 2022); XHIP: An Extended Hipparcos
- Compilation (Anderson E., Francis C. 2012); Hipparcos Catalog (European Space Agency
- 1997); Gliese Catalog (Gliese and Jahriess 1991)]]
+ Description = [[These are the nearby stars that surround the Sun and are close enough
+ to get accurate distances. These include all the stars we see with the unaided eye
+ and many stars dimmer than that. Over the entire night sky, all year round, and in
+ the northern and southern hemispheres, we can see roughly 9,000 stars total with
+ the unaided eye. Stars are the light factories of the universe, and come in a
+ variety of sizes, colors, and brightnesses. The base catalog is Hipparcos, with Gaia
+ DR3 data applied for distance and velocity when available. Census: 112,746 stars.]]
}
}
@@ -105,10 +105,10 @@ local SunStar = {
DimInAtmosphere = true
},
GUI = {
- Name = "Sun Star",
+ Name = "Sun",
Path = "/Milky Way/Stars",
- Description = [[Individual star to represent the sun when outside of the solar
- system]]
+ Description = [[Individual star to represent the Sun when outside of the Solar
+ System.]]
}
}
@@ -130,8 +130,8 @@ asset.export(SunStar)
asset.meta = {
Name = "Stars",
- Description = "Digital Universe asset for the stars",
- Author = "Brian Abbott (AMNH)",
+ Description = Stars.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves, Andrew Ayala, Jackie Faherty (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 7899d631bd..71c50f95ad 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -1,8 +1,8 @@
local textures = asset.resource({
- Name = "Galaxy Superclusters Textures",
+ Name = "Point Textures",
Type = "HttpSynchronization",
- Identifier = "digitaluniverse_superclusters_textures",
- Version = 2
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
})
local speck = asset.resource({
@@ -40,14 +40,14 @@ local Object = {
}
},
GUI = {
- Name = "Galaxy Superclusters",
- Path = "/Universe/Galaxies",
- Description = [[Census: 33 labels. DU Version 1.3.
The superclusters dataset
- is a set of labels that mark the major galaxy superclusters in the local universe.
- They correspond to, and should be viewed with, the Abell clusters. Astronomers
- estimate there are 10 million superclusters in the observable universe.
- (Description from URL)
Data Reference: Superclusters of Abell and X-ray
- clusters (Einasto+, 2001)]]
+ Name = "Supercluster Labels",
+ Path = "/Universe/Deep Sky Surveys",
+ Description = [[The superclusters dataset is a set of labels that mark the major
+ galaxy superclusters in the local universe. They correspond to, and should be viewed
+ with, the Abell clusters. Astronomers estimate there are 10 million superclusters in
+ the observable universe. Often, they carry constellation names because they are
+ viewed in those constellations from our night-sky perspective. Census: 33
+ supercluster labels.]]
}
}
@@ -66,7 +66,7 @@ asset.export(Object)
asset.meta = {
Name = "Galaxy Superclusters",
- Description = "Digital Universe asset for Galaxy Superclusters",
+ Description = Object.GUI.Description,
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index b44c695f32..3b890d0858 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -9,7 +9,7 @@ local speck = asset.resource({
Name = "Supernova Remnants Speck Files",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_supernovaremnants_speck",
- Version = 2
+ Version = 3
})
@@ -20,8 +20,8 @@ local Object = {
Enabled = false,
Labels = {
File = speck .. "snr.label",
- Color = { 0.6, 0.46, 0.0 },
- Size = 16.44,
+ Color = { 0.51, 0.40, 0.04 },
+ Size = 16.0,
MinMaxSize = { 4, 100 },
Unit = "pc"
},
@@ -40,12 +40,16 @@ local Object = {
},
GUI = {
Name = "Supernova Remnants",
- Path = "/Milky Way",
- Description = [[Census: 112 supernova remnants.
DU Version 3.7. A supernova
- remnant is the ejected gas that results from a supernova. It glows for a
- cosmically short period of time before mixing with the interstellar medium.
- (Description from URL)
Data Reference: The First Fermi LAT SNR
- Catalog (Acero+, 2016)]]
+ Path = "/Milky Way/Nebulae",
+ Description = [[A supernova remnant is the nebulous gas left over from a supernova
+ explosion. This gas expands at great speeds and rams into the surrounding
+ interstellar gas. This excites the surrounding gas and causes it to glow, producing
+ the nebulous cloud we observe from Earth. A supernova remnant contains a neutron
+ star or pulsar at its center, the core of the dying star. The cloud that enshrouds
+ the core does not last long, though. After about 50,000 years, the gas mixes into
+ the interstellar medium and no longer glows. Astronomically, this is a very short
+ time, so the supernova remnants we see must be left from explosions that have
+ occurred recently, cosmically speaking. Census: 112 supernova remnants.]]
}
}
@@ -63,8 +67,8 @@ asset.export(Object)
asset.meta = {
Name = "Supernova Remnants",
- Description = "Digital Universe asset for Supernova Remnants",
- Author = "Brian Abbott (AMNH)",
+ Description = Object.GUI.Description,
+ Author = "Brian Abbott, Zack Reeves (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index f9fd6daa1d..44d72b1a50 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -54,30 +54,25 @@ local TullyGalaxies = {
FadeInDistances = { 0.001, 1.0 } -- Fade in value in the same unit as "Unit"
},
SizeSettings = {
- ScaleExponent = 21.9,
+ ScaleExponent = 21.7,
MaxSize = 0.3,
EnableMaxSizeControl = true
}
},
GUI = {
Name = "Tully Galaxies",
- Path = "/Universe/Galaxies",
- Description = [[Census: 30,059 galaxies. DU Version 1.5.
The Tully Catalog is
- the most polished, accurate catalog of nearby galaxies. It includes over 30,000
- galaxies in the local universe that surround the Milky Way. This catalog
- demonstrates the large-scale structure of the universe exceptionally well. And,
- each galaxy has a representative image reflecting its morphological type, and is
- properly sized and inclined. Size and shape. The data form a cube, which is an
+ Path = "/Universe/Nearby Surveys",
+ Description = [[The Tully Catalog is the most polished, accurate catalog of nearby
+ galaxies. It includes over 30,000 galaxies in the local universe that surround the
+ Milky Way. This catalog demonstrates the large-scale structure of the universe
+ exceptionally well. Each galaxy has a representative image that is properly sized
+ and inclined and reflects its morphological type. The data form a cube, which is an
arbitrary cutoff based on the completeness of these data. Beyond this, data from
- these sources are not as reliable, so effort is made to show a complete picture,
- albeit limited by observations (for example, we cannot see dwarf galaxies much
- beyond the Local Group). The size of the cube is roughly 1 billion light years on
- a diagonal (so the farthest galaxies in the dataset are about 1 billion light
- years from the Milky Way), or about 700 million light years per side.
-
Colors. Orange denotes more dense regions of the local universe, aqua is
- given to galaxies in an intermediate-density area, and green is given to lower
- density regions.(Description from URL)
Data Reference: Tully Galaxy
- Catalog: Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+ these sources are not as reliable. The size of the cube is roughly 1 billion light
+ years on a diagonal, or about 700 million light years per side. Colors: Orange
+ denotes more dense regions of the local universe, aqua is given to galaxies in an
+ intermediate-density area, and green is given to lower density regions. Census:
+ 30,059 galaxies.]]
}
}
@@ -111,17 +106,14 @@ local TullyGalaxiesImages = {
},
GUI = {
Name = "Tully Galaxies Images",
- Path = "/Universe/Galaxies",
- Description = [[Each galaxy is represented by an image
- that represents its morphological type (spiral, elliptical, etc.). Most of these
- come from The Galaxy Catalog. A handful of nearby galaxies are represented by
- their actual images, which come mostly from the National Optical Astronomy
- Observatory (NOAO). Each of these images has been altered from its original state.
- These images were taken from Earth on some of the world's largest telescopes, so
- foreground stars from our own Galaxy appear in each image. We are representing
- galaxies in extragalactic space, so we have removed the stars from each image.
- (Description from URL)
Data Reference: Tully Galaxy Catalog: Brent Tully
- (U Hawaii), Stuart Levy (NCSA/UIUC)]]
+ Path = "/Universe/Nearby Surveys",
+ Description = [[Each Tully galaxy is represented by an image that represents its
+ morphological type (spiral, elliptical, etc.). Most of these come from The Galaxy
+ Catalog. A handful of nearby galaxies are represented by their actual images, which
+ come mostly from the National Optical Astronomy Observatory (NOAO). Each of these
+ images has been altered from its original state. Taken from Earth, foreground stars
+ from our own Galaxy appear in each image and were removed. Census: 30,159 galaxy
+ images.]]
}
}
@@ -143,8 +135,7 @@ asset.export(TullyGalaxiesImages)
asset.meta = {
Name = "Tully Galaxies",
- Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
- images]],
+ Description = TullyGalaxies.GUI.Description,
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index 6493e3a500..66dfd12df0 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -25,17 +25,15 @@ local Object = {
},
GUI = {
Name = "Voids",
- Path = "/Universe/Galaxies",
- Description = [[Census: 24 cosmic voids. DU Version 1.2.
Cosmic voids are
- vast, empty spaces where there are either no galaxies, or very few galaxies.
- They are associated with cold spots in the cosmic microwave background (CMB)
- light, the earliest picture we have of the universe (see page 58). Those cold
- spots in the CMB evolved into large voids, some as much as 300 million light
- years in diameter. Labels roughly denote the location of cosmic voids in the
- Tully galaxies. Voids are only visible with motion cuing as you spin around
- these data. The labels help to guide the eye and provide sign posts for the
- largest voids in our cosmic neighborhood. (Description from URL)
Data
- Reference: various sources]]
+ Path = "/Universe/Nearby Surveys",
+ Description = [[Cosmic voids are vast, empty spaces where there are either no
+ galaxies, or very few galaxies. They are associated with cold spots in the cosmic
+ microwave background (CMB) light, the earliest picture we have of the universe.
+ Those cold spots in the CMB evolved into large voids, some as much as 300 million
+ light years in diameter. Labels roughly denote the location of cosmic voids in the
+ Tully galaxies. Voids are only visible with motion cuing as you spin around these
+ data. The labels help to guide the eye and provide sign posts for the largest voids
+ in our cosmic neighborhood. Census: 24 cosmic void labels.]]
}
}
@@ -55,7 +53,7 @@ asset.export(Object)
asset.meta = {
Name = "Voids",
Author = "Brian Abbott (AMNH)",
- Description = "Digital Universe asset for Cosmic voids",
+ Description = Object.GUI.Description,
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe"
}
diff --git a/data/assets/scene/digitaluniverse/white_dwarfs.asset b/data/assets/scene/digitaluniverse/white_dwarfs.asset
new file mode 100644
index 0000000000..4d0813d4e3
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/white_dwarfs.asset
@@ -0,0 +1,67 @@
+local textures = asset.resource({
+ Name = "Point Textures",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_point_textures",
+ Version = 1
+})
+
+local speck = asset.resource({
+ Name = "White Dwarf Speck Files",
+ Type = "HttpSynchronization",
+ Identifier = "digitaluniverse_white_dwarfs_speck",
+ Version = 1
+})
+
+
+local Object = {
+ Identifier = "WhiteDwarfs",
+ Renderable = {
+ Type = "RenderablePointCloud",
+ Enabled = false,
+ File = speck .. "wd.speck",
+ Texture = {
+ File = textures .. "point3.png",
+ },
+ Unit = "pc",
+ Coloring = {
+ FixedColor = { 1.0, 1.0, 1.0 },
+ },
+ SizeSettings = {
+ ScaleExponent = 15.5,
+ MaxSize = 0.7,
+ EnableMaxSizeControl = true
+ }
+ },
+ GUI = {
+ Name = "White Dwarfs",
+ Path = "/Milky Way/Stellar Remnants",
+ Description = [[A white dwarf is the core of a dying star. These are dim objects that
+ are roughly the size of Earth but with the desity of a sunlike star. Stars that are
+ not massive enough to end in a neutraon star or black hole will evolve into a white
+ dwarf. This is the ultimate fate of over 95% of the stars in our Galaxy. As the
+ star is dying, the outer layers will expand out and the gas will glow and become a
+ planetaery nebula, while the core of the star transforms into a white dwarf. Census:
+ 192,613 white dwarfs.]]
+ }
+}
+
+
+asset.onInitialize(function()
+ openspace.addSceneGraphNode(Object)
+end)
+
+asset.onDeinitialize(function()
+ openspace.removeSceneGraphNode(Object)
+end)
+
+asset.export(Object)
+
+
+
+asset.meta = {
+ Name = "White Dwarfs",
+ Description = Object.GUI.Description,
+ Author = "Zack Reeves, Brian Abbott (AMNH)",
+ URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+ License = "AMNH Digital Universe"
+}
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index 937e5ebd7c..f9f4e25d66 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -84,7 +84,7 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
Tag = { "ImageConstellation", group, "daytime_hidden" },
GUI = {
Name = name .. " Image",
- Path = "/Milky Way/" .. guiPath,
+ Path = "/Milky Way/Constellations/" .. guiPath,
Description = name .. " Image"
}
}
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 41323b2229..285e1c75cf 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -22,8 +22,7 @@ local Object = {
Texture = textures .. "eso0932a_blend.png",
Orientation = "Inside",
MirrorTexture = true,
- FadeOutThreshold = 0.01,
- Background = true
+ FadeOutThreshold = 0.01
},
GUI = {
Name = "Milky Way (ESO)",
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index e6af7d4bea..642e21d4f4 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -45,7 +45,7 @@ local MilkyWayVolume = {
}
},
GUI = {
- Path = "/Milky Way",
+ Path = "/Milky Way/Galaxy",
Name = "Milky Way Volume",
Description = "Volumetric rendering of Milky Way galaxy based on simulation from NAOJ"
}