From 2e61a0ba7266c7d564b7e74676dfcd59e20885f1 Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 25 Sep 2020 17:14:41 -0400 Subject: [PATCH 01/12] start of asset meta update --- data/assets/scene/digitaluniverse/2dF.asset | 21 ++- data/assets/scene/digitaluniverse/2mass.asset | 15 ++- data/assets/scene/digitaluniverse/6dF.asset | 17 ++- data/assets/scene/digitaluniverse/abell.asset | 19 ++- .../digitaluniverse/alternatestarlabels.asset | 13 +- .../assets/scene/digitaluniverse/dwarfs.asset | 8 ++ .../scene/digitaluniverse/exoplanets.asset | 1 - .../constellations/constellation_art.asset | 2 +- .../constellation_keybinds.asset | 9 ++ .../scene/milkyway/milkyway/volume.asset | 10 ++ data/assets/scene/milkyway/stars/denver.asset | 9 ++ .../interstellar/c-2019_q4_borisov.asset | 17 ++- .../solarsystem/interstellar/oumuamua.asset | 10 ++ .../missions/voyager/voyager1.asset | 4 +- .../missions/voyager/voyager2.asset | 4 +- .../solarsystem/planets/default_layers.asset | 10 ++ .../solarsystem/planets/earth/earth.asset | 17 --- ...om_w1_sea_ice_concentration_temporal.asset | 14 ++ .../colorlayers/aqua_modis_temporal.asset | 19 +++ .../layers/colorlayers/bmng_sweden.asset | 10 ++ .../earth/layers/colorlayers/bmng_utah.asset | 10 ++ .../colorlayers/esri_imagery_world_2D.asset | 17 +++ .../layers/colorlayers/esri_viirs_combo.asset | 10 ++ .../colorlayers/esri_world_imagery.asset | 19 +++ .../colorlayers/fallbacks/blue_marble.asset | 9 ++ ...sst_sea_surface_temperature_temporal.asset | 22 +++- ...mur_sea_surface_temperature_temporal.asset | 22 +++- .../modis_terra_chlorophyll_a_temporal.asset | 12 ++ .../colorlayers/terra_modis_temporal.asset | 11 ++ .../colorlayers/viirs_snpp_temporal.asset | 11 ++ .../fallbacks/blue_marble_height.asset | 9 ++ .../layers/heightlayers/terrain_tileset.asset | 14 ++ .../nightlayers/earth_at_night_2012.asset | 10 ++ .../nightlayers/earth_at_night_temporal.asset | 27 ++++ .../fallbacks/earth_night_texture.asset | 9 ++ .../solarsystem/planets/earth/moon/moon.asset | 10 +- .../planets/earth/moon/moon_labels.asset | 1 + .../planets/earth/moon/trail.asset | 10 +- .../planets/earth/satellites/misc/iss.asset | 10 ++ .../scene/solarsystem/planets/planets.asset | 4 + .../planets/saturn/iapetus/iapetus.asset | 2 +- .../planets/saturn/minor/gallic_group.asset | 12 ++ .../planets/saturn/minor/inuit_group.asset | 12 ++ .../planets/saturn/minor/norse_group.asset | 15 +++ .../planets/saturn/minor/other_group.asset | 15 ++- .../planets/uranus/default_layers.asset | 9 ++ .../planets/uranus/inner_moons.asset | 13 ++ .../uranus/irregular_prograde_moons.asset | 12 +- .../uranus/irregular_retrograde_moons.asset | 12 ++ .../solarsystem/planets/uranus/kernels.asset | 9 ++ .../layers/colorlayers/uranus_texture.asset | 9 ++ .../planets/uranus/major_moons.asset | 11 ++ .../planets/uranus/minor_moons.asset | 10 ++ .../solarsystem/planets/uranus/trail.asset | 12 +- .../planets/uranus/transforms.asset | 10 ++ .../solarsystem/planets/uranus/uranus.asset | 10 ++ .../planets/venus/atmosphere.asset | 9 +- .../planets/venus/default_layers.asset | 10 ++ .../colorlayers/magellan_mosaic_utah.asset | 26 ++++ .../venus/layers/heightlayers/magellan.asset | 19 +++ .../solarsystem/planets/venus/trail.asset | 9 ++ .../planets/venus/trail_earth.asset | 40 ++++++ .../planets/venus/transforms.asset | 10 ++ .../solarsystem/planets/venus/venus.asset | 8 ++ .../solarsystem/sssb/amor_asteroid.asset | 13 +- .../solarsystem/sssb/apollo_asteroid.asset | 13 +- .../solarsystem/sssb/aten_asteroid.asset | 13 +- .../solarsystem/sssb/atira_asteroid.asset | 13 +- .../scene/solarsystem/sssb/c2019y4atlas.asset | 19 ++- .../solarsystem/sssb/centaur_asteroid.asset | 13 +- .../solarsystem/sssb/chiron-type_comet.asset | 13 +- .../solarsystem/sssb/encke-type_comet.asset | 13 +- .../solarsystem/sssb/halley-type_comet.asset | 10 +- .../sssb/inner_main_belt_asteroid.asset | 13 +- .../sssb/jupiter-family_comet.asset | 13 +- .../sssb/jupiter_trojan_asteroid.asset | 13 +- .../solarsystem/sssb/main_belt_asteroid.asset | 13 +- .../sssb/mars-crossing_asteroid.asset | 13 +- .../sssb/outer_main_belt_asteroid.asset | 17 ++- data/assets/scene/solarsystem/sssb/pha.asset | 18 ++- .../scene/solarsystem/sssb/swifttuttle.asset | 19 ++- .../solarsystem/sssb/tesla_roadster.asset | 12 ++ .../sssb/transneptunian_object_asteroid.asset | 23 +++- .../solarsystem/sun/default_layers.asset | 9 ++ data/assets/scene/solarsystem/sun/glare.asset | 8 ++ .../sun/layers/colorlayers/sun_texture.asset | 9 ++ .../assets/scene/solarsystem/sun/marker.asset | 8 ++ data/assets/scene/solarsystem/sun/sun.asset | 10 ++ .../scene/solarsystem/sun/sun_textures.asset | 9 ++ .../scene/solarsystem/sun/transforms.asset | 10 ++ data/assets/spice/base.asset | 9 ++ data/assets/util/default_keybindings.asset | 13 ++ data/assets/util/procedural_globe.asset | 22 +++- data/web/documentation/scenelicense.hbs | 5 +- .../server/src/topics/documentationtopic.cpp | 4 + openspace.cfg | 123 ++++++++---------- src/scene/scenelicensewriter.cpp | 13 +- 97 files changed, 1098 insertions(+), 208 deletions(-) create mode 100644 data/assets/scene/solarsystem/planets/venus/trail_earth.asset diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index 2da1fb619d..56941b50c5 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -39,6 +39,25 @@ local object = { } } - +asset.meta = { + Name = "2dF Galaxies", + Version = "2.0", + Description = [[ 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. ]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index c27557c282..c55ea083a0 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -41,6 +41,19 @@ local object = { } } - +asset.meta = { + Name = "2MASS Galaxies", + Version = "1.0", + 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. ]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "custom" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index 2843b142d4..bbf1c4f7b3 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -39,6 +39,21 @@ local object = { } } - +asset.meta = { + Name = "6dF Galaxies", + Version = "2.0", + Description = [[ 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. ]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "custom" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index 80b5bbbe94..fc1c90d8cf 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -47,6 +47,23 @@ local object = { } } - +asset.meta = { + Name = "Abell Galaxy Clusters", + Version = "2.0", + 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 (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.]], + Author = "AMNH Digital Universe", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "custom" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index dcef9924a2..272ca87615 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -29,6 +29,17 @@ local object = { } } - +asset.meta = { + Name = "Stars Labels - Alternate", + Version = "1.0", + Description = [[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.]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index a302fd9154..aa2b32effa 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -48,3 +48,11 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + +asset.meta = { + Name = "Brown Dwarfs", + Version = "5.3", + Description = [[Brown dwarf catalog, including L, T, and Y dwarfs.]], + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "custom" +} diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index 7915477f17..c3063aa918 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -44,5 +44,4 @@ local object = { } - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset index 4d4ad4e64f..a8a3871ffd 100644 --- a/data/assets/scene/milkyway/constellations/constellation_art.asset +++ b/data/assets/scene/milkyway/constellations/constellation_art.asset @@ -101,6 +101,6 @@ asset.meta = { Version = "1.0", Description = "Artistic images depicting the constellations", Author = "James Hedberg", - URL = "jameshedberg.com", + URL = "http://jameshedberg.com", License = "CC-BY" } diff --git a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset index f527e59fb4..1799903c53 100644 --- a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset +++ b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset @@ -36,3 +36,12 @@ end) asset.onDeinitialize(function () scene_helper.unbindKeys(Keybindings) end) + +asset.meta = { + Name = "Constellation Image Keybinds", + Version = "1.0", + Description = "Keybinds for fading in and out the constellations", + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License" +} \ No newline at end of file diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index 2ae420e931..50e8f1a001 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -52,3 +52,13 @@ local MilkyWayVolumeGalaxy = { local objects = { MilkyWayVolumeGalaxy } assetHelper.registerSceneGraphNodesAndExport(asset, objects) + +asset.meta = { + Name = "Milky Way Volume", + Version = "1.0", + Description = [[Volumetric rendering of Milky Way galaxy based on simulation from + NEOJ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT License" +} diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset index 8cf214031f..7882e62afe 100644 --- a/data/assets/scene/milkyway/stars/denver.asset +++ b/data/assets/scene/milkyway/stars/denver.asset @@ -40,6 +40,15 @@ local object = { } } +asset.meta = { + Name = "Stars Denver", + Version = "1.0", + Description = [[Alternative Milky Way Atlas: based on HIPPARCOS and Yale Bright + Star catalogs]], + Author = "Ka chun Yu", + URL = "http://openspaceproject.com", + License = "Creative Commons Attribution-Share Alike 3.0 Unported" +} assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset index a21679ce59..14e7b433db 100644 --- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset +++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset @@ -23,7 +23,7 @@ local C2019Q4BorisovTrail = { SampleInterval = 60 * 60 * 24 * 7 }, GUI = { - Name = "C-2019 Q4 Borisov Trail", + Name = "C/2019 Q4 Borisov Trail", Path = "/Solar System/Interstellar" } } @@ -38,9 +38,22 @@ local C2019Q4BorisovPosition = { }, }, GUI = { - Name = "C-2019 Q4 Borisov", + Name = "C/2019 Q4 Borisov", Path = "/Solar System/Interstellar" } } +asset.meta = { + Name = "C/2019 Q4 Borisov", + Version = "1.0", + Description = [[ This asset contains the trail + and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00 + to 2024 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] +} + assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2019Q4BorisovTrail }) diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset index 2b972b5c3a..6e14e3155d 100644 --- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset +++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset @@ -44,4 +44,14 @@ local OumuamuaPosition = { } } +asset.meta = { + Name = "'Oumuamua", + Version = "1.0", + Description = [[ This asset contains the trail and position of 'Oumuamua from 2014 + JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = "NASA" +} + assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, OumuamuaTrail }) diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index f93ffdefe6..6cd6ba65ba 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -99,11 +99,11 @@ local Voyager1Antenna = { Parent = Voyager1.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/voyager-antenna.obj", ColorTexture = models .. "/voyager-antenna.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 993b86dc90..1e179753dd 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -83,11 +83,11 @@ local Voyager2Main = { Parent = Voyager2.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/voyager-main.obj", ColorTexture = models .. "/voyager-main.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset index 2ad62dd2c1..6815becb02 100644 --- a/data/assets/scene/solarsystem/planets/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -26,3 +26,13 @@ asset.require('./saturn/titan/default_layers') asset.require('./uranus/default_layers') asset.require('./venus/default_layers') + +asset.meta = { + Name = "Default Solar System Layers", + Version = "1.0", + Description = [[ Adds default layers for all planets. Remove this asset and include + individual layers for planets to customize planet layers]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index be78f5c522..457ecf7954 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -2,8 +2,6 @@ local transforms = asset.require('./transforms') local assetHelper = asset.require('util/asset_helper') local labelsPath = asset.require('./earth_globelabels').LabelsPath -asset.require('./trail') - -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 } local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 } @@ -22,13 +20,11 @@ local Earth = { -- All radius in meters Radius = 696.3E6 }, - --Source2 = { Name = "Monolith", Radius = 0.01E6, }, Caster1 = { Name = "Moon", -- All radius in meters Radius = 1.737E6 } - --Caster2 = { Name = "Independency Day Ship", Radius = 0.0, } }, Labels = { Enable = false, @@ -57,18 +53,6 @@ local Earth = { local EarthLabel = { Identifier = "EarthLabel", Parent = Earth.Identifier, - -- Transform = { - -- Translation = { - -- Type = "SpiceTranslation", - -- Target = "EARTH", - -- Observer = "EARTH BARYCENTER" - -- }, - -- -- Rotation = { - -- -- Type = "SpiceRotation", - -- -- SourceFrame = "IAU_MOON", - -- -- DestinationFrame = "GALACTIC" - -- -- } - -- }, Renderable = { Enabled = false, Type = "RenderableLabels", @@ -94,7 +78,6 @@ local EarthLabel = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { Earth, EarthLabel }) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index 86acf6cfb8..58427de208 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -19,3 +19,17 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave + Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) + unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice + concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. + ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution + of 12 km. (Description from NASA Worldview)]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index 7c65fe269f..57e627fc68 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -19,3 +19,22 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "Aqua Modis (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, + Green = Band 4, Blue = Band 3. These images are called true-color or natural color + because this combination of wavelengths is similar to what the human eye would see. + The images are natural-looking images of land surface, oceanic and atmospheric + features. The downside of this set of bands is that they tend to produce a hazy image. + The MODIS Corrected Reflectance imagery is available only as near real-time imagery. + The imagery can be visualized in Worldview and the Global Imagery Browse Services + (GIBS). The sensor resolution is 500 m and 250 m (Bands 1 and 2 have a sensor + resolution of 250 m, Bands 3 - 7 have a sensor resolution of 500m, and Bands 8 - 36 + are 1 km. Band 1 is used to sharpen Band 3, 4, 6, and 7), imagery resolution is 250 m, + and the temporal resolution is daily. (Description from NASA Worldview)]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index 7cd8f71b96..926552fea6 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -12,3 +12,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "Blue Marble Next Generation (Sweden)", + Version = "1.0", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + Hosted at LiU for Europe access]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index b3c064e3d9..83bc44d9af 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -12,3 +12,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "Blue Marble Next Generation (Utah)", + Version = "1.0", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + Hosted at UU for US access]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index 228093d4fe..28cb772654 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -12,3 +12,20 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "ESRI Imagery World 2D", + Version = "1.0", + Description = [[This map presents low-resolution imagery for the world and + high-resolution imagery for the United States and other metropolitan areas around + the world. The map includes NASA Blue Marble: Next Generation 500m resolution + imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at + medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat + imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for + the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, + parts of Alaska, and several hundred metropolitan areas around the world. + (Description from URL)]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", + License = "Esri Master License Agreement" +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index a7d8021dca..101835a758 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -44,3 +44,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "ESRI VIIRS Combo", + Version = "1.0", + Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World + Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]], + Author = "OpenSpace Tem", + URL = "http://www.openspaceproject.com", + License = "MIT License" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index 110c1067f3..3f05fa1bdf 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -12,3 +12,22 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "ESRI World Imagery", + Version = "1.0", + Description = [[World Imagery provides one meter or better satellite and aerial + imagery in many parts of the world and lower resolution satellite imagery + worldwide. The map includes 15m TerraColor imagery at small and mid-scales + (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world. + The map features 0.5m resolution imagery in the continental United States and + parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is + featured in many parts of the world. In other parts of the world, imagery at + different resolutions has been contributed by the GIS User Community. In select + communities, very high resolution imagery (down to 0.03m) is available down to + ~1:280 scale. (Description from URL)]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", + License = "Esri Master License Agreement" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 00a84bb426..4d6dfeb812 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -8,3 +8,12 @@ local layer = { } asset.export("layer", layer) + +asset.meta = { + Name = "Blue Marble", + Version = "1.0", + Description = [[ Earth image from Blue Marble Next Generation ]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index f841f0e7c0..b134b48e17 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -1,13 +1,13 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", - Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal", + Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)", Type = "TemporalTileLayer", FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "GHRSST_L4_MUR_Sea_Surface_Temperature", - "2002-06-01", - "Yesterday", + "GHRSST_L4_G1SST_Sea_Surface_Temperature", + "2010-06-21", + "2019-12-08", "1d", "1km", "png" @@ -19,3 +19,15 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery + resolution is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index b2d60321b3..a5b9d8f3d2 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -1,15 +1,15 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { - Identifier = "Terra_Modis_Temporal", - Name = "Terra Modis (Temporal)", + Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", Type = "TemporalTileLayer", FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( - "MODIS_Terra_CorrectedReflectance_TrueColor", - "2000-02-24", + "GHRSST_L4_MUR_Sea_Surface_Temperature", + "2002-06-01", "Yesterday", "1d", - "250m", + "1km", "jpg" ) } @@ -19,3 +19,15 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. + "eosdis-components/gibs", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index 4cf909831c..0476a6933f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -19,3 +19,15 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "MODIS Terra Chlorophyll A (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index b2d60321b3..2e6bf716d5 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -19,3 +19,14 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "Terra Modis (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. + "eosdis-components/gibs", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index 19672b3e58..ec4efa26b5 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -19,3 +19,14 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "VIIRS SNPP (Temporal)", + Version = "1.0", + Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution + is 0.25 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services", + URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. + "eosdis-components/gibs", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index f9a4a10cc4..4d2d9a8965 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -6,4 +6,13 @@ local layer = { FilePath = texturesPath .. "/earth_bluemarble_height.jpg", } +asset.meta = { + Name = "Earth Bluemarble Height", + Version = "1.0", + Description = [[ Topographic layer from Blue Marble Next Generation]], + Author = "NASA", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA" +} + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index 79f374944c..83547e724a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -15,4 +15,18 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) +asset.meta = { + Name = "World Elevation (3D)", + Version = "1.0", + Description = [[This globe layer presents elevation data at approximately 90m or 1km + per pixel resolution for the world. The elevation data includes 90m Shuttle Radar + Topography Mission (SRTM) elevation data from NASA and National + Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 + data from the USGS elsewhere. Vertical units are measured in meters.]], + Author = "ESRI", + URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", + License = "Esri Master License Agreement" +} + + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 277e9acf5a..4bd790072f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -15,3 +15,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "Earth at Night 2012", + Version = "1.0", + Description = [[ The lights of cities and villages trace the outlines of civilization + in this global view. ]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index fd3422c73e..0136f3c036 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -19,3 +19,30 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Earth at Night 2012", + Version = "1.0", + Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant + Contrast) layer shows the Earth's surface and atmosphere using a sensor designed + to capture low-light emission sources, under varying illumination conditions. It + is displayed as a grey-scale image. Sources of illumination include both natural + and anthropogenic sources of light emissions. Lunar reflection can be used to + highlight the location and features of clouds and other terrestrial features such + as sea ice and snow cover when there is partial to full moon conditions. When + there is no moonlight, natural and anthropogenic night time light emissions are + highlighted such as city lights, lightning, auroras, fires, gas flares, and + fishing fleets. This layer is useful for showing patterns of human activity and + energy behaviors such as cities and highways, the holiday periods, the tracking + of shipping and fishing fleets at night and, the burning of waste natural gas + (gas flares) from on and offshore oil/gas production sites.

The VIIRS + Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer is + available from the Visible Infrared Imaging Radiometer Suite (VIIRS) on the joint + NASA/NOAA Suomi National Polar orbiting Partnership (Suomi NPP) satellite. + The sensor resolution is 750 m at nadir, imagery resolution is 500 m, and the + temporal resolution is daily.]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index 7ccea6f59f..2cd60d3e6f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -7,3 +7,12 @@ local layer = { } asset.export("layer", layer) + +asset.meta = { + Name = "Blue Marble Night", + Version = "1.0", + Description = [[ Earth's city lights are clearly visible from space ]], + Author = "OpenSpace Team", + URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 3859cf2b28..8d7e2d0d48 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -3,7 +3,6 @@ local transforms = asset.require('scene/solarsystem/planets/earth/transforms') local sunAsset = asset.require('scene/solarsystem/sun/sun') local earthAsset = asset.require('../earth') asset.require('spice/base') -asset.require('./trail') local labelsPath = asset.require('./moon_labels').LabelsPath local Moon = { @@ -58,6 +57,13 @@ local Moon = { } } - +asset.meta = { + Name = "Moon", + Version = "1.0", + Description = [[ Moon asset with labels. ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { Moon }) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset index ea360826f2..216331e938 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset @@ -4,4 +4,5 @@ local LabelsPath = asset.syncedResource({ Identifier = "moon_labels", Version = 1 }) + asset.export("LabelsPath", LabelsPath) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index bd96ce84ac..56744b67c8 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -25,6 +25,14 @@ local MoonTrail = { } } - +asset.meta = { + Name = "Moon Trail", + Version = "1.0", + Description = [[ Moon Trail - This asset contains the trail of the Moon. + Data from NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index bfde270d5a..077a98e020 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -261,3 +261,13 @@ asset.onInitialize(function () end openspace.setPropertyValueSingle("Scene.ISSparentNode.Rotation.yAxis-InvertObject", true) end) + +asset.meta = { + Name = "ISS", + Version = "1.0", + Description = [[ Model and Trail for ISS. Model from NASA 3D models, trail from + CELESTRAK]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset index fd537c3f98..d7ea310c0b 100644 --- a/data/assets/scene/solarsystem/planets/planets.asset +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -1,12 +1,16 @@ asset.require('./mercury/mercury') asset.require('./venus/venus') +asset.require('./venus/trail') +asset.require('./venus/trail_earth') asset.require('./venus/atmosphere') asset.require('./earth/earth') +asset.require('./earth/trail') asset.require('./earth/atmosphere') asset.require('./earth/markers') asset.require('./earth/moon/moon') +asset.require('./earth/moon/trail') asset.require('./mars/mars') asset.require('./mars/atmosphere') diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 20dc032e50..11c20452a6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -16,7 +16,7 @@ local Iapetus = { }, Rotation = { Type = "SpiceRotation", - SourceFrame = "IAU_ENCELADUS", + SourceFrame = "IAU_IAPETUS", DestinationFrame = "GALACTIC" } }, diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index a92d78ef07..b03c84275c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -83,3 +83,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(gallicGroup) ) + + +asset.meta = { + Name = "Saturn Gallic Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Gallic Group + moons: Albiorix, Bebhionn, Erriapus, and Tarvos. Blank globes and SPICE trails are + generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index 273a95d9f7..112f84ddaa 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -99,3 +99,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(inuitGroup) ) + + +asset.meta = { + Name = "Saturn Inuit Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Inuit Group + moons: Kiviuq, Ijiraq, Paaliaq, Siarnaq and Tarqeq. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index 8776452fd1..0f35c54ead 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -494,3 +494,18 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(norseGroup) ) + + + +asset.meta = { + Name = "Saturn Norse Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Norse Group + moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, + Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, + Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, + Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index 765ae86ad5..067649caf6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -224,8 +224,21 @@ local otherGroup = { } - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(otherGroup) ) + + +asset.meta = { + Name = "Saturn Other Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Saturn's Other Group + moons: Phoebe, Skathi, S2007S2, Skoll, S2004S13, Greip, Hyrrokkin, Jarnsaxa, + Mundilfari, S2006S1, S2004S17, Bergelmir, Narvi, Suttungr, Hati, S2004S12, + Farbauti, Thrymr, Aegir, S2007S3, Bestla, S2004S7, S2006S3, Fenrir, Kari, Ymir, + Loge, Fornjot. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset index 996a08aad0..c5979a5e77 100644 --- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -7,3 +7,12 @@ local colorLayer = asset.require(colorLayersPath .. "/uranus_texture") asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Uranus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + +asset.meta = { + Name = "Default Uranus Layers", + Version = "1.0", + Description = [[ Default Uranus layers are: Uranus texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index b14c7e01e8..54e0deced1 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -227,3 +227,16 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) ) + + +asset.meta = { + Name = "Uranus Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular retrograde + moons: Cordelia, Ophelia, Bianca, Cressida, Desdemona, Juliet, Portia, Rosalind, + Cupid, Belinda, Perdita, Puck and Mab. Blank globes and SPICE trails are + generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index f72ebd7094..6b9d29dc92 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -30,8 +30,18 @@ local irregularMoons = { } - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularMoons) ) + + +asset.meta = { + Name = "Uranus Irregular Prograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular prograde + moon: Margaret. A blank globe and SPICE trail are generated for the moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 40df42f66a..da3b314b2d 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -147,3 +147,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularMoons) ) + + +asset.meta = { + Name = "Uranus Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' irregular retrograde + moons: Francisco, Caliban, Stephano, Trinculo, Sycorax, Prospero, Setebos and + Ferdinand. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset index dafed7ee35..9c196b1985 100644 --- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -8,3 +8,12 @@ local Kernels = asset.syncedResource({ asset.export("ura091", Kernels .. "/ura091-rocks-merge.bsp") asset.export("ura111", Kernels .. "/ura111.bsp") asset.export("ura112", Kernels .. "/ura112.bsp") + +asset.meta = { + Name = "Uranus Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Uranus.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset index 9d90211d93..6b9bcf6f34 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -10,4 +10,13 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.meta = { + Name = "Uranus texture", + Version = "1.0", + Description = [[ Uranus image texture ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 628b850ad9..8fc9854302 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -98,3 +98,14 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(majorMoons) ) + +asset.meta = { + Name = "Uranus Marjor Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Uranus' major moons: Miranda, + Ariel, Umbriel, Titania, and Oberon. Blank globes and SPICE trails are generated + for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index 83a3d6391f..81cb8d03e5 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -1,3 +1,13 @@ asset.require('./inner_moons') asset.require('./irregular_prograde_moons') asset.require('./irregular_retrograde_moons') + +asset.meta = { + Name = "Uranus Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing three moon groups: Inner Moons, Irregular + Prograde Moons and Irregular Retrograde Moons]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 7acf031ffe..8cea4396b9 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -25,5 +25,15 @@ local UranusTrail = { } - assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrail }) + + +asset.meta = { + Name = "Uranus Trail", + Version = "1.0", + Description = [[ Trail of Uranus as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index aec617b326..f94ff2e3d7 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -22,3 +22,13 @@ local UranusBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { UranusBarycenter }) + + +asset.meta = { + Name = "Uranus Transforms", + Version = "1.0", + Description = [[ Uranus Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 89421662c2..8f69ad8d9e 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -47,3 +47,13 @@ local UranusLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Uranus, UranusLabel }) + + +asset.meta = { + Name = "Uranus", + Version = "1.0", + Description = [[ Uranus globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index a89828ffbc..b669b36381 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -61,6 +61,13 @@ local Atmosphere = { } } - +asset.meta = { + Name = "Venus Atmosphere", + Version = "1.0", + Description = [[ Atmosphere of Venus.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index 4f3bace335..432f0475aa 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -14,3 +14,13 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) end) + +asset.meta = { + Name = "Default Venus Layers", + Version = "1.0", + Description = [[ Default Venus layers are: Venus Magellan Mosaic and Venus Magellan + DEM]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset index c4987ddc21..2679f376e9 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -15,4 +15,30 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.meta = { + Name = "Venus Magellan Mosaic", + Version = "1.0", + Description = [[ Color layer for Venus. This mosaic was created from the Magellan + F-BIDRs, (Full resolution Basic Image Data Records), the highest resolution + radar images of the Venus surface (~75 m/pixel). Because Venus is shrouded by a + dense, opaque atmosphere, conventional optical cameras cannot be used to image + its surface. Instead, Magellan's imaging radar uses bursts of microwave energy + somewhat like a camera flash to illuminate the planet's surface. The radar pulses + are not sent directly downward but rather at a slight angle to the side of the + spacecraft--the radar is thus called "side-looking radar." In addition, special + processing techniques are used on the radar data to result in higher resolution + as if the radar had a larger antenna, or "aperture"; the technique is thus often + called "synthetic aperture radar," or SAR. The Magellan SAR is a side-looking + radar system. Radar pulses are not sent directly downward but rather at a slight + angle to the side of the spacecraft. In the case of Left-Look Magellan SAR data, + the radar system was sending signals to the left of the spacecraft. The SAR + operated in this left-looking mode during cycles 1 and 3 of the mission. + (Description from USGS)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. + "Venus_Magellan_LeftLook_mosaic_global_75m", + License = "NASA/PDS" +} + + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset index 7696d2428b..8893b2bbac 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -16,4 +16,23 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) +asset.meta = { + Name = "Venus Magellan DEM", + Version = "1.0", + Description = [[ Elevation layer for Venus. The represents the version 2 + (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). + The range to surface is derived by fitting altimeter echoes from the fan-beam + altimetry antenna as a function of time to Hagfors' radar backscatter model + templates. The ranges are subtracted from the spacecraft radial + coordinate (derived from Doppler tracking), yielding measurements of + planetary radius. The data are filtered to remove low-frequency errors in + the in-plane elements of each spacecraft orbit, and then originally re-sampled + into sinusoidal, Mercator, and north and south polar stereographic projections + at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. + "/Venus_Magellan_Topography_Global_4641m_v02", + License = "NASA/PDS" +} + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index b9c3d86743..c760f5177c 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -26,6 +26,15 @@ local VenusTrail = { } } +asset.meta = { + Name = "Venus Trail", + Version = "1.0", + Description = [[ Trail of Venus as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrail }) diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset new file mode 100644 index 0000000000..eb55c4b3d5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -0,0 +1,40 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +asset.require("spice/base") + + + +local VenusTrailEarth = { + Identifier = "VenusTrailEarth", + Parent = transforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "VENUS BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + GUI = { + Name = "Venus Trail from Earth", + Path = "/Solar System/Planets/Venus", + Hidden = true + } +} + +asset.meta = { + Name = "Venus Trail from Earth", + Version = "1.0", + Description = [[ Trail of Venus as observed by the Earth. Data from NASA + SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index c3071d5fa5..271e6ceffc 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -18,4 +18,14 @@ local VenusBarycenter = { } } +asset.meta = { + Name = "Venus Transforms", + Version = "1.0", + Description = [[ Venus Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + + assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index d591a30cc1..002338dc03 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -69,5 +69,13 @@ local VenusLabel = { } } +asset.meta = { + Name = "Venus", + Version = "1.0", + Description = [[ Venus globe with labels, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel }) diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index 99658a50f5..6d7fd76840 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'amor_asteroid', 'sssb_data_amor_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', "Amor Asteroids", filepath, { 1.0, 1.0, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'amor_asteroid', + 'sssb_data_amor_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', + "Amor Asteroids", filepath, { 1.0, 1.0, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 4 object.Renderable.TrailFade = 11 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Amor Asteroids", Version = "1.0", - Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to Earth's but interior to Mars'. ]], + Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to + Earth's but interior to Mars'. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws."]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 258ff6c01f..73c07b4aa7 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'apollo_asteroid', 'sssb_data_apollo_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', "Apollo Asteroids", filepath, { 0.7, 0.7, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'apollo_asteroid', + 'sssb_data_apollo_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', + "Apollo Asteroids", filepath, { 0.7, 0.7, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 10 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Apollo Asteroids", Version = "1.0", - Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes larger than Earth's. ]], + Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes larger + than Earth's. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index c768ccac07..644b4649e9 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'aten_asteroid', 'sssb_data_aten_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', "Aten Asteroids", filepath, { 0.15, 0.15, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'aten_asteroid', + 'sssb_data_aten_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', + "Aten Asteroids", filepath, { 0.15, 0.15, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 18 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Aten Asteroids", Version = "1.0", - Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes smaller than Earth's. ]], + Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes + smaller than Earth's. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index 9a7ec7ddaf..f6fa21c9b4 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'atira_asteroid', 'sssb_data_atira_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', "Atira Asteroids", filepath, { 0.5, 0.8, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'atira_asteroid', + 'sssb_data_atira_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', + "Atira Asteroids", filepath, { 0.5, 0.8, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 25 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Atira Asteroids", Version = "1.0", - Description = [[ Near-Earth-Asteroids whose orbits are contained entirely within the orbit of the Earth. ]], + Description = [[ Near-Earth-Asteroids whose orbits are contained entirely within the + orbit of the Earth. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws."]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 27acaa4adf..ac412978e8 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -40,9 +40,22 @@ local C2019Y4AtlasPosition = { }, }, GUI = { - Name = "C 2019 Y4 Atlas", - Path = "/Solar System/Comets" + Name = "C/2019 Y4 Atlas", + Path = "/Solar System/Comets", + Description = 'This is the position for C/2019 Y4 Atlas' } } -assetHelper.registerSceneGraphNodesAndExport(asset, {C2019Y4AtlasPosition, C2019Y4AtlasTrail }) +asset.meta = { + Name = "C/2019 Y4 Atlas", + Version = "1.0", + Description = [[ This asset contains the trail and position of C/2019 Y4 Atlas from + 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = "NASA" +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { + C2019Y4AtlasPosition, C2019Y4AtlasTrail +}) diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index 1584ab3c91..7ed5d7ac6b 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'centaur_asteroid', 'sssb_data_centaur_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', "Centaur Asteroids", filepath, { 0.94, 0.96, 0.94 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'centaur_asteroid', + 'sssb_data_centaur_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', + "Centaur Asteroids", filepath, { 0.94, 0.96, 0.94 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 18 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Centaur Asteroids", Version = "1.0", - Description = [[ Asteroids with either a perihelion or a semi-major axis between those of the four outer planets. ]], + Description = [[ Asteroids with either a perihelion or a semi-major axis between + those of the four outer planets. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index faad6f4c8e..b1a4df3533 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'chiron-type_comet', 'sssb_data_chiron-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', "Chiron-type Comets", filepath, { 0.15 ,0.1 ,1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'chiron-type_comet', + 'sssb_data_chiron-type_comet') +local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', + "Chiron-type Comets", filepath, { 0.15 ,0.1 ,1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 25 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Chiron-Type Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of greater than 3 and a semi-major axis greater than that of Jupiter. ]], + Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + greater than 3 and a semi-major axis greater than that of Jupiter. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 8a51d5c041..519148d812 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'encke-type_comet', 'sssb_data_encke-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', "Encke-type Comets", filepath, { 0.8, 0.34, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'encke-type_comet', + 'sssb_data_encke-type_comet') +local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', + "Encke-type Comets", filepath, { 0.8, 0.34, 1.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 23 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Encke-Type Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of greater than 3 and a semi-major axis less than that of Jupiter. ]], + Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + greater than 3 and a semi-major axis less than that of Jupiter. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index 004ff8ce03..e6e4f2f362 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'halley-type_comet', 'sssb_data_halley-type_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', "Halley-type Comets", filepath, { 0.66, 0.66, 0.66 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'halley-type_comet', + 'sssb_data_halley-type_comet') +local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', + "Halley-type Comets", filepath, { 0.66, 0.66, 0.66 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 9 object.Renderable.TrailFade = 18 @@ -16,5 +18,7 @@ asset.meta = { Description = [[ Periodic comets with an orbital period between 20 and 200 years. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index aef5fba263..faec8cc44a 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'inner_main_belt_asteroid', 'sssb_data_inner_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', "Inner Main Asteroid Belt", filepath, { 1.0, 1.0, 0.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'inner_main_belt_asteroid', + 'sssb_data_inner_main_belt_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', + "Inner Main Asteroid Belt", filepath, { 1.0, 1.0, 0.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.5 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Inner Main Asteroid Belt", Version = "1.0", - Description = [[ Asteroids with a semi-major axis less than 2.0 au and a perihelion distance greater than 1.666 au. ]], + Description = [[ Asteroids with a semi-major axis less than 2.0 au and a perihelion + distance greater than 1.666 au. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index 2046630045..59a002092d 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter-family_comet', 'sssb_data_jupiter-family_comet') -local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', "Jupiter-family Comets", filepath, { 0.2, 0.8, 0.2 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter-family_comet', + 'sssb_data_jupiter-family_comet') +local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', + "Jupiter-family Comets", filepath, { 0.2, 0.8, 0.2 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 28 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Family Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of between 2 and 3. ]], + Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + between 2 and 3. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index e12ef74aae..f823a9392e 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter_trojan_asteroid', 'sssb_data_jupiter_trojan_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', "Jupiter Trojan Asteroids", filepath, { 0.5, 0.8, 0.5 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter_trojan_asteroid', + 'sssb_data_jupiter_trojan_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', + "Jupiter Trojan Asteroids", filepath, { 0.5, 0.8, 0.5 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 5 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Trojan Asteroids", Version = "1.0", - Description = [[ Asteroids trapped in Jupiter's L4/L5 Lagrange points (semimajor axis of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]], + Description = [[ Asteroids trapped in Jupiter's L4/L5 Lagrange points (semimajor axis + of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index 8154d3643f..dcdb19f388 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'main_belt_asteroid', 'sssb_data_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', "Main Asteroid Belt", filepath, { 0.0, 0.5, 0.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'main_belt_asteroid', + 'sssb_data_main_belt_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', + "Main Asteroid Belt", filepath, { 0.0, 0.5, 0.0 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.1 @@ -14,8 +16,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Main Asteroid Belt", Version = "1.0", - Description = [[ Asteroids with a semi-major axis of between 2.0 and 3.2 au, and a perihelion distance greater than 1.666 au. ]], + Description = [[ Asteroids with a semi-major axis of between 2.0 and 3.2 au, and a + perihelion distance greater than 1.666 au. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index 8bded6abe9..ef86c10482 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -1,8 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'mars-crossing_asteroid', 'sssb_data_mars-crossing_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', "Mars-crossing Asteroids", filepath, { 0.814, 0.305, 0.220 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'mars-crossing_asteroid', + 'sssb_data_mars-crossing_asteroid') +local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', + "Mars-crossing Asteroids", filepath, { 0.814, 0.305, 0.220 }) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 13 @@ -13,8 +15,11 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Mars-Crossing Asteroids", Version = "1.0", - Description = [[ Asteroids that cross the orbit of Mars, with a semi-major axis of less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]], + Description = [[ Asteroids that cross the orbit of Mars, with a semi-major axis of + less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. and + Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index a1b5dc806f..13f7c453d2 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -1,8 +1,17 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'outer_main_belt_asteroid', 'sssb_data_outer_main_belt_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_outer_main_belt_asteroid.csv', "Outer Main Asteroid Belt", filepath, { 0.4, 0.4, 1.0 }) +local filepath = sharedSssb.downloadSssbDatabaseFile( + asset, + 'outer_main_belt_asteroid', + 'sssb_data_outer_main_belt_asteroid' +) +local object = sharedSssb.createSssbGroupObject( + 'sssb_data_outer_main_belt_asteroid.csv', + "Outer Main Asteroid Belt", + filepath, + { 0.4, 0.4, 1.0 } +) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 2 @@ -16,5 +25,7 @@ asset.meta = { Description = [[ Asteroids with a semi-major axis of between 3.2 and 4.6 au. ]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. + All documents available from this server may be protected under the U.S. + and Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index 41639b39a0..5371e6d54b 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -2,7 +2,11 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'pha', 'sssb_data_pha') -local object = sharedSssb.createSssbGroupObject('sssb_data_pha.csv', "Potentially Hazardous Asteroids", filepath, { 0.98, 0.09, 0.06}) +local object = sharedSssb.createSssbGroupObject('sssb_data_pha.csv', + "Potentially Hazardous Asteroids", + filepath, + { 0.98, 0.09, 0.06} +) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 3 object.Renderable.TrailFade = 17 @@ -13,8 +17,14 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Potentially-Hazardous Asteroids", Version = "1.0", - Description = [[ Asteroids that are deemed potentially hazardous to Earth based on their close approaches. All asteroids with an Earth Minimum Orbit Intersection Distance (MOID) of 0.05 au or less, and with an absolute magnitude (H) of 22.0 or less. ]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", + Description = [[ Asteroids that are deemed potentially hazardous to Earth + based on their close approaches. All asteroids with an Earth Minimum + Orbit Intersection Distance (MOID) of 0.05 au or less, and with an + absolute magnitude (H) of 22.0 or less. ]], + Author = [[JPL Small-Body Database hosted by California Institute of + Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws.]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index 225c9f5e97..f9b630ddd0 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -19,7 +19,7 @@ local SwiftTuttleTrail = { }, Color = { 0.9, 0.9, 0.0 }, StartTime = "1879 JUN 27 00:00:00", - EndTime = "2019 JUN 27 00:00:00", + EndTime = "1879 JUN 27 00:00:00", SampleInterval = 60 }, GUI = { @@ -43,4 +43,19 @@ local SwiftTuttlePosition = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { SwiftTuttlePosition, SwiftTuttleTrail }) +asset.meta = { + Name = "Swift Tuttle", + Version = "1.0", + Description = [[ Position and Trail of Swift Tuttle from 1879 JUN 27 + to 1879 JUN 27. Data from JPL Horizons]], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { + SwiftTuttlePosition, SwiftTuttleTrail +}) diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index ca2a577dff..6d0c54f30f 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -44,4 +44,16 @@ local TeslaPosition = { } } +asset.meta = { + Name = "Tesla Roadster", + Version = "1.0", + Description = [[ Position and Trail of Tesla Roadster from 2018 FEB 8 + to 2022 FEB 7 00:00:00. Data from JPL Horizons.]], + Author = "OpenSpace Team", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws.]] +} + assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadsterTrail }) diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index 7a8104fadd..cc2506e91c 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -1,8 +1,16 @@ local assetHelper = asset.require('util/asset_helper') local sharedSssb = asset.require('./sssb_shared') -local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'transneptunian_object_asteroid', 'sssb_data_transneptunian_object_asteroid') -local object = sharedSssb.createSssbGroupObject('sssb_data_transneptunian_object_asteroid.csv', "Transneptunian Object Asteroids", filepath, {0.56, 0.64, 0.95 }) +local filepath = sharedSssb.downloadSssbDatabaseFile(asset, + 'transneptunian_object_asteroid', + 'sssb_data_transneptunian_object_asteroid' +) +local object = sharedSssb.createSssbGroupObject( + 'sssb_data_transneptunian_object_asteroid.csv', + "Transneptunian Object Asteroids", + filepath, + {0.56, 0.64, 0.95 } +) object.Renderable.Enabled = false object.Renderable.SegmentQuality = 8 object.Renderable.TrailFade = 10 @@ -13,8 +21,13 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Trans-Neptunian Asteroids", Version = "1.0", - Description = [[ Any minor or dwarf planets in the solar system that orbit the Sun at a greater average distance than Neptune (semi-major axis of 30.1 AU). ]], - Author = "JPL Small-Body Database hosted by California Institute of Technology", + Description = [[ Any minor or dwarf planets in the solar system that orbit + the Sun at a greater average distance than Neptune (semi-major axis + of 30.1 AU). ]], + Author = [[JPL Small-Body Database hosted by California Institute of + Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", - License = "JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws." + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset index fba1e4662d..d3688c876e 100644 --- a/data/assets/scene/solarsystem/sun/default_layers.asset +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -7,3 +7,12 @@ local colorLayer = asset.require(colorLayersPath .. "/sun_texture") asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Sun.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + +asset.meta = { + Name = "Default Sun layers", + Version = "1.0", + Description = [[ Default Sun layers renderable globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 57d3a6eed3..0bdc1e032d 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -31,6 +31,14 @@ local SunGlare = { } } +asset.meta = { + Name = "Sun Glare", + Version = "1.0", + Description = [[ Sun glare effect. Enabled by default instead of sun orb.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { SunGlare }) diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset index 88b59357fe..53b67a646a 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -10,4 +10,13 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.meta = { + Name = "Sun Texture", + Version = "1.0", + Description = [[ Default Sun texture for renderable globe.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 7bfdaf911e..3ddac76035 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -23,6 +23,14 @@ local SunMarker = { } } +asset.meta = { + Name = "Sun marker", + Version = "1.0", + Description = [[ Sun marker with name, sized for Solar System view]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} assetHelper.registerSceneGraphNodesAndExport(asset, { SunMarker }) diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 5fabf2aa61..4fe7a45e5e 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -46,4 +46,14 @@ local SunLabel = { } } +asset.meta = { + Name = "Sun", + Version = "1.0", + Description = [[ The Sun and label]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + + assetHelper.registerSceneGraphNodesAndExport(asset, { Sun, SunLabel }) diff --git a/data/assets/scene/solarsystem/sun/sun_textures.asset b/data/assets/scene/solarsystem/sun/sun_textures.asset index e63bbfdbad..364b18366c 100644 --- a/data/assets/scene/solarsystem/sun/sun_textures.asset +++ b/data/assets/scene/solarsystem/sun/sun_textures.asset @@ -5,4 +5,13 @@ local TexturesPath = asset.syncedResource({ Version = 4 }) +asset.meta = { + Name = "Sun Textures", + Version = "4.0", + Description = [[ Default Sun textures]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index ea76c08add..8d56d16633 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -64,4 +64,14 @@ local SunECLIPJ2000 = { } } +asset.meta = { + Name = "Sun Transforms", + Version = "1.0", + Description = [[ Sun transforms: Solar System Barycenter, SUN IAU and + SUN J2000]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 }) diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset index f4ebaef051..ca49594abc 100644 --- a/data/assets/spice/base.asset +++ b/data/assets/spice/base.asset @@ -16,6 +16,15 @@ local kernels = { syncedDirectory .. "/de430_1850-2150.bsp" } +asset.meta = { + Name = "SPICE Base", + Version = "1.0", + Description = [[ This asset contains the spice base kernels. With positions + for Solar System bodies from 1850 to 2150]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/naif/data_generic.html", + License = "NASA" +} assetHelper.registerSpiceKernels(asset, kernels) diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset index b6e08b0100..f576c94638 100644 --- a/data/assets/util/default_keybindings.asset +++ b/data/assets/util/default_keybindings.asset @@ -142,6 +142,19 @@ openspace.setPropertyValueSingle("RenderEngine.ShowCamera", not isEnabled)]], GuiPath = "/Simulation Speed", Local = true }, + { + Key = "R", + Name = "toggle radiosphere opacity", + Command = "local FADETIME = 2.5;" .. + "local PROPTOFADE = 'Scene.RadioSphere.Renderable.Opacity';" .. + "local currentOpacity = openspace.getPropertyValue(PROPTOFADE); " .. + "if (currentOpacity == 0.0) then " .. + "openspace.setPropertyValueSingle(PROPTOFADE, 1.0, FADETIME);else ".. + "openspace.setPropertyValueSingle(PROPTOFADE, 0, FADETIME);end", + Documentation = "Fade in and out the radio sphere.", + GuiPath = "/General", + Local = true + }, } local DeltaTimeKeys diff --git a/data/assets/util/procedural_globe.asset b/data/assets/util/procedural_globe.asset index 6a7650fe94..3ab698e673 100644 --- a/data/assets/util/procedural_globe.asset +++ b/data/assets/util/procedural_globe.asset @@ -1,6 +1,7 @@ asset.require('spice/base') -local createGlobeWithoutName = function(identifier, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels) +local createGlobeWithoutName = function(identifier, parent, parentSpiceName, spiceName, + radii, tags, guiPath, trailColor, orbitPeriod, kernels) return { Identifier = identifier, Parent = parent, @@ -43,9 +44,10 @@ local createGlobeWithoutName = function(identifier, parent, parentSpiceName, spi } end -local createGlobeWithName = function(identifier, name, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels) - g, t = createGlobeWithoutName(identifier, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels) - +local createGlobeWithName = function(identifier, name, parent, parentSpiceName, spiceName, + radii, tags, guiPath, trailColor, orbitPeriod, kernels, layers) + g, t = createGlobeWithoutName(identifier, parent, parentSpiceName, spiceName, radii, + tags, guiPath, trailColor, orbitPeriod, kernels, layers) g.GUI.Name = name t.GUI.Name = name .. " Trail" @@ -58,7 +60,8 @@ asset.export("createGlobeWithName", createGlobeWithName) local createGlobes = function(t) for _,v in pairs(t) do if type(v) ~= "table" then - openspace.printWarning("The table passed to 'createGlobes' was not a table of tables") + local warning = "The table passed to 'createGlobes' was not a table of tables" + openspace.printWarning(warning) -- We return an empty table of tables to silence a potential future warning return {{}} end @@ -69,6 +72,9 @@ local createGlobes = function(t) for i, v in ipairs(t) do local globe = nil local trail = nil + if not v.Layers then + v.Layers = {} + end if v.Name then globe, trail = createGlobeWithName( v.Identifier, @@ -81,7 +87,8 @@ local createGlobes = function(t) v.GUI.Path, v.TrailColor, v.OrbitPeriod, - v.Kernels + v.Kernels, + v.Layers ) else globe, trail = createGlobeWithoutName( @@ -94,7 +101,8 @@ local createGlobes = function(t) v.GUI.Path, v.TrailColor, v.OrbitPeriod, - v.Kernels + v.Kernels, + v.Layers ) end diff --git a/data/web/documentation/scenelicense.hbs b/data/web/documentation/scenelicense.hbs index b4b0828d8d..f60b719a53 100644 --- a/data/web/documentation/scenelicense.hbs +++ b/data/web/documentation/scenelicense.hbs @@ -3,11 +3,14 @@

-

Asset - {{name}}

+

+ Asset - {{name}} +

{{{description}}}

Version - {{version}}

Author - {{author}}

Associated URL - {{url}}

+

License - {{license}}

Filepath - {{path}}

diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp index 24cbf84cf2..0e659b2fd7 100644 --- a/modules/server/src/topics/documentationtopic.cpp +++ b/modules/server/src/topics/documentationtopic.cpp @@ -41,6 +41,7 @@ namespace { constexpr const char* TypeLua = "lua"; constexpr const char* TypeFactories = "factories"; constexpr const char* TypeKeyboard = "keyboard"; + constexpr const char* TypeAsset = "asset"; } // namespace namespace openspace { @@ -62,6 +63,9 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) { else if (requestedType == TypeKeyboard) { response = json::parse(global::keybindingManager.generateJson()); } + else if (requestedType == TypeAsset) { + response = json::parse(global::keybindingManager.generateJson()); + } _connection->sendJson(wrappedPayload(response)); } diff --git a/openspace.cfg b/openspace.cfg index d8f3b1d237..0a6efa9400 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -2,104 +2,82 @@ -- require('scripts/configuration_helper.lua') -- which defines helper functions useful to customize the configuration --- Determines which SGCT configuration file is loaded, that is, if there rendering --- occurs in a single window, a fisheye projection, or a dome cluster system +-- Variable: SGCTConfig +-- Determines which SGCT configuration file is loaded, that is, if there +-- rendering occurs in a single window, a fisheye projection, +-- or a dome cluster system -- A regular 1280x720 window SGCTConfig = sgct.config.single{} - -- A regular 1920x1080 window -- SGCTConfig = sgct.config.single{1920, 1080} - -- A windowed 1920x1080 fullscreen -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}} - --- One window for the GUI and one window for rendering. --- SGCTConfig = "${CONFIG}/single_gui.xml" - --- GUI window on monitor 1, fullscreen window for rendering on monitor 2 (1080p). --- SGCTConfig = "${CONFIG}/gui_projector.xml" - --- One window for the GUI and one window for rendering fisheye --- SGCTConfig = "${CONFIG}/single_fisheye_gui.xml" - -- A 1k fisheye rendering -- SGCTConfig = sgct.config.fisheye{1024, 1024} - -- A 4k fisheye rendering in a 1024x1024 window -- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27} - -- Streaming OpenSpace via Spout to OBS -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"} --- A side-by-side test of mutiple viewport (also with different eyes) --- SGCTConfig = "${CONFIG}/single_sbs_stereo.xml" +--for more details about sgct configuration options see: +-- http://wiki.openspaceproject.com/docs/users/configfile --- Spout exit --- SGCTConfig = "${CONFIG}/spout_output.xml" +-- To use a sgct configuration file set the variable like below +-- SGCTConfig = "${CONFIG}/single_gui.xml" +-- In the config/ folder we provide the some predefined files which you can modify. +-- fullscreen1080.xml: fullscreen window at 1920x1080 +-- gui_projector.xml: one window for the gui and a second fullscreen window for rendering +-- on the second monitor +-- openvr_htcVive.xml: window for VR on HTC Vive, only works if OpenSpace is compiled +-- custom with the openvr support +-- openvr_oculusRiftCv1.xml: window for VR on Oculus Rift, only works if OpenSpace is +-- compiled custom with the openvr support +-- single.xml: regular window +-- single_fisheye.xml: regular window with fisheye rendering +-- single_fisheye_gui.xml: one window for the gui, one window for fisheye rendering +-- single_gui.xml: one window for the gui, one window for rendering +-- single_sbs_stereo.xml: one window with side by side rendering for stereo/3d support +-- single_two_win.xml: two windows with gui and rendering +-- spherical_mirror.xml: one window with a spherical mirror rendering +-- spherical_mirror_gui.xml: one window for the gui, and one window with a spherical +-- mirror rendering +-- spout_out.xml: a window where the rendering is sent to spout instead of the display +-- two_nodes.xml: a configuration for running two instances of openspace, used for +-- multiple projection systems --- VR support only if compiled from source with OpenVR --- SGCTConfig = "${CONFIG}/openvr_oculusRiftCv1.xml" --- SGCTConfig = "${CONFIG}/openvr_htcVive.xml" - - --- Sets the scene that is to be loaded by OpenSpace. A scene file is a description --- of all entities that will be visible during an instance of OpenSpace --- Asset = "default" --- Asset = "asteroids" --- Asset = "default_full" --- Asset = "newhorizons" --- Asset = "rosetta" --- Asset = "osirisrex" --- Asset = "voyager" --- Asset = "gaia" --- Asset = "juno" --- Asset = "messenger" --- Asset = "insight" --- Asset = "apollo8" --- Asset = "apollo_sites" --- Asset = "touch" --- Asset = "dawn" --- Asset = "mars" - --- Sets the profile that should be loaded by OpenSpace. Profiles are going to replace --- assets in a future versions and shouldn't be used at the same time as the 'Asset' --- setting above --- Profile = "apollo_sites" --- Profile = "apollo8" --- Profile = "asteroids" --- Profile = "dawn" +-- Variable: Profile +-- Sets the profile that should be loaded by OpenSpace. Profile = "default" --- Profile = "default_full" --- Profile = "gaia" --- Profile = "insight" --- Profile = "juno" --- Profile = "mars" --- Profile = "messenger" --- Profile = "newhorizons" --- Profile = "osirisrex" --- Profile = "rosetta" --- Profile = "touch" --- Profile = "voyager" +-- Other default OpenSpace profiles are: +-- apollo_sites, apollo8, asteroids, dawn +-- default, default_full, gaia, juno, mars, messenger +-- newhorizons, osirisrex, rosetta, voyager --- These scripts are executed after the initialization of each scene, thus making --- it possible to have global overrides to default values or execute other scripts --- regardless of the scene that is loaded +-- Variable: Asset +-- If you have a .scene file from version 0.15.2 or prior, use this variable and unset or +-- remove the Profile variable above +-- Asset = "custom_scene" + +-- These scripts are executed after the initialization of each scene, +--thus making it possible to have global overrides to default values +-- or execute other scripts regardless of the scene that is loaded GlobalCustomizationScripts = { "${SCRIPTS}/customization.lua" } +-- Use these paths if you want to put items outside of +-- the main OpenSpace folder. Typically SYNC Paths = { DATA = "${BASE}/data", ASSETS = "${DATA}/assets", PROFILES = "${DATA}/profiles", FONTS = "${DATA}/fonts", TASKS = "${DATA}/tasks", - SYNC = "${BASE}/sync", + SYNC = "E:/os/sync", SCREENSHOTS = "${BASE}/screenshots", WEB = "${DATA}/web", RECORDINGS = "${BASE}/recordings", - CACHE = "${BASE}/cache", CONFIG = "${BASE}/config", DOCUMENTATION = "${BASE}/documentation", @@ -213,14 +191,15 @@ GlobalRotation = { 0.0, 0.0, 0.0 } MasterRotation = { 0.0, 0.0, 0.0 } ScreenSpaceRotation = { 0.0, 0.0, 0.0 } -RenderingMethod = "Framebuffer" +RenderingMethod = "Framebuffer" -- alternative: "ABuffer" OpenGLDebugContext = { Activate = false, FilterIdentifier = { { Type = "Other", Source = "API", Identifier = 131185 }, - { Type = "Performance", Source = "API", Identifier = 131186 }, --Buffer performance warning: "copied/moved from VIDEO memory to HOST memory" - { Type = "Deprecated", Source = "API", Identifier = 7 } -- API_ID_LINE_WIDTH deprecated behavior warning has been generated +-- Buffer performance warning: "copied/moved from VIDEO memory to HOST memory" + { Type = "Performance", Source = "API", Identifier = 131186 }, +-- API_ID_LINE_WIDTH deprecated behavior warning has been generated + { Type = "Deprecated", Source = "API", Identifier = 7 } }, --- FilterSeverity = { } +-- FilterSeverity = { } } ---RenderingMethod = "ABuffer" -- alternative: "Framebuffer" diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp index eb3065e9aa..011ed21fcb 100644 --- a/src/scene/scenelicensewriter.cpp +++ b/src/scene/scenelicensewriter.cpp @@ -92,18 +92,7 @@ std::string SceneLicenseWriter::generateJson() const { } json << "]"; - - std::string jsonString; - for (const char& c : json.str()) { - if (c == '\'') { - jsonString += "\\'"; - } - else { - jsonString += c; - } - } - - return jsonString; + return json.str(); } } // namespace openspace From 4080d70feb8dc4856b3ebc70295dbb82b5c454cd Mon Sep 17 00:00:00 2001 From: Micah Date: Mon, 28 Sep 2020 08:39:52 -0400 Subject: [PATCH 02/12] solar system update --- .../dwarf_planets/pluto/charon/charon.asset | 10 +++++ .../pluto/charon/charon_trail.asset | 11 +++++ .../pluto/charon/default_layers.asset | 13 +++++- .../layers/colorlayers/greyscale_usgs.asset | 19 ++++++++ .../dwarf_planets/pluto/default_layers.asset | 13 +++++- .../dwarf_planets/pluto/kernels.asset | 9 ++++ .../layers/colorlayers/greyscale_usgs.asset | 22 ++++++++++ .../dwarf_planets/pluto/minor/hydra.asset | 11 +++++ .../dwarf_planets/pluto/minor/kerberos.asset | 11 +++++ .../dwarf_planets/pluto/minor/nix.asset | 11 +++++ .../dwarf_planets/pluto/minor/styx.asset | 11 +++++ .../dwarf_planets/pluto/pluto.asset | 10 +++++ .../dwarf_planets/pluto/pluto_trail.asset | 11 +++++ .../dwarf_planets/pluto/system.asset | 10 +++++ .../dwarf_planets/pluto/trail.asset | 11 +++++ .../dwarf_planets/pluto/transforms.asset | 10 +++++ .../planets/earth/atmosphere.asset | 10 +++++ .../planets/earth/default_layers.asset | 28 ++++++++++-- .../solarsystem/planets/earth/markers.asset | 11 ++++- .../solarsystem/planets/earth/moon/moon.asset | 2 +- .../solarsystem/planets/earth/trail.asset | 11 +++++ .../planets/earth/transforms.asset | 11 +++++ .../planets/jupiter/callisto/callisto.asset | 10 +++++ .../jupiter/callisto/default_layers.asset | 13 +++++- .../layers/colorlayers/callisto_texture.asset | 10 +++++ .../planets/jupiter/callisto/trail.asset | 11 +++++ .../planets/jupiter/default_layers.asset | 13 +++++- .../jupiter/europa/default_layers.asset | 13 +++++- .../planets/jupiter/europa/europa.asset | 10 +++++ .../layers/colorlayers/europa_texture.asset | 10 +++++ .../colorlayers/voyager_global_mosaic.asset | 20 +++++++++ .../planets/jupiter/europa/trail.asset | 11 +++++ .../jupiter/ganymede/default_layers.asset | 13 +++++- .../planets/jupiter/ganymede/ganymede.asset | 10 +++++ .../layers/colorlayers/ganymede_texture.asset | 10 +++++ .../planets/jupiter/ganymede/trail.asset | 11 +++++ .../planets/jupiter/io/default_layers.asset | 13 +++++- .../solarsystem/planets/jupiter/io/io.asset | 10 +++++ .../io/layers/colorlayers/io_texture.asset | 10 +++++ .../planets/jupiter/io/trail.asset | 11 +++++ .../solarsystem/planets/jupiter/jupiter.asset | 10 +++++ .../solarsystem/planets/jupiter/kernels.asset | 9 ++++ .../layers/colorlayers/jupiter_texture.asset | 10 +++++ .../planets/jupiter/major_moons.asset | 11 +++++ .../planets/jupiter/minor/ananke_group.asset | 13 ++++++ .../planets/jupiter/minor/carme_group.asset | 14 ++++++ .../planets/jupiter/minor/carpo_group.asset | 12 +++++ .../planets/jupiter/minor/himalia_group.asset | 12 +++++ .../planets/jupiter/minor/inner_group.asset | 12 +++++ .../planets/jupiter/minor/other_groups.asset | 12 +++++ .../jupiter/minor/pasiphae_group.asset | 14 ++++++ .../jupiter/minor/themisto_group.asset | 11 +++++ .../planets/jupiter/minor_moons.asset | 11 +++++ .../solarsystem/planets/jupiter/trail.asset | 11 +++++ .../planets/jupiter/transforms.asset | 10 +++++ .../solarsystem/planets/mars/atmosphere.asset | 10 +++++ .../planets/mars/default_layers.asset | 18 +++++++- .../colorlayers/fallbacks/mars_texture.asset | 10 +++++ .../scene/solarsystem/planets/mars/mars.asset | 10 +++++ .../solarsystem/planets/mars/trail.asset | 11 +++++ .../solarsystem/planets/mars/transforms.asset | 10 +++++ .../planets/mercury/default_layers.asset | 16 ++++++- .../layers/colorlayers/alsimap_02122015.asset | 1 + .../layers/colorlayers/casimap_02122015.asset | 1 + .../layers/colorlayers/fesimap_02122015.asset | 1 + .../layers/colorlayers/mgsimap_02122015.asset | 1 + .../layers/colorlayers/ssimap_02122015.asset | 1 + .../solarsystem/planets/mercury/mercury.asset | 10 +++++ .../solarsystem/planets/mercury/trail.asset | 11 +++++ .../planets/mercury/transforms.asset | 10 +++++ .../planets/neptune/default_layers.asset | 13 +++++- .../planets/neptune/inner_moons.asset | 12 +++++ .../neptune/irregular_prograde_moons.asset | 12 +++++ .../neptune/irregular_retrograde_moons.asset | 12 +++++ .../solarsystem/planets/neptune/kernels.asset | 9 ++++ .../layers/colorlayers/neptune_texture.asset | 10 +++++ .../planets/neptune/major_moons.asset | 10 +++++ .../solarsystem/planets/neptune/neptune.asset | 10 +++++ .../solarsystem/planets/neptune/trail.asset | 11 +++++ .../planets/neptune/transforms.asset | 10 +++++ .../solarsystem/planets/neptune/triton.asset | 11 +++++ .../planets/saturn/default_layers.asset | 10 +++++ .../planets/saturn/dione/default_layers.asset | 13 +++++- .../planets/saturn/dione/dione.asset | 10 +++++ .../layers/colorlayers/dione_texture.asset | 10 +++++ .../planets/saturn/dione/trail.asset | 11 +++++ .../saturn/enceladus/default_layers.asset | 14 +++++- .../planets/saturn/enceladus/enceladus.asset | 10 +++++ .../colorlayers/enceladus_texture.asset | 10 +++++ .../colorlayers/global_mosaic_100m_hpf.asset | 16 +++++++ .../planets/saturn/enceladus/trail.asset | 11 +++++ .../planets/saturn/hyperion/hyperion.asset | 44 ++++++++++++------- .../planets/saturn/hyperion/trail.asset | 11 +++++ .../saturn/iapetus/default_layers.asset | 13 +++++- .../planets/saturn/iapetus/iapetus.asset | 10 +++++ .../layers/colorlayers/iapetus_texture.asset | 10 +++++ .../planets/saturn/iapetus/trail.asset | 11 +++++ .../solarsystem/planets/saturn/kernels.asset | 9 ++++ .../layers/colorlayers/saturn_texture.asset | 10 +++++ .../planets/saturn/major_moons.asset | 11 +++++ .../planets/saturn/mimas/default_layers.asset | 13 +++++- .../layers/colorlayers/mimas_texture.asset | 10 +++++ .../planets/saturn/mimas/mimas.asset | 10 +++++ .../planets/saturn/mimas/trail.asset | 11 +++++ .../planets/saturn/minor_moons.asset | 11 +++++ .../planets/saturn/rhea/default_layers.asset | 13 +++++- .../layers/colorlayers/rhea_texture.asset | 10 +++++ .../planets/saturn/rhea/rhea.asset | 12 ++++- .../planets/saturn/rhea/trail.asset | 11 +++++ .../solarsystem/planets/saturn/saturn.asset | 10 +++++ .../saturn/tethys/default_layers.asset | 9 ++++ .../layers/colorlayers/tethys_texture.asset | 10 +++++ .../planets/saturn/tethys/tethys.asset | 12 ++++- .../planets/saturn/tethys/trail.asset | 11 +++++ .../planets/saturn/titan/default_layers.asset | 13 +++++- .../cassini_iss_global_mosaic_4km_liu.asset | 18 ++++++++ .../layers/colorlayers/titan_texture.asset | 10 +++++ .../planets/saturn/titan/titan.asset | 10 +++++ .../planets/saturn/titan/trail.asset | 12 ++++- .../solarsystem/planets/saturn/trail.asset | 11 +++++ .../planets/saturn/transforms.asset | 10 +++++ .../planets/uranus/minor_moons.asset | 1 + 122 files changed, 1327 insertions(+), 43 deletions(-) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index b9a30df0b5..7d9b5cf5b9 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -53,3 +53,13 @@ local Charon = { assetHelper.registerSceneGraphNodesAndExport(asset, { Charon }) + + +asset.meta = { + Name = "Charon", + Version = "1.0", + Description = [[ Charon globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset index 4a64b0d59b..4398413b00 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset @@ -26,3 +26,14 @@ local CharonTrailBarycentric = { assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric }) + + +asset.meta = { + Name = "Charon Barycentric Trail", + Version = "1.0", + Description = [[ Trail of Charon as observed by Pluto Barycenter. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index dfe4586fcc..f1bb6e13c7 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Charon Layers", + Version = "1.0", + Description = [[ Default Charon layers are: Black & White [USGS]]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset index 058e4caf91..003387927a 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -11,3 +11,22 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Charon Black & White & White [USGS]", + Version = "1.0", + Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, + high-quality global mosaic of Pluto’s largest moon, Charon, was assembled from nearly + all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager + (LORRI) and the Multispectral Visible Imaging Camera (MVIC) on New Horizons. The + mosaic is the most detailed and comprehensive global view yet of Charon’s surface + using New Horizons data. Standing out on Charon is an enormous trough at least 350 + kilometers long, and reaching 14 kilometers deep –more than seven times as deep as the + Grand Canyon. This mosaic is available in equirectangular projection at an equatorial + pixel scale of 300 meters per pixel (m). (Description from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Charon/NewHorizons/" .. + "Charon_NewHorizons_Global_Mosaic_300m_Jul2017", + License = "NASA/PDS" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset index 317cd138c4..43af4ff920 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Pluto Layers", + Version = "1.0", + Description = [[ Default Pluto layers are: Black & White [USGS]]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset index a29ab30df4..0651499ebf 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset @@ -12,3 +12,12 @@ local PlutoKernels = { } asset.export("PlutoKernels", PlutoKernels) + +asset.meta = { + Name = "Pluto Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Pluto.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset index 61acdb513c..6c5738adbd 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset @@ -11,3 +11,25 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Pluto Black & White & White [USGS]", + Version = "1.0", + Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from + nearly all of the highest-resolution images obtained by the Long-Range + Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC) + on New Horizons.The mosaic is the most detailed and comprehensive global view yet + of Pluto’s surface using New Horizons data. It includes topography data of the + hemisphere visible to New Horizons during the spacecraft’s closest approach. The + topography is derived from digital stereo-image mapping tools that measure the + parallax – or the difference in the apparent relative positions – of features on + the surface obtained at different viewing angles during the encounter. Scientists + use these parallax displacements of high and low terrain to estimate landform + heights.The mosaic is available in Equirectangular projection at an equatorial + pixel scale of 300 meters per pixel (m). (Description from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Pluto/NewHorizons/" .. + "Pluto_NewHorizons_Global_Mosaic_300m_Jul2017", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset index 10edebc8a9..09c1b6c758 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -49,3 +49,14 @@ local HydraTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail }) + + +asset.meta = { + Name = "Hydra", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Hydra. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset index 25aec2f0b6..692c242bb4 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -49,3 +49,14 @@ local KerberosTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail }) + + +asset.meta = { + Name = "Kerberos", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Kerberos. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset index fac09bf119..003469592a 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -49,3 +49,14 @@ local NixTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail }) + + +asset.meta = { + Name = "Nix", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Nix. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset index ceca463f5f..8002ecbbab 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -49,3 +49,14 @@ local StyxTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail }) + + +asset.meta = { + Name = "Styx", + Version = "1.0", + Description = [[ Globe and trail for Pluto's moon Styx. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index ceb9a72424..667c201781 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -72,3 +72,13 @@ local PlutoLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Pluto, PlutoLabel }) + + +asset.meta = { + Name = "Pluto", + Version = "1.0", + Description = [[ Pluto globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset index 145d3c4973..98305eae87 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset @@ -26,3 +26,14 @@ local PlutoTrailBarycentric = { assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric }) + + +asset.meta = { + Name = "Pluto Barycentric Trail", + Version = "1.0", + Description = [[ Trail of Pluto as observed by it's Barrycenter. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset index c6497de839..3f21014b5b 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset @@ -8,3 +8,13 @@ asset.require('./minor/kerberos') asset.require('./minor/nix') asset.require('./minor/styx') + +asset.meta = { + Name = "Pluto System", + Version = "1.0", + Description = [[ Meta asset for the Pluto system, containing : Pluto, Pluto Trail, + Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index ea4fda9347..28ab9d499e 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -30,3 +30,14 @@ local PlutoBarycenterTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail }) + + +asset.meta = { + Name = "Pluto Barycenter Trail", + Version = "1.0", + Description = [[ Trail of Pluto as observed by the Sun. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset index 3c1df553ce..81958d8c34 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset @@ -25,3 +25,13 @@ local PlutoBarycenter = { assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter }) + + +asset.meta = { + Name = "Pluto Transforms", + Version = "1.0", + Description = [[ Pluto Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index 7b3197b84f..fc02665210 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -103,3 +103,13 @@ local Atmosphere = { assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) + + +asset.meta = { + Name = "Earth Atmosphere", + Version = "1.0", + Description = [[ Atmosphere of Earth.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index 21410493d5..956024a3f0 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -40,8 +40,28 @@ local watermask = asset.require(waterMasksPath .. "/modis_water_mask") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. nightLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. watermask.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. + nightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. + watermask.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Earth Layers", + Version = "1.0", + Description = [[ Default Earth layers are: ESRI VIIRS Combo, ESRI World Imagery, VIIRS + SNPP (Temporal), Aqua Modis (Temporal), Terra Modis (Temporal), BMNG, AMSR2 GCOM + W1 Sea Ice Concentration (Temporal), MODIS Terra Chlorophyll A (Temporal), GHRSST, + L4 G1SST Sea Surface Temperature (Temporal), GHRSST L4 MUR Sea Surface Temperature + (Temporal), World Elevation (3D), Earth at Night 2012, Coastlines, Reference + Features, Reference Labels, Tile Indicies, Size Reference, Gebco, and Modis Water + Mask.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index beeaa55e27..8d28772cd1 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -23,5 +23,14 @@ local EarthMarker = { } - assetHelper.registerSceneGraphNodesAndExport(asset, { EarthMarker }) + + +asset.meta = { + Name = "Earth marker", + Version = "1.0", + Description = [[ Earth marker with name, sized for Solar System view]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 8d7e2d0d48..90f41d87dc 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -60,7 +60,7 @@ local Moon = { asset.meta = { Name = "Moon", Version = "1.0", - Description = [[ Moon asset with labels. ]], + Description = [[ Moon globe with labels. ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 7abe222003..4d87d9dd09 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -28,3 +28,14 @@ local EarthTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { EarthTrail }) + + +asset.meta = { + Name = "Earth Trail", + Version = "1.0", + Description = [[ Trail of Earth as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index c0052befb6..dcf36993d5 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -79,3 +79,14 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EarthInertial, EarthIAU }) + + +asset.meta = { + Name = "Earth Transforms", + Version = "1.0", + Description = [[ Earth transforms: Earth Barycenter, Earth Center, Earth Inertial, + Earth IAU. A scene graph node is created for each transform.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index cf1828b9de..44ff27d7ff 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -53,3 +53,13 @@ local Callisto = { assetHelper.registerSceneGraphNodesAndExport(asset, { Callisto }) + + +asset.meta = { + Name = "Callisto", + Version = "1.0", + Description = [[ Callisto globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset index 0ebb18faa8..1471a20be4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/callisto_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Callisto Layers", + Version = "1.0", + Description = [[ Default Callisto layers are: Callisto Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset index 39cd2108e8..e1a48e6910 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Callisto Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Callisto]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index f3dccc4bb8..4bf6b6041a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -30,3 +30,14 @@ local CallistoTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { CallistoTrail }) + + +asset.meta = { + Name = "Callisto Trail", + Version = "1.0", + Description = [[ Trail of Callisto as observed by the Jupiter. Data from NASA Spice + (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset index e9fa9b0e32..fbe791b64a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/jupiter_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Jupiter Layers", + Version = "1.0", + Description = [[ Default Jupiter layers are: Jupiter Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset index e817bafb21..d6ff31fb00 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -6,5 +6,16 @@ local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Europa Layers", + Version = "1.0", + Description = [[ Default Europa layers are: Europa Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index 8e296655a5..45229edfe1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -53,3 +53,13 @@ local Europa = { assetHelper.registerSceneGraphNodesAndExport(asset, { Europa }) + + +asset.meta = { + Name = "Mimas", + Version = "1.0", + Description = [[ Europa globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset index dce37ba260..45c9eedce5 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Europa Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Europa]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset index da00b65927..0a5ad1deff 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -13,3 +13,23 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Voyager Global Mosaic", + Version = "1.0", + Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map + base of Europa utilizes the best image quality and moderate resolution coverage + supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2. + The image data was selected on the basis of overall image quality, reasonable + input resolution (from 20 km/pixel for gap fill to as high as 200 meters per + pixel[m]), and availability of moderate viewing and sun angles for topography. + The map projections are based on a sphere having a radius of 1,562.09 kilometers. + A Simple Cylindrical projection was used at a resolution of 500 m. (Description + from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. + "Europa_Voyager_GalileoSSI_global_mosaic_500m", + License = "NASA/PDS" +} + diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 63adced944..26157b92b4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -30,3 +30,14 @@ local EuropaTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { EuropaTrail }) + + +asset.meta = { + Name = "Europa Trail", + Version = "1.0", + Description = [[ Trail of Europa as observed by the Jupiter. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset index 5bb823b9a8..fa070a9b66 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/ganymede_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Ganymede Layers", + Version = "1.0", + Description = [[ Default Ganymede layers are: Ganymede Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 530745e4b7..abca3042d2 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -53,3 +53,13 @@ local Ganymede = { assetHelper.registerSceneGraphNodesAndExport(asset, { Ganymede }) + + +asset.meta = { + Name = "Ganymede", + Version = "1.0", + Description = [[ Ganymede globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset index 8da0ba37ea..dbd3d147ec 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Ganymede Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Ganymede]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index 3dfb4913d9..703ed4745b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -30,3 +30,14 @@ local GanymedeTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { GanymedeTrail }) + + +asset.meta = { + Name = "Ganymede Trail", + Version = "1.0", + Description = [[ Trail of Ganymede as observed by the Jupiter. Data from NASA Spice + (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset index e77dce099f..a178d71fa0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/io_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Io Layers", + Version = "1.0", + Description = [[ Default Io layers are: Io Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 55ecb7a35b..90b87ab137 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -53,3 +53,13 @@ local Io = { assetHelper.registerSceneGraphNodesAndExport(asset, { Io }) + + +asset.meta = { + Name = "Io", + Version = "1.0", + Description = [[ Io globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset index 26afb6b399..efa39f0b3d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Io Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Io]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index 75fd312b91..79ad2dd49f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -30,3 +30,14 @@ local IoTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { IoTrail }) + + +asset.meta = { + Name = "Io Trail", + Version = "1.0", + Description = [[ Trail of Io as observed by the Jupiter. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index a581d7f1c0..fd6bef68ea 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -47,3 +47,13 @@ local JupiterLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Jupiter, JupiterLabel }) + + +asset.meta = { + Name = "Jupiter", + Version = "1.0", + Description = [[ Jupiter globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset index cbceefcfc2..dba44a68c1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -7,3 +7,12 @@ local Kernels = asset.syncedResource({ asset.export("jup310", Kernels .. '/jup310.bsp') asset.export("jup341", Kernels .. '/jup341.bsp') + +asset.meta = { + Name = "Jupiter Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Jupiter.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset index 8273c454c6..395196807a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Jupiter Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Jupiter]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset index 3c11019a0b..693a481429 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/major_moons.asset @@ -2,3 +2,14 @@ asset.require('./callisto/callisto') asset.require('./europa/europa') asset.require('./ganymede/ganymede') asset.require('./io/io') + + +asset.meta = { + Name = "Jupiter Major Moons", + Version = "1.0", + Description = [[ Meta asset containing Jupiters major moons: Callisto, Europa, + Ganymede, and Io]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index 10e0a917db..0da1aeb32f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -197,3 +197,16 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(anankeGroup) ) + + +asset.meta = { + Name = "Jupiter Ananke Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Ananke Group + moons: S2010J2, Thelxinoe, Euanthe, Iocaste, S2003J16, Praxidike, Harpalyke, + Mneme, Hermippe, Thyone, and Ananke. Blank globes + and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index 8de8a13d85..33c86e016d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -261,3 +261,17 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(carmeGroup) ) + + +asset.meta = { + Name = "Jupiter Carme Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Carme Group + moons: Herse, Aitne, Kale, Taygete, Chaldene, Erinome, Kallichore, Kalyke, + Pasithee, S2010J1, Eukelade, Arche, Isonoe, Carme, and S2003J5. Blank globes + and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} + diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 7938f89387..74e152da06 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -35,3 +35,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(carpoGroup) ) + + +asset.meta = { + Name = "Jupiter Carpo Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Carpo Group + moons: Carpo. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index be1c62726f..6fdaddf579 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -100,3 +100,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(himaliaGroup) ) + + +asset.meta = { + Name = "Jupiter Himalia Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Himalia Group + moons: Leda, Himalia, Lysithea, Elara and Dia. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index 2cf3045233..6a705a642f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -83,3 +83,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) ) + + +asset.meta = { + Name = "Jupiter Inner Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Inner Group + moons: Metis, Adrastea, Amalthea, and Thebe. Blank globes and SPICE trails + are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index d7951c5185..593a76e9c5 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -155,3 +155,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(otherGroups) ) + + +asset.meta = { + Name = "Jupiter Pasiphae Other Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Other Group + moons: S2003J12, S/2003J3, S2011J1, S2003J19, S2003J10, S2003J23, S2003J9, + and S2003J2. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index b577a3e5f1..b7ab453417 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -346,3 +346,17 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(pasiphaeGroup) ) + + +asset.meta = { + Name = "Jupiter Pasiphae Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Pasiphae Group + moons: Euporie, S2003J18, Helike, Orthosie, S2016J1, S2003J15, Aoede, Callirrhoe, + Eurydome, Kore, Cyllene, S2011J2, S2017J1, S2003J4, Pasiphae, Hegemone, Sinope, + Sponde, Autonoe and Megaclite. Blank globes and SPICE trails are generated for + each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index f7a5899dc9..42cde2410d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -35,3 +35,14 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(themistoGroup) ) + + +asset.meta = { + Name = "Jupiter Themisto Group Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Jupiter's Themisto Group + moons: Themisto. Blank globes and SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 0609399eef..8c48b6f6ac 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -6,3 +6,14 @@ asset.require('./minor/inner_group') asset.require('./minor/other_groups') asset.require('./minor/pasiphae_group') asset.require('./minor/themisto_group') + + +asset.meta = { + Name = "Jupiter Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing eight moon groups: Ananke, Carme, Carpo, + Himalia, Pasiphae, Themisto, Inner, and Other]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index c78bce02ca..4d95598944 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -28,3 +28,14 @@ local JupiterTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrail }) + + +asset.meta = { + Name = "Jupiter Trail", + Version = "1.0", + Description = [[ Trail of Jupiter as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index c0e1178b83..29982625a4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -22,3 +22,13 @@ local JupiterBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterBarycenter }) + + +asset.meta = { + Name = "Jupiter Transforms", + Version = "1.0", + Description = [[ Jupiter Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index d0a465ea2a..6172363669 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -66,3 +66,13 @@ local Atmosphere = { assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) + + +asset.meta = { + Name = "Mars Atmosphere", + Version = "1.0", + Description = [[ Atmosphere of Mars.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index 02edb1606a..8dfbdd1fa2 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -31,6 +31,20 @@ asset.require(overlaysPath .. "/size_reference") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Mars Layers", + Version = "1.0", + Description = [[ Default Mars layers are: MOC WA Color, Viking MDIM, MOLA Pseudo + Color, MOLA HRSC, Themis IR Day, Themis IR Night, CTX Mosaic, and CTX Blended + beta01]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset index 9138ba0a24..d0cdd92783 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset @@ -7,3 +7,13 @@ local layer = { } asset.export("layer", layer) + + +asset.meta = { + Name = "Mars Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Mars]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 666f90e7bd..ff77b2964f 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -73,3 +73,13 @@ local MarsLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Mars, MarsLabel }) + + +asset.meta = { + Name = "Mars", + Version = "1.0", + Description = [[ Mars globe, and main globe label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index 19e201a8af..f8943d70d3 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -28,3 +28,14 @@ local MarsTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrail }) + + +asset.meta = { + Name = "Mars Trail", + Version = "1.0", + Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index c2a793a56b..a7c3267607 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -20,3 +20,13 @@ local MarsBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter }) + + +asset.meta = { + Name = "Mars Transforms", + Version = "1.0", + Description = [[ Mars Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset index 2d5408e96e..53d468bacb 100644 --- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -38,5 +38,19 @@ asset.require(colorLayersPath .. "/ssimap_02122015") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Mercury Layers", + Version = "1.0", + Description = [[ Default Mercury layers are: Messenger MDIS, Messenger Mosaic2, + Messenger BDR, Messenger MDR, Messenger MP3, Messenger Hie, Messenger Hiw, + Messenger LOI, Messenger SHADE, Aluminum Abundance, Calcium Abundance, Iron + Abundance, Magnesium Abundance, and Silicon Abundance]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset index b0603cdd67..5d6343e53f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -2,6 +2,7 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { + Name = "Aluminium Abundance", Identifier = "alsimap_02122015", FilePath = texturesPath .. "/alsimap_02122015.png", BlendMode = "Multiply", diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset index ff4e891428..65cce51790 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -2,6 +2,7 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { + Name = "Calcium Abundance", Identifier = "casimap_02122015", FilePath = texturesPath .. "/casimap_02122015.png", BlendMode = "Multiply", diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset index 8ae0355ebf..f8413736b9 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -2,6 +2,7 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { + Name = "Iron Abundance", Identifier = "fesimap_02122015", FilePath = texturesPath .. "/fesimap_02122015.png", BlendMode = "Multiply", diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset index 6642a8c0a8..5e1a9fb48b 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -2,6 +2,7 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { + Name = "Magnesium Abundance", Identifier = "mgsimap_02122015", FilePath = texturesPath .. "/mgsimap_02122015.png", Settings = { diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset index 868030a387..7139cffd5f 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -2,6 +2,7 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { + Name = "Silicon Abundance", Identifier = "ssimap_02122015", FilePath = texturesPath .. "/ssimap_02122015.png", BlendMode = "Multiply", diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 771c819783..d3865e7cdb 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -67,3 +67,13 @@ local MercuryLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Mercury, MercuryLabel }) + + +asset.meta = { + Name = "Mercury", + Version = "1.0", + Description = [[ Mercury globe with labels, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index c3ed6f8935..6f9febd412 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -28,3 +28,14 @@ local MercuryTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrail }) + + +asset.meta = { + Name = "Mercury Trail", + Version = "1.0", + Description = [[ Trail of Mercury as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 035854e517..c8fa7670f8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -20,3 +20,13 @@ local MercuryBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryBarycenter }) + + +asset.meta = { + Name = "Mercury Transforms", + Version = "1.0", + Description = [[ Mercury Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset index 024f19fbd2..c875d40437 100644 --- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/neptune_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Neptune.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Neptune.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Neptune Layers", + Version = "1.0", + Description = [[ Default Neptune layers are: Neptune Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index f81bb85487..5e83a29bd2 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -135,3 +135,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) ) + + +asset.meta = { + Name = "Neptune Inner Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' inner prograde moons: + Naiad, Thalassa, Despina, Galatea, Larissa, S2004N1, and Proteus. Blank globes and + SPICE trails are generated for each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 4b726b03d6..82dd0c75fe 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -70,3 +70,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularProgradeMoons) ) + + +asset.meta = { + Name = "Neptune Irregular Prograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' irregular prograde + moons: Halimede, Psamathe and Neso. Blank globes and SPICE trails are generated for + each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index 340af608cd..612241c8ac 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -69,3 +69,15 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularRetrogradeMoons) ) + + +asset.meta = { + Name = "Neptune Irregular Retrograde Moons", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune' irregular retrograde + moons: Nereid, Sao and Laomedeia. Blank globes and SPICE trails are generated for + each moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset index 2637699924..e6f155ae1b 100644 --- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset +++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset @@ -9,3 +9,12 @@ asset.export("nep081", Kernels .. '/nep081.bsp') asset.export("nep086", Kernels .. '/nep086.bsp') asset.export("nep087", Kernels .. '/nep087.bsp') asset.export("nep088", Kernels .. '/nep088.bsp') + +asset.meta = { + Name = "Neptune Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Neptune.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset index ecd83b0928..ce7d259b94 100644 --- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Neptune Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Neptune]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset index a6b9ebde18..eb4df5b6cf 100644 --- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset @@ -1 +1,11 @@ asset.require('./triton') + + +asset.meta = { + Name = "Neptune Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing Neptune's major moon: Triton]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index ee3f021892..4431a338e4 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -47,3 +47,13 @@ local NeptuneLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Neptune, NeptuneLabel }) + + +asset.meta = { + Name = "Neptune", + Version = "1.0", + Description = [[ Neptune globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index c1647a47da..b20b1ee39d 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -39,3 +39,14 @@ local NeptuneTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrail }) + + +asset.meta = { + Name = "Neptune Trail", + Version = "1.0", + Description = [[ Trail of Neptune as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index 864501df6b..2156892901 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -20,3 +20,13 @@ local NeptuneBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneBarycenter }) + + +asset.meta = { + Name = "Neptune Transforms", + Version = "1.0", + Description = [[ Neptune Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index 55bf22fbb5..e40a20b10f 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -28,3 +28,14 @@ assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes({ Triton }) ) + + +asset.meta = { + Name = "Triton", + Version = "1.0", + Description = [[ Procedural Globe asset containing Neptune's moon: Triton. + A blank globe and SPICE trail are generated for the moon.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset index 8bf7dab762..c447b26495 100644 --- a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset @@ -7,3 +7,13 @@ local colorLayer = asset.require(colorLayersPath .. "/saturn_texture") asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Saturn.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Saturn Layers", + Version = "1.0", + Description = [[ Default Saturn layers are: Saturn texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset index a049613a10..859c8b4e58 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/dione_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Dione.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Dione.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Dione Layers", + Version = "1.0", + Description = [[ Default Dione layers are: Dione Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index 38e136eba1..e381a2800d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -51,3 +51,13 @@ local Dione = { assetHelper.registerSceneGraphNodesAndExport(asset, { Dione }) + + +asset.meta = { + Name = "Dione", + Version = "1.0", + Description = [[ Dione globe with labels]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset index 764a01c156..c1ba6585d7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Dione Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Dione]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index e68eea7f46..8d18022098 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -29,3 +29,14 @@ local DioneTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { DioneTrail }) + + +asset.meta = { + Name = "Dione Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Dione as observed by Saturn. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset index 1060a27b25..8369a20bae 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -6,5 +6,17 @@ local colorLayer = asset.require(colorLayersPath .. "/global_mosaic_100m_hpf") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Enceladus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Enceladus.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Enceladus Layers", + Version = "1.0", + Description = [[ Default Enceladus layers are: Enceladus Texture and Cassini Global + Mosaic 100m HPF]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index d27fc30a25..b3813790f5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -51,3 +51,13 @@ local Enceladus = { assetHelper.registerSceneGraphNodesAndExport(asset, { Enceladus }) + + +asset.meta = { + Name = "Enceladus", + Version = "1.0", + Description = [[ Enceladus globe with labels]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset index b96eca1654..41b14b81c5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Enceladus Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Enceladus]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index 3db67ee35e..c43efc09a8 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -12,3 +12,19 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Cassini Global Mosaic 100m HPF", + Version = "1.0", + Description = [[ This mosaic represents the completion of a global control network of + Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of + 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control + network. The image selection criteria were based on coverage, quality, and a + spatial resolution between 50 and 500 meters per pixel (m) with phase angles less + than 120 degrees. (Description from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. + "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index 8cb64aee9e..617e552949 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -29,3 +29,14 @@ local EnceladusTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { EnceladusTrail }) + + +asset.meta = { + Name = "Enceladus Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn. Data from + NASA Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 8698e41e73..f364f00491 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -2,15 +2,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 asset.require('./trail') - - - --- local textures = asset.syncedResource({ --- Name = "Hyperion textures", --- Type = "HttpSynchronization", --- Identifier = "hyperion_textures", --- Version = 1 --- }) +local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Hyperion = { Identifier = "Hyperion", @@ -32,14 +24,22 @@ local Hyperion = { Type = "RenderableGlobe", Radii = { 360200, 266000, 205400}, SegmentsPerPatch = 64, - Layers = { - -- ColorLayers = { - -- { - -- Name = "Hyperion Texture", - -- FilePath = textures .. "/hyperion.jpg", - -- Enabled = true - -- } - -- } + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/hyperion.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + FadeInStartingDistance = 500000.0, + FadeOutStartingDistance = 1000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } } }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, @@ -51,3 +51,13 @@ local Hyperion = { assetHelper.registerSceneGraphNodesAndExport(asset, { Hyperion }) + + +asset.meta = { + Name = "Hyperion", + Version = "1.0", + Description = [[ Hyperion globe with labels]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index e8a3533014..f1154c2b08 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -29,3 +29,14 @@ local HyperionTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { HyperionTrail }) + + +asset.meta = { + Name = "Hyperion Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Hyperion as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset index 9e0f191bcd..b1a5726afd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/iapetus_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Iapetus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Iapetus.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Iapetus Layers", + Version = "1.0", + Description = [[ Default Iapetus layers are: Iapetus Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 11c20452a6..1012dbf64d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -51,3 +51,13 @@ local Iapetus = { assetHelper.registerSceneGraphNodesAndExport(asset, { Iapetus }) + + +asset.meta = { + Name = "Iapetus", + Version = "1.0", + Description = [[ Iapetus globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset index 849919ac22..18015a6441 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Iapetus Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Iapetus]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 12c6df8975..cf739ab662 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -29,3 +29,14 @@ local IapetusTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { IapetusTrail }) + + +asset.meta = { + Name = "Iapetus Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset index c641fa4b6c..b0b5ba847c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -9,3 +9,12 @@ asset.export("sat319", Kernels .. '/sat319.bsp') asset.export("sat368", Kernels .. '/sat368.bsp') asset.export("sat375", Kernels .. '/sat375.bsp') asset.export("sat393", Kernels .. '/sat393.bsp') + +asset.meta = { + Name = "Saturn Spice Kernels", + Version = "1.0", + Description = [[ Generic SPICE kernels for Saturn.]], + Author = "OpenSpace Team", + URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", + License = "NASA" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset index 53db561179..04ae53450c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Saturn Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Saturn]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset index e14aa30f56..b6ed6156d6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset @@ -6,3 +6,14 @@ asset.require('./mimas/mimas') asset.require('./rhea/rhea') asset.require('./tethys/tethys') asset.require('./titan/titan') + + +asset.meta = { + Name = "Saturn Major Moons", + Version = "1.0", + Description = [[ Meta asset containing Saturn's major moons: Dione, Enceladus, + Hyperion, Iapetus, Mimas, Rhea, Tethys, and Titan]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset index b568501559..fdad13313f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/mimas_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Mimas.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mimas.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Mimas Layers", + Version = "1.0", + Description = [[ Default Mimas layers are: Mimas Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset index 355efd6b70..b2a293f92c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Mimas Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Mimas]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index b453f6b0fa..5c153c4a01 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -51,3 +51,13 @@ local Mimas = { assetHelper.registerSceneGraphNodesAndExport(asset, { Mimas }) + + +asset.meta = { + Name = "Mimas", + Version = "1.0", + Description = [[ Mimas globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 996d15614c..fd1e01c3ba 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -29,3 +29,14 @@ local MimasTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { MimasTrail }) + + +asset.meta = { + Name = "Mimas Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Mimas as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset index ba7da9ccbc..15cce78ea9 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset @@ -2,3 +2,14 @@ asset.require('./minor/gallic_group') asset.require('./minor/inuit_group') asset.require('./minor/norse_group') asset.require('./minor/other_group') + + +asset.meta = { + Name = "Saturn Minor Moons", + Version = "1.0", + Description = [[ Meta asset containing four moon groups: Gallic, Inuit, Norse and + Other]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset index 58e4daaa91..41d72450ae 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset @@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/rhea_texture") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Rhea.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Rhea.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + + +asset.meta = { + Name = "Default Rhea Layers", + Version = "1.0", + Description = [[ Default Rhea layers are: Rhea Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset index 061aa17e62..36decdf745 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Rhea Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Rhea]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index faed079a9d..b6e21025c3 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -16,7 +16,7 @@ local Rhea = { }, Rotation = { Type = "SpiceRotation", - SourceFrame = "IAU_ENCELADUS", + SourceFrame = "IAU_RHEA", DestinationFrame = "GALACTIC" } }, @@ -51,3 +51,13 @@ local Rhea = { assetHelper.registerSceneGraphNodesAndExport(asset, { Rhea }) + + +asset.meta = { + Name = "Rhea", + Version = "1.0", + Description = [[ Rhea globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index 70b116dcd2..94c19d53ec 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -29,3 +29,14 @@ local RheaTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { RheaTrail }) + + +asset.meta = { + Name = "Rhea Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Rhea as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 16dd8c7700..b1b4a64a1d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -63,3 +63,13 @@ local SaturnLabel = { } assetHelper.registerSceneGraphNodesAndExport(asset, { Saturn, SaturnLabel }) + + +asset.meta = { + Name = "Saturn", + Version = "1.0", + Description = [[ Saturn globe, and main planet label.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset index 197eeb9a67..f815ce15f5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -7,3 +7,12 @@ local colorLayer = asset.require(colorLayersPath .. "/tethys_texture") asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Tethys.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + +asset.meta = { + Name = "Default Tethys Layers", + Version = "1.0", + Description = [[ Default Tethys layers are: Tethys Texture]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset index ab55a8b84e..f8b9293d98 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Tethys Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Tethys]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 59dc831c2b..8d6d1d052c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -16,7 +16,7 @@ local Tethys = { }, Rotation = { Type = "SpiceRotation", - SourceFrame = "IAU_ENCELADUS", + SourceFrame = "IAU_TETHYS", DestinationFrame = "GALACTIC" } }, @@ -51,3 +51,13 @@ local Tethys = { assetHelper.registerSceneGraphNodesAndExport(asset, { Tethys }) + + +asset.meta = { + Name = "Tethys", + Version = "1.0", + Description = [[ Tethys globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index 6bf002a440..00cebdec5f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -29,3 +29,14 @@ local TethysTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { TethysTrail }) + + +asset.meta = { + Name = "Tethys Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Tethys as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset index aacadba44c..f29cc04068 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -6,5 +6,16 @@ local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_ -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Titan.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Titan.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) end) + +asset.meta = { + Name = "Default Titan Layers", + Version = "1.0", + Description = [[ Default Titan layers are: Titan Texture and Cassini ISS Global + Mosaic]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset index 816639f7c6..fcae769eb0 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -12,3 +12,21 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Cassini ISS Global Mosaic", + Version = "1.0", + Description = [[ This global digital map of Saturn's moon Titan was created using + images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map + was produced in June 2015 using data collected through Cassini's flyby on April 7, + 2014, known as "T100". The mean radius of Titan used for projection of this map is + 1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m). + Titan is assumed to be spherical until a control network -- a model of the moon's + shape based on multiple images tied together at defined points on the surface -- + is created at some point in the future. (Description from URL)]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. + "Titan_ISS_P19658_Mosaic_Global_4km", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset index 205ce2b72d..62a397db97 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset @@ -11,3 +11,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Titan Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Titan]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index 40d3bfae51..b349e56070 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -51,3 +51,13 @@ local Titan = { assetHelper.registerSceneGraphNodesAndExport(asset, { Titan }) + + +asset.meta = { + Name = "Titan", + Version = "1.0", + Description = [[ Titan globe with labels.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index ff45283ff3..f311532022 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -27,5 +27,15 @@ local TitanTrail = { } - assetHelper.registerSceneGraphNodesAndExport(asset, { TitanTrail }) + + +asset.meta = { + Name = "Titan Trail", + Version = "1.0", + Description = [[ Trail of Saturn's moon Titan as observed by Saturn. Data from NASA + Spice (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 590d9d3bda..8ec8cec191 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -27,3 +27,14 @@ local SaturnTrail = { assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrail }) + + +asset.meta = { + Name = "Saturn Trail", + Version = "1.0", + Description = [[ Trail of Saturn as observed by the Sun. Data from NASA Spice (see + base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 21b84d5c54..e6fbf205fa 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -20,3 +20,13 @@ local SaturnBarycenter = { } assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnBarycenter }) + + +asset.meta = { + Name = "Saturn Transforms", + Version = "1.0", + Description = [[ Saturn Barycenter transform]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index 81cb8d03e5..48ee0e01c7 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -2,6 +2,7 @@ asset.require('./inner_moons') asset.require('./irregular_prograde_moons') asset.require('./irregular_retrograde_moons') + asset.meta = { Name = "Uranus Minor Moons", Version = "1.0", From df06edbba7e7f21d82971bf7e454724ea3ee469b Mon Sep 17 00:00:00 2001 From: Micah Date: Mon, 28 Sep 2020 09:55:56 -0400 Subject: [PATCH 03/12] add milkyway arm label asset --- .../digitaluniverse/milkyway_arm_labels.asset | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 data/assets/scene/digitaluniverse/milkyway_arm_labels.asset diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset new file mode 100644 index 0000000000..b330400462 --- /dev/null +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -0,0 +1,53 @@ +local assetHelper = asset.require('util/asset_helper') + +local planeTextures = asset.syncedResource({ + Name = "Milky Way Plane Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_textures", + Version = 2 +}) + +local planeSpeck = asset.syncedResource({ + Name = "Milky Way Plane Speck", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_speck", + Version = 1 +}) + +local plane = { + Identifier = "MilkyWayGalaxyArmLabelsImage", + Parent = "Root", + Renderable = { + Type = "RenderablePlanesCloud", + Enabled = false, + Color = { 1.0, 1.0, 1.0 }, + Opacity = 0.99, + ScaleFactor = 2.8, + File = planeSpeck .. "/galaxyArmLabels.speck", + TexturePath = planeTextures, + Luminosity = "size", + ScaleLuminosity = 1.0, + FadeInDistances = { 3000.0, 50000.0 }, + PlaneMinSize = 5.0, + Unit = "pc" + }, + GUI = { + Name = "Milky Way Spiral Arm Labels", + Path = "/Universe/Galaxies" + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) + + +asset.meta = { + Name = "Milky Way Spiral Arm Labels", + Version = "1.0", + Description = [[ 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 AMNH Digital Universe)]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} From 323416b99a37faef9249a0193e4e7b7341a20e39 Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 1 Oct 2020 17:56:12 -0400 Subject: [PATCH 04/12] du asset meta update --- data/assets/scene/digitaluniverse/2dF.asset | 35 ++++--- data/assets/scene/digitaluniverse/2mass.asset | 14 +-- data/assets/scene/digitaluniverse/6dF.asset | 28 +++--- data/assets/scene/digitaluniverse/abell.asset | 32 +++--- .../digitaluniverse/alternatestarlabels.asset | 11 ++- .../digitaluniverse/backgroundradiation.asset | 15 +++ .../scene/digitaluniverse/clusters.asset | 13 +++ .../digitaluniverse/constellationbounds.asset | 11 +++ .../digitaluniverse/constellations.asset | 17 ++++ .../scene/digitaluniverse/deepsky.asset | 19 ++++ .../assets/scene/digitaluniverse/dwarfs.asset | 22 ++++- .../scene/digitaluniverse/exoplanets.asset | 15 +++ .../digitaluniverse/globularclusters.asset | 20 ++++ data/assets/scene/digitaluniverse/grids.asset | 16 +++ .../assets/scene/digitaluniverse/groups.asset | 13 +++ .../scene/digitaluniverse/h2regions.asset | 19 ++++ .../assets/scene/digitaluniverse/kepler.asset | 19 ++++ .../scene/digitaluniverse/localdwarfs.asset | 19 ++++ .../scene/digitaluniverse/milkyway.asset | 98 ++++--------------- .../digitaluniverse/milkyway_arm_labels.asset | 34 +++++-- .../digitaluniverse/milkyway_label.asset | 56 +++++++++++ .../digitaluniverse/milkyway_sphere.asset | 51 ++++++++++ .../digitaluniverse/obassociations.asset | 19 ++++ .../scene/digitaluniverse/openclusters.asset | 20 ++++ .../digitaluniverse/planetarynebulae.asset | 16 +++ .../scene/digitaluniverse/pulsars.asset | 22 +++++ .../scene/digitaluniverse/quasars.asset | 17 ++++ data/assets/scene/digitaluniverse/sdss.asset | 24 +++++ .../scene/digitaluniverse/starlabels.asset | 10 ++ .../scene/digitaluniverse/starorbits.asset | 13 +++ data/assets/scene/digitaluniverse/stars.asset | 15 +++ .../scene/digitaluniverse/superclusters.asset | 15 +++ .../digitaluniverse/supernovaremnants.asset | 13 +++ data/assets/scene/digitaluniverse/tully.asset | 33 +++++++ data/assets/scene/digitaluniverse/voids.asset | 19 ++++ .../pluto/charon/default_layers.asset | 2 +- .../dwarf_planets/pluto/default_layers.asset | 2 +- .../solarsystem/planets/mercury/trail.asset | 2 +- .../planets/venus/trail_earth.asset | 7 +- data/web/documentation/scenelicense.hbs | 4 +- data/web/documentation/script.js | 4 + 41 files changed, 681 insertions(+), 153 deletions(-) create mode 100644 data/assets/scene/digitaluniverse/milkyway_label.asset create mode 100644 data/assets/scene/digitaluniverse/milkyway_sphere.asset diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index 56941b50c5..b352d38854 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -39,25 +39,28 @@ local object = { } } + +assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + asset.meta = { Name = "2dF Galaxies", Version = "2.0", - Description = [[ 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. ]], - Author = "AMNH Digital Universe", + 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)]], + Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index c55ea083a0..508070b3af 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -41,6 +41,10 @@ local object = { } } + +assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + asset.meta = { Name = "2MASS Galaxies", Version = "1.0", @@ -50,10 +54,8 @@ asset.meta = { 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. ]], - Author = "AMNH Digital Universe", + that would normally be hidden to our eye. (Description from URL)]], + Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + License = "AMNH Digital Universe" +} \ No newline at end of file diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index bbf1c4f7b3..c4f7c35b3f 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -39,21 +39,23 @@ local object = { } } + +assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + asset.meta = { Name = "6dF Galaxies", Version = "2.0", - Description = [[ 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. ]], - Author = "AMNH Digital Universe", + 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)]], + Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" + License = "AMNH Digital Universe" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index fc1c90d8cf..8fcd3ae5d6 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -47,23 +47,25 @@ local object = { } } + +assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + asset.meta = { Name = "Abell Galaxy Clusters", Version = "2.0", - 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 (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.]], - Author = "AMNH Digital Universe", + 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)]], + Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" + License = "AMNH Digital Universe" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index 272ca87615..e1ad7853f0 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -32,11 +32,12 @@ local object = { asset.meta = { Name = "Stars Labels - Alternate", Version = "1.0", - Description = [[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 = [[Census 3,550 star names. DU Version 1.7. 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]], 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/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset index 66a2c70a46..ec87c3544e 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset @@ -89,6 +89,7 @@ local planck = { FadeInThreshold = 0.4 }, GUI = { + Name = "Planck", Path = "/Universe/Cosmic Microwave Background" } } @@ -246,3 +247,17 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { wmap, cbe, planck, multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4, Halpha }) + + +asset.meta = { + Name = "Background Radiation", + Version = "2.0", + Description = [[Various AllSky images for the Milky Way and observable Universe. + Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer, + Planck, Planck Multiverse 1-4, and H Alpha

Data Reference: Planck/ESA and + the Planck Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug + Finkbeiner (Princeton)]], + 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/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index 3f0475d98b..c690c4ac84 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -38,3 +38,16 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Stars Labels - Alternate", + Version = "1.0", + 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)]], + 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/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 35dd792e2c..4323b87180 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -43,3 +43,14 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Constellation Bounds", + Version = "1.0", + Description = [[A Spherical mesh dividing the sky into regions that fit the + constellations.]], + 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 216a320283..4dd1bc2783 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -55,3 +55,20 @@ local constellations = { assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalactic, constellations }) + + +asset.meta = { + Name = "Constellations", + Version = "1.0", + Description = [[Census 88 constellations and labels. DU Version 2.3. 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]], + 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/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 4789551408..766b04aa4a 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -85,3 +85,22 @@ local deepSkyImages = { } assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImages }) + + +asset.meta = { + Name = "Deep Sky Objects Images", + Version = "1.0", + 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 size them + accurately so that you can fly to the globular cluster M13, for example, and see just + how small the cluster of hundreds of thousands of stars is relative to the rest of the + Galaxy. Included Messier Objects by number are: 6, 7, 11, 16, 18, 21, 23-26, 29, 34-39 + , 41, 46-48, 50, 52, 67, 93, 103, 2-5, 9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, + 79, 80, 92, 107, 27, 57, 76, 97, 8, 17, 20, 78, 1 (Description from URL)

Data + Reference: Largely NOAO and various other sources (each image has a ref)]], + Author = "Nate Greenstein, Matt Everhart, 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 index aa2b32effa..998f4a5bc6 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -49,10 +49,26 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + asset.meta = { Name = "Brown Dwarfs", - Version = "5.3", - Description = [[Brown dwarf catalog, including L, T, and Y dwarfs.]], + Version = "2.0", + 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)]], + Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" + License = "AMNH Digital Universe" } diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index c3063aa918..cb8fdd0efd 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -45,3 +45,18 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Exoplanets", + Version = "1.0", + Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11. 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)]], + 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/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index 035052eea1..8e031c4072 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -45,3 +45,23 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Globular Clusters", + Version = "2.0", + 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)", + 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 dcb069250a..3c1fa6ba6d 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -533,3 +533,19 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly, plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly }) + + +asset.meta = { + Name = "Grids", + Version = "2.0", + 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]], + 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/groups.asset index 682f7fb65b..11792e5726 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -39,3 +39,16 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Galaxy Group Labels", + Version = "1.0", + 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)]], + 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 db9cf215c6..1f74221271 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -45,3 +45,22 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "HII Regions", + Version = "1.0", + 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)]], + Author = "Carter Emmart, Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index 75e102fe89..e242c2d2a2 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -41,3 +41,22 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Kepler Planetary Candidates", + Version = "2.0", + Description = [[Census: 3,254 stars. DU Version 9.3. 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 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)]], + Author = "Brian Abbott, 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/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index df011129ee..a796e4523f 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -46,3 +46,22 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Local Group", + Version = "2.0", + 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)]], + 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 814ce42fe2..6dcadd0dff 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -2,13 +2,6 @@ local assetHelper = asset.require('util/asset_helper') -local sphereTextures = asset.syncedResource({ - Name = "Milky Way Sphere Textures", - Type = "HttpSynchronization", - Identifier = "milkyway_textures", - Version = 2 -}) - local planeTextures = asset.syncedResource({ Name = "Milky Way Plane Textures", Type = "HttpSynchronization", @@ -23,39 +16,6 @@ local planeSpeck = asset.syncedResource({ Version = 1 }) -local homespeck = asset.syncedResource({ - Name = "Home Speck File", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_home_speck", - Version = 1 -}) - -local sphere = { - Identifier = "MilkyWay", - Transform = { - Rotation = { - Type = "StaticRotation", - Rotation = {0, 0, 3.14159265359} - } - }, - Renderable = { - Type = "RenderableSphere", - Size = 9.2E21, - Segments = 40, - Opacity = 0.35, - Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg", - Orientation = "Inside", - UseAdditiveBlending = true, - MirrorTexture = true, - FadeOutThreshold = 0.0015, - Background = true - }, - GUI = { - Name = "Milky Way Sphere", - Path = "/Milky Way" - } -} - local plane = { Identifier = "MilkyWayGalaxyImage", Parent = "Root", @@ -69,7 +29,6 @@ local plane = { TexturePath = planeTextures, Luminosity = "size", ScaleLuminosity = 1.0, - -- Fade in value in the same unit as "Unit" FadeInDistances = { 3000.0, 50000.0 }, PlaneMinSize = 5.0, Unit = "pc" @@ -80,43 +39,22 @@ local plane = { } } -local homeLabel = { - Identifier = "HomeLabel", - Renderable = { - Type = "RenderableBillboardsCloud", - Enabled = false, - Color = { 1.0, 0.4, 0.2 }, - Opacity = 0.99, - ScaleFactor = 500.0, - --File = homespeck .. "/home.speck", - -- Texture = textures .. "/point3.png", - DrawLabels = true, - LabelFile = homespeck .. "/home.label", - TextColor = { 0.8, 0.8, 0.8 }, - TextSize = 20.50, - TextMinSize = 16.0, - TransformationMatrix = { - -0.7357425748, 0.67726129641, 0.0, 0.0, - -0.074553778365, -0.080991471307, 0.9939225904, 0.0, - 0.67314530211, 0.73127116582, 0.11008126223, 0.0, - 0.0, 0.0, 0.0, 1.0 - }, - Unit = "Mpc", - -- Fade in value in the same unit as "Unit" - FadeInDistances = { 0.05, 1.0 }, - -- Max size in pixels - BillboardMaxSize = 8.22, - BillboardMinSize = 0.0, - --CorrectionSizeEndDistance = 22.0, - --CorrectionSizeFactor = 10.45 - EnablePixelSizeControl = true - }, - GUI = { - Name = "Home Label", - Path = "/Universe/Galaxies" - } + +assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) + + +asset.meta = { + Name = "MilkyWay Galaxy", + Version = "2.0", + 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]], + Author = "Brian Abbott, Carter Emmart (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" } - - - -assetHelper.registerSceneGraphNodesAndExport(asset, { sphere, plane, homeLabel }) diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index b330400462..bab87cb461 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -32,7 +32,7 @@ local plane = { Unit = "pc" }, GUI = { - Name = "Milky Way Spiral Arm Labels", + Name = "Milky Way Arms Labels", Path = "/Universe/Galaxies" } } @@ -41,13 +41,33 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { - Name = "Milky Way Spiral Arm Labels", + Name = "Milky Way Arms Labels", Version = "1.0", - Description = [[ 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 AMNH Digital Universe)]], + 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)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH 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]] } diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset new file mode 100644 index 0000000000..e40ddefab6 --- /dev/null +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -0,0 +1,56 @@ +--milkyway_label.asset +local assetHelper = asset.require('util/asset_helper') + + + +local homespeck = asset.syncedResource({ + Name = "Home Speck File", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_home_speck", + Version = 1 +}) + +local homeLabel = { + Identifier = "HomeLabel", + Renderable = { + Type = "RenderableBillboardsCloud", + Enabled = false, + Color = { 1.0, 0.4, 0.2 }, + Opacity = 0.99, + ScaleFactor = 500.0, + DrawLabels = true, + LabelFile = homespeck .. "/home.label", + TextColor = { 0.8, 0.8, 0.8 }, + TextSize = 20.50, + TextMinSize = 16.0, + TransformationMatrix = { + -0.7357425748, 0.67726129641, 0.0, 0.0, + -0.074553778365, -0.080991471307, 0.9939225904, 0.0, + 0.67314530211, 0.73127116582, 0.11008126223, 0.0, + 0.0, 0.0, 0.0, 1.0 + }, + Unit = "Mpc", + FadeInDistances = { 0.05, 1.0 }, + BillboardMaxSize = 8.22, + BillboardMinSize = 0.0, + EnablePixelSizeControl = true + }, + GUI = { + Name = "Home Label", + Path = "/Universe/Galaxies" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel }) + + +asset.meta = { + Name = "Home Label", + Version = "1.0", + Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], + 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 new file mode 100644 index 0000000000..0fb5a085d0 --- /dev/null +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -0,0 +1,51 @@ +local assetHelper = asset.require('util/asset_helper') + + + +local sphereTextures = asset.syncedResource({ + Name = "Milky Way Sphere Textures", + Type = "HttpSynchronization", + Identifier = "milkyway_textures", + Version = 2 +}) + + +local sphere = { + Identifier = "MilkyWay", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = {0, 0, 3.14159265359} + } + }, + Renderable = { + Type = "RenderableSphere", + Size = 9.2E21, + Segments = 40, + Opacity = 0.35, + Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg", + Orientation = "Inside", + UseAdditiveBlending = true, + MirrorTexture = true, + FadeOutThreshold = 0.0015, + Background = true + }, + GUI = { + Name = "Milky Way Sphere", + Path = "/Milky Way" + } +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) + + +asset.meta = { + Name = "Milky Way Galaxy Sphere", + Version = "2.0", + Description = [[All sky image of the Milky Way that is visible when inside. Fades out + when zooming away from 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 ad25602989..77ed118180 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -49,3 +49,22 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "OB Associations", + Version = "2.0", + 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+)]], + 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 d060f744db..9964bbbc8d 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -45,3 +45,23 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Open Star Clusters", + Version = "2.0", + Description = [[Census: 2,040 clusters. DU Version 5.7. 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: Optically visible open clusters and Candidates + (Dias+ 2002-2015)]], + 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/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 685cd6d21a..e0f85cc26d 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -45,3 +45,19 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Planetary Nebulae", + Version = "2.0", + 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)]], + 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/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index bd58260f22..1728ba5dcf 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -37,6 +37,7 @@ local object = { EnablePixelSizeControl = false }, GUI = { + Name = "Pulsars", Path = "/Milky Way" } } @@ -44,3 +45,24 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Pulsars", + Version = "2.0", + 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)]], + 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/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index be9b11e59b..81dc10dbfe 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -35,6 +35,7 @@ local object = { EnablePixelSizeControl = true }, GUI = { + Name = "Quasars", Path = "/Universe" } } @@ -42,3 +43,19 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Quasars", + Version = "2.0", + 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)]], + 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/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index 56d92df264..2637234935 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -51,3 +51,27 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Sloan Digital Sky Survey", + Version = "2.0", + 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/)]], + 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/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index 6e12b8e7eb..64025a69e8 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -33,3 +33,13 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Star Labels", + Version = "2.0", + Description = [[Labels for stars in the Milky Way. See 'Stars' asset for more info.]], + 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/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index 212d2a9b3f..67e5b6120f 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -168,3 +168,16 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { sunOrbit, barnardsOrbit, pM_J13420Orbit, lSRJ0822Orbit, lSR1826Orbit, lacaille9352Orbit, kapteynsOrbit }) + + +asset.meta = { + Name = "Star Orbits", + Version = "1.0", + 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)", + 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 0407908aab..9a1d5b31be 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -67,3 +67,18 @@ local sunstar = { } assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar }) + + +asset.meta = { + Name = "Stars", + Version = "2.0", + Description = [[Census: 117,003 stars with 321 labels. DU Version 7.8. 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: XHIP: An Extended + Hipparcos Compilation (Anderson E., Francis C. 2012); Hipparcos Catalog + (European Space Agency 1997); Gliese Catalog (Gliese and Jahriess 1991)]], + 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/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index 6ebbb1f488..107c0fab0c 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -45,3 +45,18 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Galaxy Superclusters", + Version = "2.0", + 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)]], + 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 c821080e65..fe81aa9c73 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -47,3 +47,16 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Supernova Remnants", + Version = "2.0", + 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)]], + 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/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index 45ce730432..f8cada0262 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -89,3 +89,36 @@ local tullyImages = { assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages }) + + +asset.meta = { + Name = "Tully Galaxies", + Version = "3.0", + 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 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.

+ Galaxy images. 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)]], + 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 420ebe54b7..7cf0d9a289 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -25,6 +25,7 @@ local object = { Unit = "Mpc" }, GUI = { + Name = "Voids", Path = "/Universe/Galaxies" } } @@ -32,3 +33,21 @@ local object = { assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + +asset.meta = { + Name = "Voids", + Version = "2.0", + 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]], + Author = "Brian Abbott (AMNH)", + URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", + License = "AMNH Digital Universe" +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index f1bb6e13c7..fa48f1b2ef 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -13,7 +13,7 @@ end) asset.meta = { Name = "Default Charon Layers", Version = "1.0", - Description = [[ Default Charon layers are: Black & White [USGS]]], + Description = [[ Default Charon layers are: Black & White USGS]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset index 43af4ff920..b5e907d024 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -13,7 +13,7 @@ end) asset.meta = { Name = "Default Pluto Layers", Version = "1.0", - Description = [[ Default Pluto layers are: Black & White [USGS]]], + Description = [[ Default Pluto layers are: Black & White USGS]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 6f9febd412..8037c6bf31 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -21,7 +21,7 @@ local MercuryTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, GUI = { Name = "Mercury Trail", - Path = "/Solar System/Planets/Mercury" + Path = "/Milky Way/Gaia/Mercury" } } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index eb55c4b3d5..4573474634 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -3,10 +3,11 @@ local transforms = asset.require('scene/solarsystem/sun/transforms') asset.require("spice/base") +local etransforms = asset.require('scene/solarsystem/planets/earth/transforms') local VenusTrailEarth = { Identifier = "VenusTrailEarth", - Parent = transforms.SolarSystemBarycenter.Identifier, + Parent = etransforms.EarthBarycenter.Identifier, Renderable = { Type = "RenderableTrailOrbit", Translation = { @@ -20,9 +21,9 @@ local VenusTrailEarth = { }, Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, GUI = { - Name = "Venus Trail from Earth", + Name = "Venus trail from Earth", Path = "/Solar System/Planets/Venus", - Hidden = true + Hidden = false } } diff --git a/data/web/documentation/scenelicense.hbs b/data/web/documentation/scenelicense.hbs index f60b719a53..7fd118c072 100644 --- a/data/web/documentation/scenelicense.hbs +++ b/data/web/documentation/scenelicense.hbs @@ -8,9 +8,9 @@

{{{description}}}

Version - {{version}}

-

Author - {{author}}

+

Author - {{{author}}}

Associated URL - {{url}}

-

License - {{license}}

+

License - {{{license}}}

Filepath - {{path}}

diff --git a/data/web/documentation/script.js b/data/web/documentation/script.js index ba8e45eb4b..280ea2cd8f 100644 --- a/data/web/documentation/script.js +++ b/data/web/documentation/script.js @@ -133,6 +133,10 @@ window.onload = function () { /\\n/g, "" ); documentation[i].data[j].description = escaped; + var escapedLicense = documentation[i].data[j].license.replace( + /\\n/g, "" + ); + documentation[i].data[j].license = escapedLicense; } } From d80087687930d9efb43cdd6d775dca7adcd03270 Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 2 Oct 2020 17:20:21 -0400 Subject: [PATCH 05/12] mars layers --- data/assets/base.asset | 24 -------------- .../scene/digitaluniverse/milkyway.asset | 20 ++---------- .../digitaluniverse/milkyway_arm_labels.asset | 18 ++--------- .../scene/digitaluniverse/milkyway_data.asset | 16 ++++++++++ .../planets/earth/moon/default_layers.asset | 6 ++-- .../solarsystem/planets/earth/moon/moon.asset | 5 +-- .../earth/satellites/satellites_all.asset | 11 +++++++ .../satellites_communications.asset | 12 +++++++ .../earth/satellites/satellites_debris.asset | 12 +++++++ .../satellites/satellites_interesting.asset | 11 +++++++ .../earth/satellites/satellites_misc.asset | 11 +++++++ .../satellites/satellites_navigation.asset | 11 +++++++ .../earth/satellites/satellites_science.asset | 11 +++++++ .../earth/satellites/satellites_weather.asset | 11 +++++++ .../planets/mars/default_layers.asset | 1 - .../layers/colorlayers/ctx_blended_01.asset | 23 ++++++++++++++ .../layers/colorlayers/mars_texture.asset | 10 ++++++ .../mola_pseudo_color_sweden.asset | 26 ++++++++++++++++ .../colorlayers/mola_pseudo_color_utah.asset | 26 ++++++++++++++++ .../colorlayers/themis_ir_day_sweden.asset | 20 ++++++++++++ .../colorlayers/themis_ir_day_utah.asset | 20 ++++++++++++ .../colorlayers/themis_ir_night_sweden.asset | 21 +++++++++++++ .../colorlayers/themis_ir_night_utah.asset | 21 +++++++++++++ .../colorlayers/viking_mdim_sweden.asset | 31 +++++++++++++++++++ .../layers/colorlayers/viking_mdim_utah.asset | 30 ++++++++++++++++++ .../mars/layers/heightlayers/mola.asset | 15 --------- .../layers/heightlayers/mola_europe.asset | 27 +++++++++++++++- .../mars/layers/heightlayers/mola_utah.asset | 25 +++++++++++++++ .../map_service_configs/Mars_MGS_MOLA_DEM.wms | 18 ----------- .../colorlayers/global_mosaic_100m_hpf.asset | 3 +- data/assets/util/default_keybindings.asset | 15 +-------- 31 files changed, 401 insertions(+), 110 deletions(-) create mode 100644 data/assets/scene/digitaluniverse/milkyway_data.asset delete mode 100644 data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset delete mode 100644 data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms diff --git a/data/assets/base.asset b/data/assets/base.asset index 86bdf3cbd6..19c73d5fd5 100644 --- a/data/assets/base.asset +++ b/data/assets/base.asset @@ -37,30 +37,6 @@ asset.require('customization/globebrowsing') -- Keybindings that are specific for this scene local Keybindings = { - { - Key = "b", - Name = "Toggle background", - Command = propertyHelper.invert('Scene.MilkyWay.Renderable.Enabled') .. - propertyHelper.invert('Scene.Stars.Renderable.Enabled'), - Documentation = "Toggle background (Stars and Milkyway).", - GuiPath = "/Rendering", - Local = false - }, - { - Key = "g", - Name = "Toggle background/shading", - Command = propertyHelper.invert('Scene.MilkyWay.Renderable.Enabled') .. - propertyHelper.invert('Scene.Stars.Renderable.Enabled') .. - propertyHelper.invert('Scene.Earth.Renderable.Layers.NightLayers.Earth_at_Night_2012.Enabled') .. - propertyHelper.invert('Scene.EarthAtmosphere.Renderable.Enabled') .. - propertyHelper.invert('Scene.MarsAtmosphere.Renderable.Enabled') .. - propertyHelper.invert('Scene.Earth.Renderable.Layers.WaterMasks.MODIS_Water_Mask.Enabled') .. - propertyHelper.invert('Scene.Moon.Renderable.Enabled') .. - propertyHelper.invert('Scene.Sun.Renderable.Enabled'), - Documentation = "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun", - GuiPath = "/Rendering", - Local = false - }, { Key = "h", Name="Toggle Trails", diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index 6dcadd0dff..b196fd5e27 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -1,20 +1,6 @@ local assetHelper = asset.require('util/asset_helper') - - -local planeTextures = asset.syncedResource({ - Name = "Milky Way Plane Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_textures", - Version = 2 -}) - -local planeSpeck = asset.syncedResource({ - Name = "Milky Way Plane Speck", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_speck", - Version = 1 -}) +local dataPaths = asset.require("milkyway_data") local plane = { Identifier = "MilkyWayGalaxyImage", @@ -25,8 +11,8 @@ local plane = { Color = { 1.0, 1.0, 1.0 }, Opacity = 0.99, ScaleFactor = 2.8, - File = planeSpeck .. "/galaxy.speck", - TexturePath = planeTextures, + File = dataPaths.SpeckPath .. "/galaxy.speck", + TexturePath = dataPaths.TexturesPath, Luminosity = "size", ScaleLuminosity = 1.0, FadeInDistances = { 3000.0, 50000.0 }, diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index bab87cb461..fe76657b2e 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -1,18 +1,6 @@ local assetHelper = asset.require('util/asset_helper') -local planeTextures = asset.syncedResource({ - Name = "Milky Way Plane Textures", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_textures", - Version = 2 -}) - -local planeSpeck = asset.syncedResource({ - Name = "Milky Way Plane Speck", - Type = "HttpSynchronization", - Identifier = "digitaluniverse_milkyway_speck", - Version = 1 -}) +local dataPaths = asset.require("milkyway_data") local plane = { Identifier = "MilkyWayGalaxyArmLabelsImage", @@ -23,8 +11,8 @@ local plane = { Color = { 1.0, 1.0, 1.0 }, Opacity = 0.99, ScaleFactor = 2.8, - File = planeSpeck .. "/galaxyArmLabels.speck", - TexturePath = planeTextures, + File = dataPaths.SpeckPath .. "/galaxyArmLabels.speck", + TexturePath = dataPaths.TexturesPath, Luminosity = "size", ScaleLuminosity = 1.0, FadeInDistances = { 3000.0, 50000.0 }, diff --git a/data/assets/scene/digitaluniverse/milkyway_data.asset b/data/assets/scene/digitaluniverse/milkyway_data.asset new file mode 100644 index 0000000000..c24c47f05e --- /dev/null +++ b/data/assets/scene/digitaluniverse/milkyway_data.asset @@ -0,0 +1,16 @@ +local planeTextures = asset.syncedResource({ + Name = "Milky Way Plane Textures", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_textures", + Version = 2 +}) + +local planeSpeck = asset.syncedResource({ + Name = "Milky Way Plane Speck", + Type = "HttpSynchronization", + Identifier = "digitaluniverse_milkyway_speck", + Version = 1 +}) + +asset.export(planeTextures, TexturesPath) +asset.export(planeSpeck, SpeckPath) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset index a46e934e2b..956609cac7 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -22,6 +22,8 @@ asset.require(heightLayersPath .. "/loladem_sweden") -- Set enabled layers (temporary solution) -- @TODO: do this using a boolean that's passed to the 'asset.require' instead asset.onInitialize(function () - openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) - openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. + colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. + heightLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 90f41d87dc..74f9f0f6c1 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -57,6 +57,9 @@ local Moon = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { Moon }) + + asset.meta = { Name = "Moon", Version = "1.0", @@ -65,5 +68,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { Moon }) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset index 312d2f2cfb..953bb149ec 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset @@ -6,3 +6,14 @@ asset.require('./satellites_misc') asset.require('./satellites_navigation') asset.require('./satellites_science') asset.require('./satellites_weather') + + +asset.meta = { + Name = "Satellites All", + Version = "1.0", + Description = [[ Meta asset for all satellites of Earth. Containing all other meta + assets.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset index 872322c03c..6341917a7d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset @@ -11,3 +11,15 @@ asset.require('./communications/other_comm') asset.require('./communications/gorizont') asset.require('./communications/raduga') asset.require('./communications/molniya') + + +asset.meta = { + Name = "Satellites Communications", + Version = "1.0", + Description = [[ Meta asset for communications satellites of Earth. Containing groups: + geostationary, intelsat, ses, iridium, iridium_next, orbcomm, globalstar, amateur, + experimental, other_comm, gorizont, raduga and molniya.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset index 03feae1272..04f73ac275 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset @@ -3,3 +3,15 @@ asset.require('./debris/debris_breezem') asset.require('./debris/debris_fengyun') asset.require('./debris/debris_iridium33') asset.require('./debris/debris_kosmos2251') + + +asset.meta = { + Name = "Satellites Debris", + Version = "1.0", + Description = [[ Meta asset for space debris of Earth. Containing groups: + debris_asat, debris_breezem, debris_fengyun, debris_iridium33, and + debris_kosmos2251.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset index 71151f4358..e5ae453077 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset @@ -4,3 +4,14 @@ asset.require('./navigation/gps') asset.require('./misc/spacestations') asset.require('./misc/iss') asset.require('./misc/tle-new') + + +asset.meta = { + Name = "Satellites Interesting", + Version = "1.0", + Description = [[ Meta asset for interesting satellites of Earth. Containing groups: + brightest, geostationary, gps, spacestations, iss, and tle-new.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset index bd4c0d88b9..e44d1b4c6b 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset @@ -2,3 +2,14 @@ asset.require('./misc/military') asset.require('./misc/radar') asset.require('./misc/cubesats') asset.require('./misc/other') + + +asset.meta = { + Name = "Satellites Misc", + Version = "1.0", + Description = [[ Meta asset for misc satellites of Earth. Containing groups: + military, radar, cubesats, and other.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset index 6765ad4118..4ba584613d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset @@ -5,3 +5,14 @@ asset.require('./navigation/gps') asset.require('./navigation/musson') asset.require('./navigation/nnss') asset.require('./navigation/sbas') + + +asset.meta = { + Name = "Satellites Navigation", + Version = "1.0", + Description = [[ Meta asset for navigation satellites of Earth. Containing groups: + beidou, galileo, glosnass, gps, musson, nnss, and sbas.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset index cb1ecee8e3..b4fcc359c9 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset @@ -2,3 +2,14 @@ asset.require('./science/spaceearth') asset.require('./science/geodetic') asset.require('./science/engineering') asset.require('./science/education') + + +asset.meta = { + Name = "Satellites Science", + Version = "1.0", + Description = [[ Meta asset for science satellites of Earth. Containing groups: + spaceearth, geodetic, engineering, and education.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset index fe272e6816..e3177c98b2 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset @@ -8,3 +8,14 @@ asset.require('./weather/sarsat') asset.require('./weather/spire') asset.require('./weather/tdrss') asset.require('./weather/weather') + + +asset.meta = { + Name = "Satellites Weather", + Version = "1.0", + Description = [[ Meta asset for weather satellites of Earth. Containing groups: argos, + dmc, earth_resources, geos, noaa, planet, sarsat, spire, tdrss, and weather.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index 8dfbdd1fa2..62f24e5f4a 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -20,7 +20,6 @@ asset.require(colorLayersPath .. "/ctx_mosaic_sweden") asset.require(colorLayersPath .. "/ctx_blended_01") -- Height layers -asset.require(heightLayersPath .. "/mola") asset.require(heightLayersPath .. "/mola_europe") local heightLayer = asset.require(heightLayersPath .. "/mola_utah") diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index f762b02170..d8228ba15c 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -17,3 +17,26 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "CTX Blended beta01", + Version = "1.0", + Description = [[This product contains CTX data through MRO release 45, CTX mission + phase J21 (December 1, 2017). The mosaic is comprised of 74,196 separate CTX + images out of 95,106 available (78.0%). Orbits not included were either (1) low + signal/noise (increased atmospheric opacity), or (2) redundant coverage (stereo + targets, change detection, etc.). With low-quality images removed, the mosaic + covers 97.3% of Mars. The mosaic covers 88°S to 88°N. All data are resampled to + 5.0 m/px, including 2,334 orbits (3.14%) that are natively higher resolution than + 5.0 m/px, though no images are higher resolution than 4.93 m/px. The planet was + divided into 3,960 4°x4° tiles, which are not blended with each other in this + version. As we describe below, every pixel can be traced to its host orbit through + vectorized seam-maps that are provided with every tile. These seam-maps provide + pixel-for-pixel spatial documentation of image seams, to prevent misinterpretation + of seams as possible landforms and to provide instant access to original data. A + completely seamless CTX mosaic is currently infeasible, so seam-maps are required + to prevent misinterpretation. (Description from URL) This map is hosted by ESRI]], + Author = "Caltech Murray Lab", + URL = "http://murray-lab.caltech.edu/CTX/", + License = "Esri Master License Agreement" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index fca27b6889..e814b6cd36 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -12,3 +12,13 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Mars Texutre", + Version = "1.0", + Description = [[ Default jpg texture for Mars]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index 2b8889c87b..3103bb6b19 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -12,3 +12,29 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "MOLA Pseudo Color [Sweden]", + Version = "1.0", + Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) + (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + spacecraft (Albee, et al., 2001). The image used for the base of this map + represents more than 600 million measurements gathered between 1999 and 2001, + adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and + converted to planetary radii. These have been converted to elevations above the + areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et + al., 2001), truncated to degree and order 50, and oriented according to current + standards (see below). The average accuracy of each point is originally ~100 + meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; + Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m + due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and + regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL). + This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", + License = "NASA/PDS" +} + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index dcb1ac18f4..7796b7da2c 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -12,3 +12,29 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "MOLA Pseudo Color [Utah]", + Version = "1.0", + Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) + (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) + spacecraft (Albee, et al., 2001). The image used for the base of this map + represents more than 600 million measurements gathered between 1999 and 2001, + adjusted for consistency (Neumann, et al., 2001; Neumann, et al., 2003) and + converted to planetary radii. These have been converted to elevations above the + areoid as determined from a Martian gravity field solution GMM-2B (Lemoine, et + al., 2001), truncated to degree and order 50, and oriented according to current + standards (see below). The average accuracy of each point is originally ~100 + meters in horizontal position and ~1 meter in radius (Neumann, et al., 2001; + Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m + due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and + regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL). + This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", + License = "NASA/PDS" +} + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset index 89faa5565b..37db368e70 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -13,3 +13,23 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Themis IR Day [Sweden]", + Version = "1.0", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL). This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset index 08a6f6a6ce..68dd17a0e2 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -13,3 +13,23 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Themis IR Day [Utah]", + Version = "1.0", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL). This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset index c824296cd3..9e9f34c70b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -13,3 +13,24 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Themis IR Night [Sweden]", + Version = "1.0", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL). This map is hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset index 1d0442f7f5..5a841ac4cc 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -13,3 +13,24 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Themis IR Night [Utah]", + Version = "1.0", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL). This map is hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. + "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index 68cb2ab512..a3f8a1e179 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -12,3 +12,34 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Viking MDIM [Sweden]", + Version = "1.0", + Description = [[This global image map of Mars has a resolution of 256 pixels/degree + (scale approximately 232 meters per pixel (m) at the equator). The colorized + mosaic was completed by NASA AMES which warped the original Viking colorized + mosaic and blended over the latest black/white Mars Digital Image Model + (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be + roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 + km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic + control, the previous mosaics were affected by changing definitions of + cartographic parameters (such as the definition of zero longitude), + resulting in an overall longitude shift of as much as 0.2° between the early MDIMs + and other datasets. The new mosaic uses the most recent coordinate system + definitions for Mars. These definitions have been widely adopted by NASA missions + and other users of planetary data and are likely to remain in use for a decade or + more. As a result, MDIM 2.1 not only registers precisely with data from current + missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve + as an accurate basemap on which data from future missions can be plotted. + (Description from URL).

References: Williams, D. R. (2018). Viking + Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 This map is + hosted on the OpenSpace server in Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. + "Mars_Viking_MDIM21_ClrMosaic_global_232m", + License = "NASA/PDS" +} + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset index 2c87a9341f..a231ae7b38 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -12,3 +12,33 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Viking MDIM [Utah]", + Version = "1.0", + Description = [[This global image map of Mars has a resolution of 256 pixels/degree + (scale approximately 232 meters per pixel (m) at the equator). The colorized + mosaic was completed by NASA AMES which warped the original Viking colorized + mosaic and blended over the latest black/white Mars Digital Image Model + (MDIM 2.1). The positional accuracy of features in MDIM 2.1 is estimated to be + roughly one pixel (200 m), compared to 3 km for MDIM 2.0 released in 2001 and >6 + km for MDIM 1.0 released in 1991. In addition to relatively imprecise geodetic + control, the previous mosaics were affected by changing definitions of + cartographic parameters (such as the definition of zero longitude), + resulting in an overall longitude shift of as much as 0.2° between the early MDIMs + and other datasets. The new mosaic uses the most recent coordinate system + definitions for Mars. These definitions have been widely adopted by NASA missions + and other users of planetary data and are likely to remain in use for a decade or + more. As a result, MDIM 2.1 not only registers precisely with data from current + missions such as Mars Global Surveyor (MGS) and 2001 Mars Odyssey but will serve + as an accurate basemap on which data from future missions can be plotted. + (Description from URL).

References: Williams, D. R. (2018). Viking + Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 This map is + hosted on the OpenSpace server in Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. + "Mars_Viking_MDIM21_ClrMosaic_global_232m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset deleted file mode 100644 index bfeed2d2e6..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset +++ /dev/null @@ -1,15 +0,0 @@ -local mapServiceConfigs = asset.localResource("./../../map_service_configs") -local globeIdentifier = asset.require("./../../mars").Mars.Identifier - -local layer = { - Identifier = "Mola", - Name = "Mola Elevation", - FilePath = mapServiceConfigs .. "/Mars_MGS_MOLA_DEM.wms", - TilePixelSize = 90 -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index d9cb1735e7..6c58e66684 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -3,7 +3,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Mola_Europe", - Name = "Mola Elevation [Europe]", + Name = "Mola Elevation [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", TilePixelSize = 90 } @@ -13,3 +13,28 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Mola Elevation [Sweden]", + Version = "1.0", + Description = [[ This digital elevation model (DEM) is based on data from the Mars + Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars + Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents + more than 600 million measurements gathered between 1999 and 2001, adjusted for + consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to + planetary radii. These have been converted to elevations above the areoid as + determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), + truncated to degree and order 50, and oriented according to current standards. + The average accuracy of each point is originally ~100 meters in horizontal + position and ~1 meter in radius (Neumann et al., 2001). However, the total + elevation uncertainty is at least ±3 m due to the global error in the areoid + (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape + (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from + URL). Data Reference: (See URL). This map is hosted on the OpenSpace server in + Sweden.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_DEM_mosaic_global_463m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index c2cd50d329..083ee86e45 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -13,3 +13,28 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "Mola Elevation [Utah]", + Version = "1.0", + Description = [[ This digital elevation model (DEM) is based on data from the Mars + Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars + Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents + more than 600 million measurements gathered between 1999 and 2001, adjusted for + consistency (Neumann et al., 2001; Neumann, Smith & Zuber, 2003) and converted to + planetary radii. These have been converted to elevations above the areoid as + determined from a Martian gravity field solution GMM-2B (Lemoine et al., 2001), + truncated to degree and order 50, and oriented according to current standards. + The average accuracy of each point is originally ~100 meters in horizontal + position and ~1 meter in radius (Neumann et al., 2001). However, the total + elevation uncertainty is at least ±3 m due to the global error in the areoid + (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape + (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from + URL). Data Reference: (See URL). This map is hosted on the OpenSpace server in + Utah.]], + Author = "USGS", + URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. + "Mars_MGS_MOLA_DEM_mosaic_global_463m", + License = "NASA/PDS" +} diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms deleted file mode 100644 index b50fc7ba32..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/Mars_MGS_MOLA_DEM.wms +++ /dev/null @@ -1,18 +0,0 @@ - - - http://d1poygwgh8gv6r.cloudfront.net/catalog/Mars_MGS_MOLA_DEM_mosaic_global_463m_8/1.0.0//default/default028mm/${z}/${y}/${x}.png - image/png - - - 5 - 2 - 1 - top - - Byte - EPSG:4326 - 256 - 256 - 2 - 5 - diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index c43efc09a8..f04d112733 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -22,7 +22,8 @@ asset.meta = { 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control network. The image selection criteria were based on coverage, quality, and a spatial resolution between 50 and 500 meters per pixel (m) with phase angles less - than 120 degrees. (Description from URL)]], + than 120 degrees. (Description from URL). This map is hosted on the OpenSpace + server Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset index f576c94638..d668759861 100644 --- a/data/assets/util/default_keybindings.asset +++ b/data/assets/util/default_keybindings.asset @@ -141,20 +141,7 @@ openspace.setPropertyValueSingle("RenderEngine.ShowCamera", not isEnabled)]], Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.", GuiPath = "/Simulation Speed", Local = true - }, - { - Key = "R", - Name = "toggle radiosphere opacity", - Command = "local FADETIME = 2.5;" .. - "local PROPTOFADE = 'Scene.RadioSphere.Renderable.Opacity';" .. - "local currentOpacity = openspace.getPropertyValue(PROPTOFADE); " .. - "if (currentOpacity == 0.0) then " .. - "openspace.setPropertyValueSingle(PROPTOFADE, 1.0, FADETIME);else ".. - "openspace.setPropertyValueSingle(PROPTOFADE, 0, FADETIME);end", - Documentation = "Fade in and out the radio sphere.", - GuiPath = "/General", - Local = true - }, + } } local DeltaTimeKeys From 0ccf4dfd1ffdd2d12d531ab65b1446fa88260b2e Mon Sep 17 00:00:00 2001 From: Micah Date: Sun, 4 Oct 2020 16:26:52 -0400 Subject: [PATCH 06/12] update for gui meta panel --- data/assets/customization/gui.asset | 2 +- data/assets/scene/digitaluniverse/2dF.asset | 3 ++- data/assets/scene/digitaluniverse/2mass.asset | 3 ++- data/assets/scene/digitaluniverse/6dF.asset | 5 +++-- data/assets/scene/digitaluniverse/abell.asset | 3 ++- .../scene/digitaluniverse/alternatestarlabels.asset | 3 ++- .../scene/digitaluniverse/backgroundradiation.asset | 4 +++- data/assets/scene/digitaluniverse/clusters.asset | 5 +++-- .../scene/digitaluniverse/constellationbounds.asset | 3 ++- data/assets/scene/digitaluniverse/constellations.asset | 3 ++- data/assets/scene/digitaluniverse/deepsky.asset | 3 ++- data/assets/scene/digitaluniverse/dwarfs.asset | 3 ++- data/assets/scene/digitaluniverse/exoplanets.asset | 3 ++- data/assets/scene/digitaluniverse/globularclusters.asset | 3 ++- data/assets/scene/digitaluniverse/grids.asset | 6 +++++- data/assets/scene/digitaluniverse/groups.asset | 3 ++- data/assets/scene/digitaluniverse/h2regions.asset | 3 ++- data/assets/scene/digitaluniverse/kepler.asset | 3 ++- data/assets/scene/digitaluniverse/localdwarfs.asset | 3 ++- data/assets/scene/digitaluniverse/milkyway.asset | 3 ++- .../scene/digitaluniverse/milkyway_arm_labels.asset | 3 ++- data/assets/scene/digitaluniverse/milkyway_label.asset | 3 ++- data/assets/scene/digitaluniverse/milkyway_sphere.asset | 3 ++- data/assets/scene/digitaluniverse/obassociations.asset | 3 ++- data/assets/scene/digitaluniverse/openclusters.asset | 3 ++- data/assets/scene/digitaluniverse/planetarynebulae.asset | 3 ++- data/assets/scene/digitaluniverse/pulsars.asset | 3 ++- data/assets/scene/digitaluniverse/quasars.asset | 3 ++- data/assets/scene/digitaluniverse/sdss.asset | 3 ++- data/assets/scene/digitaluniverse/starlabels.asset | 3 ++- data/assets/scene/digitaluniverse/starorbits.asset | 4 +++- data/assets/scene/digitaluniverse/stars.asset | 3 ++- data/assets/scene/digitaluniverse/superclusters.asset | 3 ++- data/assets/scene/digitaluniverse/supernovaremnants.asset | 3 ++- data/assets/scene/digitaluniverse/tully.asset | 3 ++- data/assets/scene/digitaluniverse/voids.asset | 3 ++- data/assets/scene/milkyway/milkyway/volume.asset | 3 ++- .../scene/milkyway/objects/orionnebula/cluster.asset | 3 ++- .../scene/milkyway/objects/orionnebula/nebula.asset | 4 +++- .../scene/solarsystem/planets/earth/atmosphere.asset | 3 ++- data/assets/scene/solarsystem/planets/earth/earth.asset | 3 ++- .../amsr2_gcom_w1_sea_ice_concentration_temporal.asset | 3 ++- .../earth/layers/colorlayers/aqua_modis_temporal.asset | 3 ++- .../planets/earth/layers/colorlayers/bmng_sweden.asset | 3 ++- .../planets/earth/layers/colorlayers/bmng_utah.asset | 3 ++- .../earth/layers/colorlayers/esri_imagery_world_2D.asset | 3 ++- .../earth/layers/colorlayers/esri_viirs_combo.asset | 3 ++- .../earth/layers/colorlayers/esri_world_imagery.asset | 3 ++- .../earth/layers/colorlayers/fallbacks/blue_marble.asset | 3 ++- ...ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset | 3 ++- .../ghrsst_l4_mur_sea_surface_temperature_temporal.asset | 3 ++- .../colorlayers/modis_terra_chlorophyll_a_temporal.asset | 3 ++- .../earth/layers/colorlayers/terra_modis_temporal.asset | 3 ++- .../earth/layers/colorlayers/viirs_snpp_temporal.asset | 3 ++- .../heightlayers/fallbacks/blue_marble_height.asset | 3 ++- .../earth/layers/heightlayers/terrain_tileset.asset | 3 ++- .../earth/layers/nightlayers/earth_at_night_2012.asset | 3 ++- .../layers/nightlayers/earth_at_night_temporal.asset | 3 ++- .../nightlayers/fallbacks/earth_night_texture.asset | 5 +++-- data/assets/scene/solarsystem/planets/earth/markers.asset | 3 ++- .../scene/solarsystem/planets/earth/moon/moon.asset | 3 ++- .../scene/solarsystem/planets/earth/moon/trail.asset | 3 ++- data/assets/scene/solarsystem/planets/earth/trail.asset | 3 ++- .../scene/solarsystem/planets/earth/transforms.asset | 3 ++- .../solarsystem/planets/jupiter/callisto/callisto.asset | 3 ++- .../callisto/layers/colorlayers/callisto_texture.asset | 2 +- .../solarsystem/planets/jupiter/callisto/trail.asset | 3 ++- .../scene/solarsystem/planets/jupiter/europa/europa.asset | 3 ++- .../europa/layers/colorlayers/voyager_global_mosaic.asset | 3 ++- .../scene/solarsystem/planets/jupiter/europa/trail.asset | 3 ++- .../solarsystem/planets/jupiter/ganymede/ganymede.asset | 3 ++- .../solarsystem/planets/jupiter/ganymede/trail.asset | 3 ++- data/assets/scene/solarsystem/planets/jupiter/io/io.asset | 3 ++- .../scene/solarsystem/planets/jupiter/io/trail.asset | 3 ++- .../scene/solarsystem/planets/jupiter/jupiter.asset | 3 ++- data/assets/scene/solarsystem/planets/jupiter/trail.asset | 3 ++- .../scene/solarsystem/planets/jupiter/transforms.asset | 3 ++- .../scene/solarsystem/planets/mars/atmosphere.asset | 3 ++- .../planets/mars/layers/colorlayers/ctx_blended_01.asset | 3 ++- .../layers/colorlayers/mola_pseudo_color_sweden.asset | 3 ++- .../mars/layers/colorlayers/mola_pseudo_color_utah.asset | 3 ++- .../mars/layers/colorlayers/themis_ir_day_sweden.asset | 3 ++- .../mars/layers/colorlayers/themis_ir_day_utah.asset | 3 ++- .../mars/layers/colorlayers/themis_ir_night_sweden.asset | 3 ++- .../mars/layers/colorlayers/themis_ir_night_utah.asset | 3 ++- .../mars/layers/colorlayers/viking_mdim_sweden.asset | 3 ++- .../mars/layers/colorlayers/viking_mdim_utah.asset | 3 ++- .../planets/mars/layers/heightlayers/mola_europe.asset | 3 ++- .../planets/mars/layers/heightlayers/mola_utah.asset | 3 ++- data/assets/scene/solarsystem/planets/mars/mars.asset | 3 ++- .../scene/solarsystem/planets/mars/moons/deimos.asset | 8 -------- .../scene/solarsystem/planets/mars/moons/phobos.asset | 8 -------- data/assets/scene/solarsystem/planets/mars/trail.asset | 3 ++- .../scene/solarsystem/planets/mars/transforms.asset | 3 ++- .../scene/solarsystem/planets/mercury/mercury.asset | 3 ++- data/assets/scene/solarsystem/planets/mercury/trail.asset | 3 ++- .../scene/solarsystem/planets/mercury/transforms.asset | 3 ++- .../scene/solarsystem/planets/neptune/neptune.asset | 3 ++- data/assets/scene/solarsystem/planets/neptune/trail.asset | 3 ++- .../scene/solarsystem/planets/neptune/transforms.asset | 3 ++- .../assets/scene/solarsystem/planets/neptune/triton.asset | 3 ++- .../solarsystem/planets/saturn/enceladus/enceladus.asset | 3 ++- .../layers/colorlayers/global_mosaic_100m_hpf.asset | 3 ++- .../solarsystem/planets/saturn/enceladus/trail.asset | 3 ++- .../solarsystem/planets/saturn/hyperion/hyperion.asset | 3 ++- .../scene/solarsystem/planets/saturn/hyperion/trail.asset | 3 ++- .../solarsystem/planets/saturn/iapetus/iapetus.asset | 3 ++- .../scene/solarsystem/planets/saturn/iapetus/trail.asset | 3 ++- .../scene/solarsystem/planets/saturn/mimas/mimas.asset | 3 ++- .../scene/solarsystem/planets/saturn/mimas/trail.asset | 3 ++- data/assets/scene/solarsystem/planets/saturn/trail.asset | 3 ++- .../scene/solarsystem/planets/saturn/transforms.asset | 3 ++- data/assets/scene/solarsystem/planets/uranus/trail.asset | 3 ++- data/assets/scene/solarsystem/planets/uranus/uranus.asset | 3 ++- .../scene/solarsystem/planets/venus/atmosphere.asset | 3 ++- data/assets/scene/solarsystem/planets/venus/trail.asset | 3 ++- .../scene/solarsystem/planets/venus/trail_earth.asset | 8 +++++--- .../scene/solarsystem/planets/venus/transforms.asset | 3 ++- data/assets/scene/solarsystem/planets/venus/venus.asset | 3 ++- data/assets/scene/solarsystem/sssb/amor_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sssb/apollo_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sssb/aten_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sssb/atira_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sssb/c2019y4atlas.asset | 3 ++- data/assets/scene/solarsystem/sssb/centaur_asteroid.asset | 3 ++- .../assets/scene/solarsystem/sssb/chiron-type_comet.asset | 3 ++- data/assets/scene/solarsystem/sssb/encke-type_comet.asset | 3 ++- .../assets/scene/solarsystem/sssb/halley-type_comet.asset | 3 ++- .../scene/solarsystem/sssb/inner_main_belt_asteroid.asset | 3 ++- .../scene/solarsystem/sssb/jupiter-family_comet.asset | 3 ++- .../scene/solarsystem/sssb/jupiter_trojan_asteroid.asset | 3 ++- .../scene/solarsystem/sssb/main_belt_asteroid.asset | 3 ++- .../scene/solarsystem/sssb/mars-crossing_asteroid.asset | 3 ++- .../scene/solarsystem/sssb/outer_main_belt_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sssb/pha.asset | 3 ++- data/assets/scene/solarsystem/sssb/swifttuttle.asset | 3 ++- data/assets/scene/solarsystem/sssb/tesla_roadster.asset | 3 ++- .../solarsystem/sssb/transneptunian_object_asteroid.asset | 3 ++- data/assets/scene/solarsystem/sun/glare.asset | 3 ++- data/assets/scene/solarsystem/sun/marker.asset | 3 ++- data/assets/scene/solarsystem/sun/sun.asset | 3 ++- data/assets/scene/solarsystem/sun/transforms.asset | 3 ++- include/openspace/scene/asset.h | 1 + modules/server/src/topics/documentationtopic.cpp | 7 +++++++ openspace.cfg | 2 +- src/scene/assetloader.cpp | 2 ++ src/scene/scenelicensewriter.cpp | 1 + 147 files changed, 302 insertions(+), 162 deletions(-) diff --git a/data/assets/customization/gui.asset b/data/assets/customization/gui.asset index e18cd44a7f..6a43444b0a 100644 --- a/data/assets/customization/gui.asset +++ b/data/assets/customization/gui.asset @@ -1,4 +1,4 @@ -asset.export("webguiDevelopmentMode", false) +asset.export("webguiDevelopmentMode", true) -- To make changes to the webgui: diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index b352d38854..31c9dc1703 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -62,5 +62,6 @@ asset.meta = { 1998-2003)]], Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "2dF" } diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index 508070b3af..014b854885 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -57,5 +57,6 @@ asset.meta = { that would normally be hidden to our eye. (Description from URL)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "2MASS" } \ No newline at end of file diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset index c4f7c35b3f..9f71435dbe 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -53,9 +53,10 @@ asset.meta = { 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 + clusters have not been corrected in these data. (Description from URL)

Data Reference: The 6dF Galaxy Survey Redshift Catalogue (Jones+, 2009)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "6dF" } diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset index 8fcd3ae5d6..07611c43e3 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -67,5 +67,6 @@ asset.meta = { Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]], Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Abell" } diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index e1ad7853f0..bc07c442fe 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -40,7 +40,8 @@ asset.meta = { from URL)

Data Reference: Various sources]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "StarLabelsAlternate" } assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset index ec87c3544e..a59f4d9374 100644 --- a/data/assets/scene/digitaluniverse/backgroundradiation.asset +++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset @@ -259,5 +259,7 @@ asset.meta = { Finkbeiner (Princeton)]], Author = "Brian Abbott (AMNH), OpenSpace Team", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "WMAP,CBE,Planck,PlanckMultiverse1,PlanckMultiverse2" .. + "PlanckMultiverse3,PlanckMultiverse4,HAlpha" } diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index c690c4ac84..dde7790828 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -41,7 +41,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { - Name = "Stars Labels - Alternate", + Name = "Galaxy Clusters Labels", Version = "1.0", 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 @@ -49,5 +49,6 @@ asset.meta = { group.(Description from URL)

Data Reference: Brian Abbott (AMNH)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "GalaxyClusterLabels" } diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index 4323b87180..a71d7f451f 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -52,5 +52,6 @@ asset.meta = { constellations.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "ConstellationBounds" } diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index 4dd1bc2783..9063dd01e0 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -70,5 +70,6 @@ asset.meta = { far away.(Description from URL)

Data Reference: various]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Constellations,ConstellationsExtragalactic" } diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index 766b04aa4a..a568a0fd64 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -101,6 +101,7 @@ asset.meta = { Reference: Largely NOAO and various other sources (each image has a ref)]], Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "DeepSkyObjects,DeepSkyObjectsImages" } diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index 998f4a5bc6..f0abdfb290 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -70,5 +70,6 @@ asset.meta = { Brown Dwarf Kinematics Project (Faherty+ 2019)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Dwarfs" } diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index cb8fdd0efd..9487e024ef 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -58,5 +58,6 @@ asset.meta = { NASA Exoplanet Archive (CalTech/NASA)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Exoplanets" } diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index 8e031c4072..a5945ff726 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -63,5 +63,6 @@ asset.meta = { Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "GlobularClusters" } diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 3c1fa6ba6d..31483f3243 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -547,5 +547,9 @@ asset.meta = { 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" + License = "AMNH Digital Universe", + Identifiers = "RadioSphere,OortSphere,EclipticSphere,EclipticSphereLabels,Equatorial," + .. "EquatorialSphereLabels,GalacticSphere,GalacticSphereLabels,1ldGrid,1lmGrid," + .. "1lyGrid,10lyGrid,100lyGrid,1klyGrid,10klyGrid,100klyGrid,1MlyGrid,10MlyGrid," + .. "100MlyGrid,20GlyGrid" } diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 11792e5726..311474dd14 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -50,5 +50,6 @@ asset.meta = { Reference: Brian Abbott (AMNH)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "NearbyGalaxyGroups" } diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index 1f74221271..65165a2d3a 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -62,5 +62,6 @@ asset.meta = { WISE catalog of Galactic HII Regions (Anderson+, 2014)]], Author = "Carter Emmart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "HIIRegions" } diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index e242c2d2a2..f83274168b 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -58,5 +58,6 @@ asset.meta = { (CalTech/NASA)]], Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "KeplerPlanetaryCandidates" } diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index a796e4523f..0e28296d4c 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -63,5 +63,6 @@ asset.meta = { galaxies in the Local Group (McConnachie+, 2012)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "LocalDwarfGalaxies" } diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index b196fd5e27..b406879508 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -42,5 +42,6 @@ asset.meta = { Observatory]], Author = "Brian Abbott, Carter Emmart (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "MilkyWayGalaxyImage" } diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index fe76657b2e..73071dc2b7 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -57,5 +57,6 @@ asset.meta = { 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]] + please visit http://www.haydenplanetarium.org/universe]], + Identifiers = "MilkyWayGalaxyArmLabelsImage" } diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index e40ddefab6..ce80b67270 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -52,5 +52,6 @@ asset.meta = { Description = [[Label for the Milky Way titled "Home", sided for the galactic level]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "HomeLabel" } diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index 0fb5a085d0..be974120ab 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -47,5 +47,6 @@ asset.meta = { when zooming away from the Milky Way]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MilkyWay" } diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index 77ed118180..e9d2fa48dd 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -66,5 +66,6 @@ asset.meta = { from URL)

Data Reference: New List of OB Associations (Melnik+)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "OBAssociations" } diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index 9964bbbc8d..0b705626c3 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -63,5 +63,6 @@ asset.meta = { (Dias+ 2002-2015)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "OpenStarClusters" } diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index e0f85cc26d..5537ce8c03 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -59,5 +59,6 @@ asset.meta = { Strasbourg-ESO Catalog of Planetary Nebulae (Acker+ 1992)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "PlanetaryNebulae" } diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index 1728ba5dcf..88cd099e47 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -64,5 +64,6 @@ asset.meta = { (Manchester+, 2005)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Pulsars" } diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index 81dc10dbfe..2b6c876118 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -57,5 +57,6 @@ asset.meta = { from URL)

Data Reference: The Million Quasars catalog (Flesch, 2017)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Quasars" } diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index 2637234935..495ab7aa22 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -73,5 +73,6 @@ asset.meta = { (http://www.sdss.org/)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "SloanDigitalSkySurvey" } diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index 64025a69e8..a9b60a1331 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -41,5 +41,6 @@ asset.meta = { Description = [[Labels for stars in the Milky Way. See 'Stars' asset for more info.]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "StarsLabels" } diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index 67e5b6120f..557c8b002b 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -179,5 +179,7 @@ asset.meta = { Reference: Sebastien Lepine (AMNH)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "SunOrbit,BarnardsOrbit,KapteynsOrbit,pM_J13420Orbit,LSR1826Orbit," .. + "LSRJ0822Orbit,lacaille9352Orbit" } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 9a1d5b31be..5632a6d297 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -80,5 +80,6 @@ asset.meta = { (European Space Agency 1997); Gliese Catalog (Gliese and Jahriess 1991)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Stars" } diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index 107c0fab0c..499441aa13 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -58,5 +58,6 @@ asset.meta = { 2001)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "GalaxySuperclusters" } diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index fe81aa9c73..9d30968697 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -58,5 +58,6 @@ asset.meta = {

Data Reference: The First Fermi LAT SNR Catalog (Acero+, 2016)]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "SupernovaRemnants" } diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index f8cada0262..a834f4c79c 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -120,5 +120,6 @@ asset.meta = { Levy (NCSA/UIUC)]], Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "TullyGalaxies,TullyGalaxiesImages" } diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index 7cf0d9a289..8d54bf408d 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -49,5 +49,6 @@ asset.meta = { neighborhood. (Description from URL)

Data Reference: various sources]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "AMNH Digital Universe" + License = "AMNH Digital Universe", + Identifiers = "Voids" } diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index 50e8f1a001..89bee4105e 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -60,5 +60,6 @@ asset.meta = { NEOJ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT License" + License = "MIT License", + Identifiers = "MilkyWayVolume" } diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index 843ca22825..1848c7526f 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -47,5 +47,6 @@ But the distance of each star has been derived from this educated-guess approach cluster distribution. ]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" + License = "AMNH Digital Universe", + Identifiers = "OrionClusterStars" } diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index 24e8c2eaa3..f6e01b2cc4 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -153,5 +153,7 @@ think of an HII region as a sort of tremendous explosion, taking place over mill and the bow shocks are part of the outward rush of material. ]], Author = "AMNH Digital Universe", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", - License = "custom" + License = "AMNH Digital Universe", + Identifiers = "OrionNebulaModel,OrionNebulaModel,OrionNebulaProplydsModel,".. + "OrionNebulaShocksModel" } diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index fc02665210..a97a6b0eb1 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -111,5 +111,6 @@ asset.meta = { Description = [[ Atmosphere of Earth.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EarthAtmosphere" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 457ecf7954..ec77388af5 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -87,5 +87,6 @@ asset.meta = { Description = [[ Earth is a special planet with special needs ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Earth,EarthLabel" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index 58427de208..a4ee521df8 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -31,5 +31,6 @@ asset.meta = { of 12 km. (Description from NASA Worldview)]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index 57e627fc68..a5d64afe55 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -36,5 +36,6 @@ asset.meta = { and the temporal resolution is daily. (Description from NASA Worldview)]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "Aqua_Modis_Temporal" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index 926552fea6..f4a52e2bb4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -20,5 +20,6 @@ asset.meta = { Hosted at LiU for Europe access]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA" + License = "NASA", + Identifiers = "BMNG_Sweden" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index 83bc44d9af..23641cf097 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -20,5 +20,6 @@ asset.meta = { Hosted at UU for US access]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA" + License = "NASA", + Identifiers = "BMNG_Utah" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index 28cb772654..a876ea33e7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -27,5 +27,6 @@ asset.meta = { (Description from URL)]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", - License = "Esri Master License Agreement" + License = "Esri Master License Agreement", + Identifiers = "ESRI_Imagery_World_2D" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index 101835a758..3c95c41bf3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -52,5 +52,6 @@ asset.meta = { Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]], Author = "OpenSpace Tem", URL = "http://www.openspaceproject.com", - License = "MIT License" + License = "MIT License", + Identifiers = "ESRI_VIIRS_Combo" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index 3f05fa1bdf..e83112aeba 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -29,5 +29,6 @@ asset.meta = { ~1:280 scale. (Description from URL)]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", - License = "Esri Master License Agreement" + License = "Esri Master License Agreement", + Identifiers = "ESRI_World_Imagery" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 4d6dfeb812..3f9883dc88 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -15,5 +15,6 @@ asset.meta = { Description = [[ Earth image from Blue Marble Next Generation ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA" + License = "NASA", + Identifiers = "Blue_Marble" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index b134b48e17..f4098f6997 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -29,5 +29,6 @@ asset.meta = { Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index a5b9d8f3d2..b3ec4a2717 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -29,5 +29,6 @@ asset.meta = { Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index 0476a6933f..ddbeed3d79 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -29,5 +29,6 @@ asset.meta = { Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "MODIS_Terra_Chlorophyll_A_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index 2e6bf716d5..7d063429fd 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -28,5 +28,6 @@ asset.meta = { Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "Terra_Modis_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index ec4efa26b5..e018b623ab 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -28,5 +28,6 @@ asset.meta = { Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", - License = "NASA" + License = "NASA", + Identifiers = "VIIRS_SNPP_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 4d2d9a8965..6688073de3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -12,7 +12,8 @@ asset.meta = { Description = [[ Topographic layer from Blue Marble Next Generation]], Author = "NASA", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA" + License = "NASA", + Identifiers = "Earth_Bluemarble_Height" } asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index 83547e724a..2e6a61c4d8 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -25,7 +25,8 @@ asset.meta = { data from the USGS elsewhere. Vertical units are measured in meters.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", - License = "Esri Master License Agreement" + License = "Esri Master License Agreement", + Identifiers = "Terrain_tileset" } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 4bd790072f..1747d6527e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -23,5 +23,6 @@ asset.meta = { in this global view. ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", - License = "NASA" + License = "NASA", + Identifiers = "Earth_at_Night_2012" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index 0136f3c036..0fe56e419f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -44,5 +44,6 @@ asset.meta = { temporal resolution is daily.]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", - License = "NASA" + License = "NASA", + Identifiers = "Earth_at_Night_Temporal" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index 2cd60d3e6f..a894adc2f2 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -1,7 +1,7 @@ local texturesPath = asset.require("./../../../earth_textures").TexturesPath local layer = { - Identifier = "Earth_Night Texture", + Identifier = "Earth_Night_Texture", Name = "Earth Night Texture", FilePath = texturesPath .. "/earth_night.jpg", } @@ -14,5 +14,6 @@ asset.meta = { Description = [[ Earth's city lights are clearly visible from space ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", - License = "NASA" + License = "NASA", + Identifiers = "Earth_Night_Texture" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 8d28772cd1..0b9a08e8af 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -32,5 +32,6 @@ asset.meta = { Description = [[ Earth marker with name, sized for Solar System view]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EarthMarker" } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 74f9f0f6c1..b3daa4d330 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -66,5 +66,6 @@ asset.meta = { Description = [[ Moon globe with labels. ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Moon" } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index 56744b67c8..d15b2eeea6 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -32,7 +32,8 @@ asset.meta = { Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MoonTrail" } assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index 4d87d9dd09..ab0462b88d 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -37,5 +37,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EarthTrail" } diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset index dcf36993d5..067bce9c88 100644 --- a/data/assets/scene/solarsystem/planets/earth/transforms.asset +++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset @@ -88,5 +88,6 @@ asset.meta = { Earth IAU. A scene graph node is created for each transform.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EarthBarycenter,EarthCenter,EarthInertial,EarthIAU" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 44ff27d7ff..530010c2f0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -61,5 +61,6 @@ asset.meta = { Description = [[ Callisto globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Callisto" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset index e1a48e6910..e65a91c782 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -19,5 +19,5 @@ asset.meta = { Description = [[ Default jpg texture for Callisto]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", } diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index 4bf6b6041a..f3030a28a0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -39,5 +39,6 @@ asset.meta = { (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "CallistoTrail" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index 45229edfe1..c0cdf4b1dc 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -61,5 +61,6 @@ asset.meta = { Description = [[ Europa globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Europa" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset index 0a5ad1deff..9f0a259b4c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -30,6 +30,7 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" .. "Europa_Voyager_GalileoSSI_global_mosaic_500m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Voyager_Global_Mosaic" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 26157b92b4..3da40b0a17 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -39,5 +39,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EuropaTrail" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index abca3042d2..36cbe09035 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -61,5 +61,6 @@ asset.meta = { Description = [[ Ganymede globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Ganymede" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index 703ed4745b..f2edd4eed3 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -39,5 +39,6 @@ asset.meta = { (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "GanymedeTrail" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 90b87ab137..44b6c0ce6c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -61,5 +61,6 @@ asset.meta = { Description = [[ Io globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Io" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index 79ad2dd49f..c630e5a596 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -39,5 +39,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "IoTrail" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index fd6bef68ea..824c99a8c9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -55,5 +55,6 @@ asset.meta = { Description = [[ Jupiter globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Jupiter,JupiterLabel" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index 4d95598944..c63168a2f4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -37,5 +37,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "JupiterTrail" } diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index 29982625a4..dde80c565a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -30,5 +30,6 @@ asset.meta = { Description = [[ Jupiter Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "JupiterBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 6172363669..11e0d6e756 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -74,5 +74,6 @@ asset.meta = { Description = [[ Atmosphere of Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MarsAtmosphere" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index d8228ba15c..950d4a2bd2 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -38,5 +38,6 @@ asset.meta = { to prevent misinterpretation. (Description from URL) This map is hosted by ESRI]], Author = "Caltech Murray Lab", URL = "http://murray-lab.caltech.edu/CTX/", - License = "Esri Master License Agreement" + License = "Esri Master License Agreement", + Identifiers = "CTX_blended_01" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index 3103bb6b19..d4e7e10d63 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -35,6 +35,7 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "MOLA_Pseudo_Color_Sweden" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index 7796b7da2c..0788d9ebe9 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -35,6 +35,7 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "MOLA_Pseudo_Color_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset index 37db368e70..19dda38382 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -31,5 +31,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Themis_IR_Day_Sweden" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset index 68dd17a0e2..4add3e6a38 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -31,5 +31,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Themis_IR_Day_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset index 9e9f34c70b..7361f4c6b6 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -32,5 +32,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Themis_IR_Night_Sweden" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset index 5a841ac4cc..c828a27e0f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -32,5 +32,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Themis_IR_Night_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index a3f8a1e179..e93338f2f1 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -40,6 +40,7 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Viking_MDIM_Sweden" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset index a231ae7b38..47ca495d1d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -40,5 +40,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Viking_MDIM_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index 6c58e66684..dada2c2baf 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -36,5 +36,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Mola_Europe" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index 083ee86e45..9bc260a861 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -36,5 +36,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Mola_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index ff77b2964f..25f836c95e 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -81,5 +81,6 @@ asset.meta = { Description = [[ Mars globe, and main globe label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Mars,MarsLabel" } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index 0b27982a7d..cac3aa4b4c 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -3,14 +3,6 @@ local assetHelper = asset.require('util/asset_helper') local kernels = asset.require('../mar097').Kernels --- local textures = asset.syncedResource({ --- Name = "Mars Textures", --- Type = "HttpSynchronization", --- Identifier = "mars_textures", --- Version = 1 --- }) - - local Deimos = { Identifier = "Deimos", Parent = transforms.MarsBarycenter.Identifier, diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 899b674980..639ba6dcf9 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -3,14 +3,6 @@ local assetHelper = asset.require('util/asset_helper') local kernels = asset.require('../mar097').Kernels --- local textures = asset.syncedResource({ --- Name = "Mars Textures", --- Type = "HttpSynchronization", --- Identifier = "mars_textures", --- Version = 1 --- }) - - local Phobos = { Identifier = "Phobos", Parent = transforms.MarsBarycenter.Identifier, diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index f8943d70d3..d5f533ffc0 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -37,5 +37,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MarsTrail" } diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index a7c3267607..73a7805cf3 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -28,5 +28,6 @@ asset.meta = { Description = [[ Mars Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MarsBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index d3865e7cdb..0505423034 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -75,5 +75,6 @@ asset.meta = { Description = [[ Mercury globe with labels, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Mercury,MercuryLabel" } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 8037c6bf31..279dc22404 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -37,5 +37,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MercuryTrail" } diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index c8fa7670f8..63dc3a5783 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -28,5 +28,6 @@ asset.meta = { Description = [[ Mercury Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MercuryBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index 4431a338e4..700881423a 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -55,5 +55,6 @@ asset.meta = { Description = [[ Neptune globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Neptune" } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index b20b1ee39d..09fca57b02 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -48,5 +48,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "NeptuneTrail" } diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index 2156892901..c96ea56343 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -28,5 +28,6 @@ asset.meta = { Description = [[ Neptune Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "NeptuneBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index e40a20b10f..7551185ff5 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -37,5 +37,6 @@ asset.meta = { A blank globe and SPICE trail are generated for the moon.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Triton" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index b3813790f5..9d926f761a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -59,5 +59,6 @@ asset.meta = { Description = [[ Enceladus globe with labels]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Enceladus" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index f04d112733..e199284208 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -27,5 +27,6 @@ asset.meta = { Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Global_Mosaic_100m_HPF" } diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index 617e552949..c6c68e4281 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -38,5 +38,6 @@ asset.meta = { NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "EnceladusTrail" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index f364f00491..b098c534fb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -59,5 +59,6 @@ asset.meta = { Description = [[ Hyperion globe with labels]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Hyperion" } diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index f1154c2b08..c22d487200 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -38,5 +38,6 @@ asset.meta = { Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "HyperionTrail" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 1012dbf64d..23397b42a4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -59,5 +59,6 @@ asset.meta = { Description = [[ Iapetus globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Iapetus" } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index cf739ab662..261b18b13e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -38,5 +38,6 @@ asset.meta = { Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "IapetusTrail" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 5c153c4a01..619a30c1ee 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -59,5 +59,6 @@ asset.meta = { Description = [[ Mimas globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Mimas" } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index fd1e01c3ba..eb4ae92420 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -38,5 +38,6 @@ asset.meta = { Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "MimasTrail" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 8ec8cec191..d3a6ee2fa5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -36,5 +36,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "SaturnTrail" } diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index e6fbf205fa..620c3de4b5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -28,5 +28,6 @@ asset.meta = { Description = [[ Saturn Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "SaturnBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 8cea4396b9..0b4f15524b 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -35,5 +35,6 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "UranusTrail" } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 8f69ad8d9e..dd8de4f44a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -55,5 +55,6 @@ asset.meta = { Description = [[ Uranus globe, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Uranus,UranusLabel" } diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index b669b36381..54b284bf1d 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -67,7 +67,8 @@ asset.meta = { Description = [[ Atmosphere of Venus.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "VenusAtmosphere" } assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index c760f5177c..c1dc4b379e 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -33,7 +33,8 @@ asset.meta = { base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "VenusTrail" } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 4573474634..59d4e533bd 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -17,9 +17,10 @@ local VenusTrailEarth = { }, Color = { 1.0, 0.5, 0.2 }, Period = 224.695, - Resolution = 1000 + Resolution = 1000, + Enabled = false }, - Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, GUI = { Name = "Venus trail from Earth", Path = "/Solar System/Planets/Venus", @@ -34,7 +35,8 @@ asset.meta = { SPICE (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "VenusTrailEarth" } diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 271e6ceffc..86e7c3cd56 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -24,7 +24,8 @@ asset.meta = { Description = [[ Venus Barycenter transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "VenusBarycenter" } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 002338dc03..e415995c9d 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -75,7 +75,8 @@ asset.meta = { Description = [[ Venus globe with labels, and main planet label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Venus,VenusLabel" } assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel }) diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index 6d7fd76840..e1b278106a 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]] + Foreign Copyright Laws."]], + Identifiers = "sssb_sssb_data_amor_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 73c07b4aa7..ac14c06e40 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_apollo_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index 644b4649e9..477ec6fbea 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_aten_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index f6fa21c9b4..065bfe7f61 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws."]] + Foreign Copyright Laws."]], + Identifiers = "sssb_sssb_data_atira_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index ac412978e8..9c0b9679a2 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -53,7 +53,8 @@ asset.meta = { 1950 JAN 01 00:00:00 to 2100 JAN 01 00:00:00. Data from JPL Horizons']], Author = "OpenSpace Team", URL = "https://ssd.jpl.nasa.gov/horizons.cgi", - License = "NASA" + License = "NASA", + Identifiers = "C2019Y4AtlasPosition,C2019Y4AtlasTrail" } assetHelper.registerSceneGraphNodesAndExport(asset, { diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index 7ed5d7ac6b..0555603151 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_centaur_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index b1a4df3533..0136f9f5a6 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_chiron-type_comet" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 519148d812..0f443b8623 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_encke-type_comet" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index e6e4f2f362..3fab4ad0b4 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -20,5 +20,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_halley-type_comet" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index faec8cc44a..1dccad7769 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_inner_main_belt_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index 59a002092d..c3206826f7 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_jupiter-family_comet" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index f823a9392e..1219fa1055 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_jupiter_trojan_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index dcdb19f388..af6766f115 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -22,5 +22,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_main_belt_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index ef86c10482..0cd252fff6 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -21,5 +21,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. and - Foreign Copyright Laws.]] + Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_mars-crossing_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index 13f7c453d2..124859718a 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -27,5 +27,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected under the U.S. - and Foreign Copyright Laws.]] + and Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_outer_main_belt_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index 5371e6d54b..618ddb8368 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -26,5 +26,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]] + under the U.S. and Foreign Copyright Laws.]], + Identifiers = "sssb_sssb_data_pha" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index f9b630ddd0..f4040b048a 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -52,7 +52,8 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + under the U.S. and Foreign Copyright Laws."]], + Identifiers = "SwiftTuttlePosition,SwiftTuttleTrail" } diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index 6d0c54f30f..bdbf593aa5 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -53,7 +53,8 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws.]] + under the U.S. and Foreign Copyright Laws.]], + Identifiers = "TeslaPosition,TeslaRoadsterTrail" } assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadsterTrail }) diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index cc2506e91c..bdab3b6f21 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -29,5 +29,6 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[ JPL-authored documents are sponsored by NASA under Contract NAS7-030010. All documents available from this server may be protected - under the U.S. and Foreign Copyright Laws."]] + under the U.S. and Foreign Copyright Laws."]], + Identifiers = "sssb_sssb_data_transneptunian_object_asteroid" } \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 0bdc1e032d..e2c89ebf45 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -37,7 +37,8 @@ asset.meta = { Description = [[ Sun glare effect. Enabled by default instead of sun orb.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "SunGlare" } diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 3ddac76035..d0d4a463b9 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -29,7 +29,8 @@ asset.meta = { Description = [[ Sun marker with name, sized for Solar System view]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "SunMarker" } diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 4fe7a45e5e..51474bc9cf 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -52,7 +52,8 @@ asset.meta = { Description = [[ The Sun and label]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Sun,SunLabel" } diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 8d56d16633..115e99d3b8 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -71,7 +71,8 @@ asset.meta = { SUN J2000]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "SolarSystemBarycenter,SunIAU,SunECLIPJ2000" } assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 }) diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h index 83749a11ba..9b08c84e40 100644 --- a/include/openspace/scene/asset.h +++ b/include/openspace/scene/asset.h @@ -56,6 +56,7 @@ public: std::string author; std::string url; std::string license; + std::string identifiers; }; /** diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp index 0e659b2fd7..c4fbfc3d29 100644 --- a/modules/server/src/topics/documentationtopic.cpp +++ b/modules/server/src/topics/documentationtopic.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -42,6 +43,7 @@ namespace { constexpr const char* TypeFactories = "factories"; constexpr const char* TypeKeyboard = "keyboard"; constexpr const char* TypeAsset = "asset"; + constexpr const char* TypeMeta= "meta"; } // namespace namespace openspace { @@ -66,6 +68,11 @@ void DocumentationTopic::handleJson(const nlohmann::json& json) { else if (requestedType == TypeAsset) { response = json::parse(global::keybindingManager.generateJson()); } + else if (requestedType == TypeMeta) { + std::string docs = SceneLicenseWriter().generateJson(); + nlohmann::json parsedDocs = json::parse(docs); + response = parsedDocs; + } _connection->sendJson(wrappedPayload(response)); } diff --git a/openspace.cfg b/openspace.cfg index 0a6efa9400..b8a6d1a8e8 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -48,7 +48,7 @@ SGCTConfig = sgct.config.single{} -- Variable: Profile -- Sets the profile that should be loaded by OpenSpace. -Profile = "default" +Profile = "asteroids" -- Other default OpenSpace profiles are: -- apollo_sites, apollo8, asteroids, dawn -- default, default_full, gaia, juno, mars, messenger diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp index edcbc1aa35..1a1dd1f958 100644 --- a/src/scene/assetloader.cpp +++ b/src/scene/assetloader.cpp @@ -63,6 +63,7 @@ namespace { constexpr const char* MetaInformationAuthor = "Author"; constexpr const char* MetaInformationURL = "URL"; constexpr const char* MetaInformationLicense = "License"; + constexpr const char* MetaInformationIdentifiers = "Identifiers"; constexpr const char* ExportsTableName = "_exports"; constexpr const char* AssetTableName = "_asset"; @@ -305,6 +306,7 @@ bool AssetLoader::loadAsset(Asset* asset) { metaDict.getValue(MetaInformationAuthor, meta.author); metaDict.getValue(MetaInformationURL, meta.url); metaDict.getValue(MetaInformationLicense, meta.license); + metaDict.getValue(MetaInformationIdentifiers, meta.identifiers); asset->setMetaInformation(std::move(meta)); } } diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp index 011ed21fcb..38297042ab 100644 --- a/src/scene/scenelicensewriter.cpp +++ b/src/scene/scenelicensewriter.cpp @@ -82,6 +82,7 @@ std::string SceneLicenseWriter::generateJson() const { json << fmt::format(replStr, "url", escapedJson(meta->url)); //json << fmt::format(replStr2, "licenseText", escapedJson(license.licenseText)); json << fmt::format(replStr, "license", escapedJson(meta->license)); + json << fmt::format(replStr, "identifiers", escapedJson(meta->identifiers)); json << fmt::format(replStr2, "path", escapedJson(asset->assetFilePath())); json << "}"; From f617331c33dd498833f22ca973f8fcd5ba29a26b Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 8 Oct 2020 23:39:30 -0400 Subject: [PATCH 07/12] update to solarsystem for description on scene graph node. added earth observing trails for planets --- .../scene/digitaluniverse/milkyway.asset | 2 +- .../digitaluniverse/milkyway_arm_labels.asset | 2 +- .../scene/digitaluniverse/milkyway_data.asset | 4 +- data/assets/scene/digitaluniverse/tully.asset | 2 +- data/assets/scene/digitaluniverse/voids.asset | 22 ++-- .../scene/milkyway/milkyway/volume.asset | 2 +- .../messenger/mercurymagnetosphere.asset | 4 +- .../planets/earth/atmosphere.asset | 5 +- .../solarsystem/planets/earth/earth.asset | 7 +- ...om_w1_sea_ice_concentration_temporal.asset | 16 ++- .../colorlayers/aqua_modis_temporal.asset | 26 ++-- .../layers/colorlayers/bmng_sweden.asset | 6 +- .../earth/layers/colorlayers/bmng_utah.asset | 6 +- .../colorlayers/esri_imagery_world_2D.asset | 21 +-- .../layers/colorlayers/esri_viirs_combo.asset | 4 +- .../colorlayers/esri_world_imagery.asset | 23 ++-- .../colorlayers/fallbacks/blue_marble.asset | 4 +- ...sst_sea_surface_temperature_temporal.asset | 10 +- ...mur_sea_surface_temperature_temporal.asset | 8 +- .../modis_terra_chlorophyll_a_temporal.asset | 8 +- .../colorlayers/terra_modis_temporal.asset | 8 +- .../colorlayers/viirs_snpp_temporal.asset | 8 +- .../fallbacks/blue_marble_height.asset | 4 +- .../layers/heightlayers/terrain_tileset.asset | 14 +- .../nightlayers/earth_at_night_2012.asset | 7 +- .../nightlayers/earth_at_night_temporal.asset | 28 ++-- .../fallbacks/earth_night_texture.asset | 3 +- .../planets/earth/satellites/misc/iss.asset | 29 +++++ .../earth/satellites/weather/aqua.asset | 121 +++++++++++++++++ .../earth/satellites/weather/snpp.asset | 123 ++++++++++++++++++ .../earth/satellites/weather/terra.asset | 122 +++++++++++++++++ .../planets/jupiter/trail_earth.asset | 43 ++++++ .../solarsystem/planets/mars/atmosphere.asset | 5 +- .../mars/layers/colorlayers/HiRISE.asset | 25 ++++ .../layers/colorlayers/ctx_blended_01.asset | 28 ++-- .../layers/colorlayers/mars_texture.asset | 3 +- .../layers/colorlayers/moc_wa_color_liu.asset | 19 ++- .../colorlayers/moc_wa_color_utah.asset | 20 ++- .../layers/colorlayers/mola_hrsc_sweden.asset | 17 ++- .../layers/colorlayers/mola_hrsc_utah.asset | 17 ++- .../mola_pseudo_color_sweden.asset | 33 ++--- .../colorlayers/mola_pseudo_color_utah.asset | 33 ++--- .../colorlayers/themis_ir_day_sweden.asset | 24 ++-- .../colorlayers/themis_ir_day_utah.asset | 24 ++-- .../colorlayers/themis_ir_night_sweden.asset | 26 ++-- .../colorlayers/themis_ir_night_utah.asset | 26 ++-- .../colorlayers/viking_mdim_sweden.asset | 31 ++--- .../layers/colorlayers/viking_mdim_utah.asset | 31 ++--- .../layers/heightlayers/mola_europe.asset | 31 ++--- .../mars/layers/heightlayers/mola_utah.asset | 31 ++--- .../scene/solarsystem/planets/mars/mars.asset | 7 +- .../planets/mars/moons/deimos.asset | 18 ++- .../planets/mars/moons/phobos.asset | 18 ++- .../solarsystem/planets/mars/trail.asset | 7 +- .../planets/mars/trail_earth.asset | 44 +++++++ .../solarsystem/planets/mars/transforms.asset | 5 +- .../solarsystem/planets/mercury/mercury.asset | 2 +- .../solarsystem/planets/mercury/trail.asset | 5 +- .../planets/mercury/trail_earth.asset | 44 +++++++ .../planets/mercury/transforms.asset | 3 +- .../solarsystem/planets/neptune/neptune.asset | 7 +- .../solarsystem/planets/neptune/trail.asset | 6 +- .../planets/neptune/trail_earth.asset | 44 +++++++ .../planets/neptune/transforms.asset | 3 +- .../planets/saturn/dione/trail.asset | 6 +- .../planets/saturn/enceladus/enceladus.asset | 6 +- .../colorlayers/global_mosaic_100m_hpf.asset | 15 ++- .../planets/saturn/enceladus/trail.asset | 6 +- .../planets/saturn/hyperion/hyperion.asset | 1 + .../planets/saturn/iapetus/iapetus.asset | 4 +- .../planets/saturn/iapetus/trail.asset | 6 +- .../planets/saturn/mimas/mimas.asset | 4 +- .../planets/saturn/mimas/trail.asset | 6 +- .../planets/saturn/rhea/rhea.asset | 4 +- .../planets/saturn/rhea/trail.asset | 6 +- .../solarsystem/planets/saturn/saturn.asset | 7 +- .../planets/saturn/tethys/trail.asset | 6 +- .../cassini_iss_global_mosaic_4km_liu.asset | 21 +-- .../planets/saturn/titan/titan.asset | 7 +- .../planets/saturn/titan/trail.asset | 9 +- .../solarsystem/planets/saturn/trail.asset | 6 +- .../planets/saturn/trail_earth.asset | 44 +++++++ .../planets/saturn/transforms.asset | 3 +- .../solarsystem/planets/uranus/trail.asset | 6 +- .../planets/uranus/trail_earth.asset | 44 +++++++ .../planets/uranus/transforms.asset | 3 +- .../solarsystem/planets/uranus/uranus.asset | 7 +- .../planets/venus/atmosphere.asset | 3 +- .../colorlayers/magellan_mosaic_utah.asset | 33 ++--- .../venus/layers/heightlayers/magellan.asset | 25 ++-- .../solarsystem/planets/venus/trail.asset | 3 +- .../planets/venus/trail_earth.asset | 6 +- .../planets/venus/transforms.asset | 6 +- .../solarsystem/planets/venus/venus.asset | 7 +- .../solarsystem/sssb/amor_asteroid.asset | 7 +- .../solarsystem/sssb/apollo_asteroid.asset | 7 +- .../scene/solarsystem/sssb/astraea.asset | 60 +++++++++ .../solarsystem/sssb/aten_asteroid.asset | 8 +- .../solarsystem/sssb/atira_asteroid.asset | 8 +- .../solarsystem/sssb/centaur_asteroid.asset | 8 +- .../solarsystem/sssb/chiron-type_comet.asset | 8 +- .../solarsystem/sssb/encke-type_comet.asset | 8 +- .../solarsystem/sssb/halley-type_comet.asset | 6 +- .../sssb/inner_main_belt_asteroid.asset | 8 +- .../sssb/jupiter-family_comet.asset | 8 +- .../sssb/jupiter_trojan_asteroid.asset | 8 +- .../solarsystem/sssb/main_belt_asteroid.asset | 8 +- .../sssb/mars-crossing_asteroid.asset | 8 +- .../sssb/outer_main_belt_asteroid.asset | 6 +- data/assets/scene/solarsystem/sssb/pha.asset | 12 +- .../solarsystem/sssb/tesla_roadster.asset | 4 +- .../sssb/transneptunian_object_asteroid.asset | 10 +- data/assets/scene/solarsystem/sun/glare.asset | 5 +- .../assets/scene/solarsystem/sun/marker.asset | 5 +- data/assets/scene/solarsystem/sun/sun.asset | 7 +- .../scene/solarsystem/sun/transforms.asset | 3 + include/openspace/scene/scenegraphnode.h | 1 + modules/globebrowsing/src/layer.cpp | 15 +++ modules/globebrowsing/src/layer.h | 1 + openspace.cfg | 2 +- src/scene/scenegraphnode.cpp | 16 +++ src/util/time.cpp | 2 +- 122 files changed, 1468 insertions(+), 420 deletions(-) create mode 100644 data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset create mode 100644 data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset create mode 100644 data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset create mode 100644 data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset create mode 100644 data/assets/scene/solarsystem/planets/mars/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/planets/mercury/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/planets/neptune/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/planets/saturn/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/planets/uranus/trail_earth.asset create mode 100644 data/assets/scene/solarsystem/sssb/astraea.asset diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index b406879508..eaf7ad329b 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -1,6 +1,6 @@ local assetHelper = asset.require('util/asset_helper') -local dataPaths = asset.require("milkyway_data") +local dataPaths = asset.require("scene/digitaluniverse/milkyway_data") local plane = { Identifier = "MilkyWayGalaxyImage", diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index 73071dc2b7..6ef9d9a449 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -1,6 +1,6 @@ local assetHelper = asset.require('util/asset_helper') -local dataPaths = asset.require("milkyway_data") +local dataPaths = asset.require("scene/digitaluniverse/milkyway_data") local plane = { Identifier = "MilkyWayGalaxyArmLabelsImage", diff --git a/data/assets/scene/digitaluniverse/milkyway_data.asset b/data/assets/scene/digitaluniverse/milkyway_data.asset index c24c47f05e..855ebcc48f 100644 --- a/data/assets/scene/digitaluniverse/milkyway_data.asset +++ b/data/assets/scene/digitaluniverse/milkyway_data.asset @@ -12,5 +12,5 @@ local planeSpeck = asset.syncedResource({ Version = 1 }) -asset.export(planeTextures, TexturesPath) -asset.export(planeSpeck, SpeckPath) +asset.export("TexturesPath", planeTextures) +asset.export("SpeckPath", planeSpeck) diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index a834f4c79c..c92b5a00f3 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -32,7 +32,7 @@ local tullyPoints = { ColorOption = { "prox5Mpc" }, ColorRange = { { 1.0, 30.0 } }, LabelFile = speck .. "/tully.label", - DrawLabels = true, + DrawLabels = false, TextColor = { 0.7, 0.7, 0.7 }, TextSize = 19.36, TextMinSize = 8.2, diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index 8d54bf408d..c297ec0fd0 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -26,7 +26,17 @@ local object = { }, GUI = { Name = "Voids", - Path = "/Universe/Galaxies" + 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]] } } @@ -38,16 +48,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Voids", Version = "2.0", - 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]], Author = "Brian Abbott (AMNH)", + Description = [[Digital Universe asset for Cosmic voids.]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", Identifiers = "Voids" diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index 89bee4105e..0bed16b0fa 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -57,7 +57,7 @@ asset.meta = { Name = "Milky Way Volume", Version = "1.0", Description = [[Volumetric rendering of Milky Way galaxy based on simulation from - NEOJ]], + NAOJ.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License", diff --git a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset index 35dfbe7110..3098de18a3 100644 --- a/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset +++ b/data/assets/scene/solarsystem/missions/messenger/mercurymagnetosphere.asset @@ -1,6 +1,6 @@ -- mercurymagnetosphere.asset - local assetHelper = asset.require('util/asset_helper') +local mercuryTransforms = asset.require('scene/solarsystem/planets/mercury/transforms') local localFolder = asset.syncedResource({ Name = "Mercury Magnetosphere", @@ -15,7 +15,7 @@ local MercuryRadius = 2.4397E6 local Magnetosphere = { Name = "Mercury Magnetosphere", Identifier = "MercuryMagnetosphere", - Parent = "MercuryBarycenter", + Parent = mercuryTransforms.MercuryBarycenter.Identifier, SceneRadius = 0.8E+5, Renderable = { Type = "RenderableTimeVaryingVolume", diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index a97a6b0eb1..d71cd4e645 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -96,7 +96,8 @@ local Atmosphere = { }, GUI = { Name = "Earth Atmosphere", - Path = "/Solar System/Planets/Earth" + Path = "/Solar System/Planets/Earth", + Description = [[ Atmosphere of Earth.]] } } @@ -108,7 +109,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Earth Atmosphere", Version = "1.0", - Description = [[ Atmosphere of Earth.]], + Description = [[ RenderableAtmosphere for Earth.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index ec77388af5..eedc15659b 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -46,7 +46,9 @@ local Earth = { }, Tag = { "planet_solarSystem", "planet_terrestrial" }, GUI = { - Path = "/Solar System/Planets/Earth" + Name = "Earth", + Path = "/Solar System/Planets/Earth", + Description = "Earth Globe" } } @@ -74,7 +76,8 @@ local EarthLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Earth Label", - Path = "/Solar System/Planets/Earth" + Path = "/Solar System/Planets/Earth", + Description = "Main label for Earth" } } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index a4ee521df8..b739801e57 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -11,7 +11,13 @@ local layer = { "1d", "2km", "png" - ) + ), + Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave + Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) + unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice + concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. + ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution + of 12 km. (Description from NASA Worldview)]] } asset.onInitialize(function () @@ -23,12 +29,8 @@ asset.export("layer", layer) asset.meta = { Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 02 July 2012 - Present. The Advanced Microwave - Scanning Radiometer-E/Advanced Microwave Scanning Radiometer-2 (AMSR-E/AMSR2) - unified "Sea Ice Concentration (12 km)" layer displays the percent of sea ice - concentration in the polar regions as a daily composite of the AMSR2 1:30 a.m. - ascending and 1:30 p.m. descending half-orbit passes, at a spatial resolution - of 12 km. (Description from NASA Worldview)]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index a5d64afe55..79c5d249e9 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -11,7 +11,18 @@ local layer = { "1d", "250m", "jpg" - ) + ), + Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, + Green = Band 4, Blue = Band 3. These images are called true-color or natural color + because this combination of wavelengths is similar to what the human eye would see. + The images are natural-looking images of land surface, oceanic and atmospheric + features. The downside of this set of bands is that they tend to produce a hazy image. + The MODIS Corrected Reflectance imagery is available only as near real-time imagery. + The imagery can be visualized in Worldview and the Global Imagery Browse Services + (GIBS). The sensor resolution is 500 m and 250 m (Bands 1 and 2 have a sensor + resolution of 250 m, Bands 3 - 7 have a sensor resolution of 500m, and Bands 8 - 36 + are 1 km. Band 1 is used to sharpen Band 3, 4, 6, and 7), imagery resolution is 250 m, + and the temporal resolution is daily. (Description from NASA Worldview)]] } asset.onInitialize(function () @@ -23,17 +34,8 @@ asset.export("layer", layer) asset.meta = { Name = "Aqua Modis (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 03 July 2002 - Present. True Color: Red = Band 1, - Green = Band 4, Blue = Band 3. These images are called true-color or natural color - because this combination of wavelengths is similar to what the human eye would see. - The images are natural-looking images of land surface, oceanic and atmospheric - features. The downside of this set of bands is that they tend to produce a hazy image. - The MODIS Corrected Reflectance imagery is available only as near real-time imagery. - The imagery can be visualized in Worldview and the Global Imagery Browse Services - (GIBS). The sensor resolution is 500 m and 250 m (Bands 1 and 2 have a sensor - resolution of 250 m, Bands 3 - 7 have a sensor resolution of 500m, and Bands 8 - 36 - are 1 km. Band 1 is used to sharpen Band 3, 4, 6, and 7), imagery resolution is 250 m, - and the temporal resolution is daily. (Description from NASA Worldview)]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index f4a52e2bb4..f35807a566 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -4,7 +4,9 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "BMNG_Sweden", Name = "BMNG [Sweden]", - FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms" + FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Sweden]], } asset.onInitialize(function () @@ -17,7 +19,7 @@ asset.meta = { Name = "Blue Marble Next Generation (Sweden)", Version = "1.0", Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - Hosted at LiU for Europe access]], + This map is hosted on the OpenSpace servers in Sweden]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index 23641cf097..87360ed059 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -4,7 +4,9 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "BMNG_Utah", Name = "BMNG [Utah]", - FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms" + FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms", + Description = [[ Web loaded full resolution map of Blue Marble Next Generation. + This map is hosted on the OpenSpace servers in Utah]], } asset.onInitialize(function () @@ -17,7 +19,7 @@ asset.meta = { Name = "Blue Marble Next Generation (Utah)", Version = "1.0", Description = [[ Web loaded full resolution map of Blue Marble Next Generation. - Hosted at UU for US access]], + This map is hosted on the OpenSpace servers in Utah]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index a876ea33e7..3768f310b3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -4,7 +4,16 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "ESRI_Imagery_World_2D", Name = "ESRI Imagery World 2D", - FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms" + FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms", + Description = [[This map presents low-resolution imagery for the world and + high-resolution imagery for the United States and other metropolitan areas around + the world. The map includes NASA Blue Marble: Next Generation 500m resolution + imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at + medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat + imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for + the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, + parts of Alaska, and several hundred metropolitan areas around the world. + (Description from URL)]], } asset.onInitialize(function () @@ -16,15 +25,7 @@ asset.export("layer", layer) asset.meta = { Name = "ESRI Imagery World 2D", Version = "1.0", - Description = [[This map presents low-resolution imagery for the world and - high-resolution imagery for the United States and other metropolitan areas around - the world. The map includes NASA Blue Marble: Next Generation 500m resolution - imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at - medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat - imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for - the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, - parts of Alaska, and several hundred metropolitan areas around the world. - (Description from URL)]], + Description = [[Older 2D imager map layer for Earth. This layer is hosted by ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", License = "Esri Master License Agreement", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index 3c95c41bf3..db522d791f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -36,7 +36,9 @@ local layer = { }, }, PadTiles = false, - Fallback = fallBackLayer + Fallback = fallBackLayer, + Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World + Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]] } asset.onInitialize(function () diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index e83112aeba..24377003f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -4,7 +4,17 @@ local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "ESRI_World_Imagery", Name = "ESRI World Imagery", - FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms" + FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", + Description = [[World Imagery provides one meter or better satellite and aerial + imagery in many parts of the world and lower resolution satellite imagery + worldwide. The map includes 15m TerraColor imagery at small and mid-scales + (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world. + The map features 0.5m resolution imagery in the continental United States and + parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is + featured in many parts of the world. In other parts of the world, imagery at + different resolutions has been contributed by the GIS User Community. In select + communities, very high resolution imagery (down to 0.03m) is available down to + ~1:280 scale. (Description from URL)]] } asset.onInitialize(function () @@ -17,16 +27,7 @@ asset.export("layer", layer) asset.meta = { Name = "ESRI World Imagery", Version = "1.0", - Description = [[World Imagery provides one meter or better satellite and aerial - imagery in many parts of the world and lower resolution satellite imagery - worldwide. The map includes 15m TerraColor imagery at small and mid-scales - (~1:591M down to ~1:72k) and 2.5m SPOT Imagery (~1:288k to ~1:72k) for the world. - The map features 0.5m resolution imagery in the continental United States and - parts of Western Europe from Maxar. Additional Maxar sub-meter imagery is - featured in many parts of the world. In other parts of the world, imagery at - different resolutions has been contributed by the GIS User Community. In select - communities, very high resolution imagery (down to 0.03m) is available down to - ~1:280 scale. (Description from URL)]], + Description = [[Main web loaded map layer for Earth. This layer is hosted by ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", License = "Esri Master License Agreement", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 3f9883dc88..cbee4ce00a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -5,6 +5,7 @@ local layer = { Identifier = "Blue_Marble", Name = "Blue Marble", FilePath = texturesPath .. "/earth_bluemarble.jpg", + Description = [[ Earth image from Blue Marble Next Generation ]], } asset.export("layer", layer) @@ -12,7 +13,8 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble", Version = "1.0", - Description = [[ Earth image from Blue Marble Next Generation ]], + Description = [[ Fallback layer for earth image if no internet is available. Contains + Blue Marble Next Generation ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index f4098f6997..e23407d97c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -11,7 +11,11 @@ local layer = { "1d", "1km", "png" - ) + ), + Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery + resolution is 1 km, and the temporal resolution is daily.]], + Author = "NASA EOSDIS Global Imagery Browse Services" + } asset.onInitialize(function () @@ -24,8 +28,8 @@ asset.export("layer", layer) asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 21 June 2010 - 08 December 2019. The imagery - resolution is 1 km, and the temporal resolution is daily.]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index b3ec4a2717..9f229fee6c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -11,7 +11,9 @@ local layer = { "1d", "1km", "jpg" - ) + ), + Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () @@ -24,8 +26,8 @@ asset.export("layer", layer) asset.meta = { Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 01 June 2002 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index ddbeed3d79..3bde5037d6 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -11,7 +11,9 @@ local layer = { "1d", "1km", "png" - ) + ), + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () @@ -24,8 +26,8 @@ asset.export("layer", layer) asset.meta = { Name = "MODIS Terra Chlorophyll A (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index 7d063429fd..aa01c7d0d0 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -11,7 +11,9 @@ local layer = { "1d", "250m", "jpg" - ) + ), + Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution + is 1 km, and the temporal resolution is daily.]] } asset.onInitialize(function () @@ -23,8 +25,8 @@ asset.export("layer", layer) asset.meta = { Name = "Terra Modis (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 02 July 2013 - Present. The imagery resolution - is 1 km, and the temporal resolution is daily.]], + Description = [[ GIBS hosted layer created with + openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/".. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index e018b623ab..63c07cb92c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -11,7 +11,9 @@ local layer = { "1d", "250m", "jpg" - ) + ), + Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution + is 0.25 km, and the temporal resolution is daily.]] } asset.onInitialize(function () @@ -23,8 +25,8 @@ asset.export("layer", layer) asset.meta = { Name = "VIIRS SNPP (Temporal)", Version = "1.0", - Description = [[ Temporal coverage: 11 November 2015 - Present. The imagery resolution - is 0.25 km, and the temporal resolution is daily.]], + Description = [[ This layer has the best daily Earth Image. GIBS hosted layer created + with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "NASA EOSDIS Global Imagery Browse Services", URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" .. "eosdis-components/gibs", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 6688073de3..5d9d5d6af4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -4,12 +4,14 @@ local layer = { Name = "Earth Bluemarble Height", Identifier = "Earth_Bluemarble_Height", FilePath = texturesPath .. "/earth_bluemarble_height.jpg", + Description = [[ Topographic layer from Blue Marble Next Generation]] } asset.meta = { Name = "Earth Bluemarble Height", Version = "1.0", - Description = [[ Topographic layer from Blue Marble Next Generation]], + Description = [[ Fallback layer for earth height if no internet is available. Contains + Blue Marble Next Generation Topographic]], Author = "NASA", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index 2e6a61c4d8..5f1594b2ab 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -8,7 +8,12 @@ local layer = { Name = "Terrain tileset", FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms", TilePixelSize = 64, - Fallback = fallBackLayer + Fallback = fallBackLayer, + Description = [[This globe layer presents elevation data at approximately 90m or 1km + per pixel resolution for the world. The elevation data includes 90m Shuttle Radar + Topography Mission (SRTM) elevation data from NASA and National + Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 + data from the USGS elsewhere. Vertical units are measured in meters.]], } asset.onInitialize(function () @@ -18,11 +23,8 @@ end) asset.meta = { Name = "World Elevation (3D)", Version = "1.0", - Description = [[This globe layer presents elevation data at approximately 90m or 1km - per pixel resolution for the world. The elevation data includes 90m Shuttle Radar - Topography Mission (SRTM) elevation data from NASA and National - Geospatial-Intelligence Agency (NGA) where it is available and 1km GTOPO30 - data from the USGS elsewhere. Vertical units are measured in meters.]], + Description = [[Main web loaded height layer for Earth. This layer is hosted by + ESRI.]], Author = "ESRI", URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89", License = "Esri Master License Agreement", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 1747d6527e..10fd9d4570 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -7,7 +7,9 @@ local layer = { Identifier = "Earth_at_Night_2012", Name = "Earth at Night 2012", FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", - Fallback = fallBackLayer + Fallback = fallBackLayer, + Description = [[ The lights of cities and villages trace the outlines of civilization + in this global view. ]], } asset.onInitialize(function () @@ -19,8 +21,7 @@ asset.export("layer", layer) asset.meta = { Name = "Earth at Night 2012", Version = "1.0", - Description = [[ The lights of cities and villages trace the outlines of civilization - in this global view. ]], + Description = [[Main web loaded night layer for Earth. This layer is hosted by GIBS.]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index 0fe56e419f..0296762356 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -11,19 +11,7 @@ local layer = { "1d", "500m", "png" - ) -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "Earth at Night 2012", - Version = "1.0", + ), Description = [[ The VIIRS Nighttime Imagery (Day/Night Band, Enhanced Near Constant Contrast) layer shows the Earth's surface and atmosphere using a sensor designed to capture low-light emission sources, under varying illumination conditions. It @@ -42,6 +30,20 @@ asset.meta = { NASA/NOAA Suomi National Polar orbiting Partnership (Suomi NPP) satellite. The sensor resolution is 750 m at nadir, imagery resolution is 500 m, and the temporal resolution is daily.]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Earth at Night 2012", + Version = "1.0", + Description = [[May layer for earth with daily night image. This layer is a GIBS + hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index a894adc2f2..1336317600 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -4,6 +4,7 @@ local layer = { Identifier = "Earth_Night_Texture", Name = "Earth Night Texture", FilePath = texturesPath .. "/earth_night.jpg", + Description = [[ Earth's city lights are clearly visible from space ]] } asset.export("layer", layer) @@ -11,7 +12,7 @@ asset.export("layer", layer) asset.meta = { Name = "Blue Marble Night", Version = "1.0", - Description = [[ Earth's city lights are clearly visible from space ]], + Description = [[ Fallback layer for earth night image if no internet is available. ]], Author = "OpenSpace Team", URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index 077a98e020..7941a368ac 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -250,6 +250,35 @@ local initializeAndAddNodes = function() } } + local IssLabel = { + Identifier = "IssLabel", + Parent = iss.Identifier, + + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "ISS", + FontSize = 100.0, + LabelSize = 3.4, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "ISS Label", + Path = "/Solar System/Planets/Earth/Satellites" + } +} + table.insert(nodes, issTrail) return { iss, parentNode, issTrail } end diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset new file mode 100644 index 0000000000..9d2587e1fd --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset @@ -0,0 +1,121 @@ +local assetHelper = asset.require('util/asset_helper') +local satelliteHelper = asset.require('util/tle_helper') +local transforms = asset.require('scene/solarsystem/planets/earth/transforms') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') + +local url = "https://celestrak.com/satcat/tle.php?CATNR=27424" +local identifier = "Aqua" +local filename = "Aqua.txt" +local nodes = {} +local tle = satelliteHelper.downloadTLEFile(asset, url, identifier, filename) + + +asset.onInitialize(function () + + local lineElement = satelliteHelper.makeSingleLineElement(tle, filename) + local period = satelliteHelper.getPeriodFromElement(lineElement) + local path = tle .. "/" .. filename + + local Aqua = { + Identifier = "Aqua", + Parent = transforms.EarthInertial.Identifier, + BoundingSphere = 30, + Transform = { + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1 + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", + } + }, + Tag = { "earth_satellite", "Aqua" }, + GUI = { + Path = "/Solar System/Planets/Earth/Satellites/Aqua" + } + } + + local AquaTrail = { + Identifier = identifier .. "_trail", + Parent = transforms.EarthInertial.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" + }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, + Tag = { "earth_satellite", "Aqua" }, + GUI = { + Name = "Terra Trail", + Path = "/Solar System/Planets/Earth/Satellites/Aqua" + } + } + + local AquaLabel = { + Identifier = "AquaLabel", + Parent = Aqua.Identifier, + + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Aqua Label", + Path = "/Solar System/Planets/Earth" + } + } + + table.insert(nodes, Aqua) + table.insert(nodes, AquaTrail) + table.insert(nodes, AquaLabel) + for _, node in ipairs(nodes) do + openspace.addSceneGraphNode(node) + end + +end) + +asset.onDeinitialize(function () + for _, node in ipairs(nodes) do + openspace.removeSceneGraphNode(node) + end +end) + + +asset.meta = { + Name = "Aqua", + Version = "1.0", + Description = [[ Trail for Aqua. trail from + CELESTRAK. Can be used in conjuntion with Aqua Modis (Temporal) layer for Earth]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset new file mode 100644 index 0000000000..ff812053a1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset @@ -0,0 +1,123 @@ +local assetHelper = asset.require('util/asset_helper') +local satelliteHelper = asset.require('util/tle_helper') +local transforms = asset.require('scene/solarsystem/planets/earth/transforms') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') + +local url = "https://celestrak.com/satcat/tle.php?CATNR=37849" +local identifier = "SNPP" +local filename = "SNPP.txt" +local nodes = {} +local tle = satelliteHelper.downloadTLEFile(asset, url, identifier, filename) + + +asset.onInitialize(function () + + local lineElement = satelliteHelper.makeSingleLineElement(tle, filename) + local period = satelliteHelper.getPeriodFromElement(lineElement) + local path = tle .. "/" .. filename + + local SNPP = { + Identifier = "SNPP", + Parent = transforms.EarthInertial.Identifier, + BoundingSphere = 30, + Transform = { + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1 + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", + } + }, + Tag = { "earth_satellite", "SNPP" }, + GUI = { + Path = "/Solar System/Planets/Earth/Satellites/SNPP" + } + } + + + local SNPPTrail = { + Identifier = identifier .. "_trail", + Parent = transforms.EarthInertial.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" + }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, + Tag = { "earth_satellite", "SNPP" }, + GUI = { + Name = "SNPP Trail", + Path = "/Solar System/Planets/Earth/Satellites/SNPP" + } + } + + local SNPPLabel = { + Identifier = "SNPPLabel", + Parent = SNPP.Identifier, + + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "SNPP Label", + Path = "/Solar System/Planets/Earth" + } + } + + table.insert(nodes, SNPP) + table.insert(nodes, SNPPTrail) + table.insert(nodes, SNPPLabel) + for _, node in ipairs(nodes) do + openspace.addSceneGraphNode(node) + end + +end) + + +asset.onDeinitialize(function () + for _, node in ipairs(nodes) do + openspace.removeSceneGraphNode(node) + end +end) + + +asset.meta = { + Name = "SNPP", + Version = "1.0", + Description = [[ Trail for SNPP. trail from + CELESTRAK. Can be used in conjunction with VIIRS SNPP (Temporal) layer for Earth.]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset new file mode 100644 index 0000000000..295ef36fb1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset @@ -0,0 +1,122 @@ +local assetHelper = asset.require('util/asset_helper') +local satelliteHelper = asset.require('util/tle_helper') +local transforms = asset.require('scene/solarsystem/planets/earth/transforms') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') + +local url = "https://celestrak.com/satcat/tle.php?CATNR=25994" +local identifier = "Terra" +local filename = "Terra.txt" +local nodes = {} +local tle = satelliteHelper.downloadTLEFile(asset, url, identifier, filename) + + +asset.onInitialize(function () + + local lineElement = satelliteHelper.makeSingleLineElement(tle, filename) + local period = satelliteHelper.getPeriodFromElement(lineElement) + local path = tle .. "/" .. filename + + local Terra = { + Identifier = "Terra", + Parent = transforms.EarthInertial.Identifier, + BoundingSphere = 30, + Transform = { + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1 + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "GALACTIC", + DestinationFrame = "J2000", + } + }, + Tag = { "earth_satellite", "Terra" }, + GUI = { + Path = "/Solar System/Planets/Earth/Satellites/Terra" + } + } + + + local TerraTrail = { + Identifier = identifier .. "_trail", + Parent = transforms.EarthInertial.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "TLETranslation", + Body = identifier, + Observer = transforms.EarthInertial.Identifier, + File = path, + LineNumber = 1, + RenderBinMode = "PostDeferredTransparent" + }, + Color = { 0.9, 0.6715, 0.0 }, + Fade = 1.5, + Period = period, + Resolution = 320 + }, + Tag = { "earth_satellite", "Terra" }, + GUI = { + Name = "Terra Trail", + Path = "/Solar System/Planets/Earth/Satellites/Terra" + } + } + + local TerraLabel = { + Identifier = "TerraLabel", + Parent = Terra.Identifier, + + Renderable = { + Enabled = false, + Type = "RenderableLabels", + LabelText = "SNPP", + FontSize = 100.0, + LabelSize = 4.0, + LabelMaxSize = 100.0, + LabelMinSize = 1.0, + LabelOrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeStartUnit = "au", + FadeStartDistance = 0.15, + FadeStartSpeed = 1.0, + FadeEndUnit = "au", + FadeEndDistance = 15.0, + FadeEndSpeed = 25.0 + }, + Tag = { "solarsystem_labels" }, + GUI = { + Name = "Terra Label", + Path = "/Solar System/Planets/Earth" + } + } + + table.insert(nodes, Terra) + table.insert(nodes, TerraTrail) + table.insert(nodes, TerraLabel) + for _, node in ipairs(nodes) do + openspace.addSceneGraphNode(node) + end + +end) + + +asset.onDeinitialize(function () + for _, node in ipairs(nodes) do + openspace.removeSceneGraphNode(node) + end +end) + +asset.meta = { + Name = "Terra", + Version = "1.0", + Description = [[ Trail for Terra. trail from + CELESTRAK. Can be used in conjuntion with Terra Modis (Temporal) layer for Earth]], + Author = "OpenSpace Team", + URL = "https://celestrak.com/", + License = "NASA" +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset new file mode 100644 index 0000000000..8866f662fa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -0,0 +1,43 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local JupiterTrailEarth = { + Identifier = "JupiterTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "JUPITER BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Jupiter trail from Earth", + Path = "/Solar System/Planets/Jupiter", + Hidden = false + } +} + +asset.meta = { + Name = "Jupiter Trail from Earth", + Version = "1.0", + Description = [[ Trail of Jupiter as observed by the Earth. Data from NASA + SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "VenusTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 11e0d6e756..47bcb07173 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -59,7 +59,8 @@ local Atmosphere = { }, GUI = { Name = "Mars Atmosphere", - Path = "/Solar System/Planets/Mars" + Path = "/Solar System/Planets/Mars", + Description = [[ Atmosphere of Mars.]] } } @@ -71,7 +72,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) asset.meta = { Name = "Mars Atmosphere", Version = "1.0", - Description = [[ Atmosphere of Mars.]], + Description = [[ RenderableAtmosphere for Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset new file mode 100644 index 0000000000..585f56e3a6 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset @@ -0,0 +1,25 @@ +--todo add hirise through asset file like we do for ctx_blended. +--curretly added via globebrowsing customization + +asset.meta = { + Name = "HiRISE Local Set", + Version = "1.0", + Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most + powerful camera ever sent to another planet, one of six instruments onboard the + Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have + been imaging ever since. Our camera’s high resolution capability (imaging up to 30 + centimeters per pixel) remains unprecedented for any existing orbiter in the study + of the Red Planet, as well as being an indispensable instrument for helping to + select landing sites for robotic and future human exploration. In the past decade, + we’ve also imaged avalanches in progress, and discovered dark flows that may or + may not be briny seeps. Hundreds of science papers have been published with our + data. (Description from URL). This map contains a subet set of the HiRISE + imagaery, only containing locations where a corresponding HiRISE digital terrain + model (DTM) was available as of 2018.]], + Author = "USGS", + URL = "https://www.uahirise.org", + License = "Esri Master License Agreement", + Identifiers = "OnMarsHiRISELS" +} + + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index 950d4a2bd2..72cac29ff0 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -9,18 +9,7 @@ local layer = { Settings = { Gamma = 2.14, Multiplier = 1.54 - } -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - -asset.meta = { - Name = "CTX Blended beta01", - Version = "1.0", + }, Description = [[This product contains CTX data through MRO release 45, CTX mission phase J21 (December 1, 2017). The mosaic is comprised of 74,196 separate CTX images out of 95,106 available (78.0%). Orbits not included were either (1) low @@ -35,7 +24,20 @@ asset.meta = { pixel-for-pixel spatial documentation of image seams, to prevent misinterpretation of seams as possible landforms and to provide instant access to original data. A completely seamless CTX mosaic is currently infeasible, so seam-maps are required - to prevent misinterpretation. (Description from URL) This map is hosted by ESRI]], + to prevent misinterpretation. (Description from URL)]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + +asset.meta = { + Name = "CTX Blended beta01", + Version = "1.0", + Description = [[New blended CTX map for Mars from CalTech Murray lab. This map is + hosted by ESRI.]], Author = "Caltech Murray Lab", URL = "http://murray-lab.caltech.edu/CTX/", License = "Esri Master License Agreement", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index e814b6cd36..fdba12b9bb 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -5,6 +5,7 @@ local layer = { Identifier = "Mars_Texture", Name = "Mars Texture", FilePath = texturesPath .. "/mars.jpg", + Description = [[ Default jpg texture for Mars]] } asset.onInitialize(function () @@ -17,7 +18,7 @@ asset.export("layer", layer) asset.meta = { Name = "Mars Texutre", Version = "1.0", - Description = [[ Default jpg texture for Mars]], + Description = [[ Jpg texture for Mars, available for offline use.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset index f45d9afdd0..a918b7c0c8 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -11,7 +11,11 @@ local layer = { Gamma = 1.6, Multiplier = 1.07 }, - Fallback = fallbackLayer + Fallback = fallbackLayer, + Description = [[This map is an AMNH version of the global mossaic produced by the + Mars Global Surveyor Wide Angle Camera. This version has color added and the + shadows subdued based on the MOLA DTM. Data Reference: + https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467.]], } asset.onInitialize(function () @@ -19,3 +23,16 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "MOC WA Color [Sweden]", + Version = "1.0", + Description = [[Main color map layer for Mars. This map is hosted + on the OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = "MOLA_HRSC_Sweden" +} + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset index 8763d19f74..7978ba949b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -11,7 +11,11 @@ local layer = { Gamma = 1.6, Multiplier = 1.07 }, - Fallback = fallbackLayer + Fallback = fallbackLayer, + Description = [[This map is an AMNH version of the global mossaic produced by the + Mars Global Surveyor Wide Angle Camera. This version has color added and the + shadows subdued based on the MOLA DTM. Data Reference: + https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA03467]], } asset.onInitialize(function () @@ -19,3 +23,17 @@ asset.onInitialize(function () end) asset.export("layer", layer) + + +asset.meta = { + Name = "MOC WA Color [Utah]", + Version = "1.0", + Description = [[Main color map layer for Mars. This map is hosted + on the OpenSpace server in Utah.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = "MOC_WA_Color_Utah" +} + + diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset index 2737ce9ecf..070cf6bc61 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -4,7 +4,11 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_HRSC_Sweden", Name = "MOLA HRSC [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms" + FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms", + Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Compared to MOLA Psuedo Color, this layer has no terrain shading, which is + suitable for use when combing with other layers. Data Reference: + https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } asset.onInitialize(function () @@ -12,3 +16,14 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "MOLA HRSC [Sweden]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars. This map is hosted on the + OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = "MOLA_HRSC_Sweden" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset index 66bae74e0c..eaffac2691 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -4,7 +4,11 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_HRSC_Utah", Name = "MOLA HRSC [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms" + FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms", + Description = [[ This map layer is colorzied based elevation data from MOLA and HRSC. + Compared to MOLA Psuedo Color, this layer has no terrain shading, which is + suitable for use when combing with other layers. Data Reference: + https://astrogeology.usgs.gov/search/map/Mars/Topography/HRSC_MOLA_Blend/Mars_HRSC_MOLA_BlendDEM_Global_200mp_v2]], } asset.onInitialize(function () @@ -12,3 +16,14 @@ asset.onInitialize(function () end) asset.export("layer", layer) + +asset.meta = { + Name = "MOLA HRSC [Utah]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars. This map is hosted on the + OpenSpace server in Sweden.]], + Author = "OpenSpace Team", + URL = "http://www.openspaceproject.com", + License = "NASA/PDS", + Identifiers = "MOLA_HRSC_Sweden" +} \ No newline at end of file diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index d4e7e10d63..b0c4e876ba 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -4,19 +4,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_Pseudo_Color_Sweden", Name = "MOLA Pseudo Color [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms" -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "MOLA Pseudo Color [Sweden]", - Version = "1.0", + FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms", Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) spacecraft (Albee, et al., 2001). The image used for the base of this map @@ -30,11 +18,24 @@ asset.meta = { Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map - is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL). - This map is hosted on the OpenSpace server in Sweden.]], + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL).]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "MOLA Pseudo Color [Sweden]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", + "Mars_MGS_MOLA_ClrShade_merge_global_463m", License = "NASA/PDS", Identifiers = "MOLA_Pseudo_Color_Sweden" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index 0788d9ebe9..4c4099949f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -4,19 +4,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_Pseudo_Color_Utah", Name = "MOLA Pseudo Color [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms" -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "MOLA Pseudo Color [Utah]", - Version = "1.0", + FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms", Description = [[This map is based on data from the Mars Orbiter Laser Altimeter (MOLA) (Smith, et al., 2001), an instrument on NASA’s Mars Global Surveyor (MGS) spacecraft (Albee, et al., 2001). The image used for the base of this map @@ -30,11 +18,24 @@ asset.meta = { Neumann, et al., 2003). However, the total elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Lemoine, et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution of this map - is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL). - This map is hosted on the OpenSpace server in Utah.]], + is 463 meters per pixel (m). (Description from URL). Data Reference: (See URL)]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "MOLA Pseudo Color [Utah]", + Version = "1.0", + Description = [[ Colorzied elevation data for Mars (with shading). This map is hosted + on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. - "Mars_MO_THEMIS-IR-Mars_MGS_MOLA_ClrShade_merge_global_463m", + "Mars_MGS_MOLA_ClrShade_merge_global_463m", License = "NASA/PDS", Identifiers = "MOLA_Pseudo_Color_Utah" } diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset index 19dda38382..5a8b2847e7 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -5,7 +5,17 @@ local layer = { Identifier = "Themis_IR_Day_Sweden", Name = "Themis IR Day [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Day.wms", - BlendMode = "Color" + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL).]], } asset.onInitialize(function () @@ -18,16 +28,8 @@ asset.export("layer", layer) asset.meta = { Name = "Themis IR Day [Sweden]", Version = "1.0", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer - of 2014 by Arizona State University. Values represent only a visual representation - of day-time temperatures. The original values have been stretched and blended to - make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, - P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of - global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, - E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL). This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server + in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset index 4add3e6a38..0226af185d 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -5,7 +5,17 @@ local layer = { Identifier = "Themis_IR_Day_Utah", Name = "Themis IR Day [Utah]", FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms", - BlendMode = "Color" + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer + of 2014 by Arizona State University. Values represent only a visual representation + of day-time temperatures. The original values have been stretched and blended to + make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, + P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of + global planetary image datasets: 1. Techniques and data processing for Thermal + Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, + E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 + (Description from URL).]], } asset.onInitialize(function () @@ -18,16 +28,8 @@ asset.export("layer", layer) asset.meta = { Name = "Themis IR Day [Utah]", Version = "1.0", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -daytime infrared (IR) 100 meter/pixel mosaic (version 12) released in the summer - of 2014 by Arizona State University. Values represent only a visual representation - of day-time temperatures. The original values have been stretched and blended to - make a more seamless mosaic.

Reference: * Edwards, C. S., K. J. Nowicki, - P. R. Christensen, J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of - global planetary image datasets: 1. Techniques and data processing for Thermal - Emission Imaging System (THEMIS) multi‐spectral data, J. Geophys. Res., 116, - E10008, doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 - (Description from URL). This map is hosted on the OpenSpace server in Utah.]], + Description = [[Themis Day layer for Mars. This map is hosted on the OpenSpace server + in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset index 7361f4c6b6..fab55ffd4a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -5,7 +5,18 @@ local layer = { Identifier = "Themis_IR_Night_Sweden", Name = "Themis IR Night [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Night.wms", - BlendMode = "Color" + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL).]], } asset.onInitialize(function () @@ -18,17 +29,8 @@ asset.export("layer", layer) asset.meta = { Name = "Themis IR Night [Sweden]", Version = "1.0", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the - summer of 2014 by Arizona State University. Values represent only a visual - representation of night-time temperatures. The original values have been stretched - and blended to make a more seamless mosaic. Coverage is only from 60N to 60S - latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, - J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image - datasets: 1. Techniques and data processing for Thermal Emission Imaging System - (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, - doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL). This map is hosted on the OpenSpace server in Sweden.]], + Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace + server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset index c828a27e0f..fdb5cc593e 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -5,7 +5,18 @@ local layer = { Identifier = "Themis_IR_Night_Utah", Name = "Themis IR Night [Utah]", FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms", - BlendMode = "Color" + BlendMode = "Color", + Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) + -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the + summer of 2014 by Arizona State University. Values represent only a visual + representation of night-time temperatures. The original values have been stretched + and blended to make a more seamless mosaic. Coverage is only from 60N to 60S + latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, + J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image + datasets: 1. Techniques and data processing for Thermal Emission Imaging System + (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, + doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from + URL).]], } asset.onInitialize(function () @@ -18,17 +29,8 @@ asset.export("layer", layer) asset.meta = { Name = "Themis IR Night [Utah]", Version = "1.0", - Description = [[This mosaic represents the Thermal Emission Imaging System (THEMIS) - -nighttime infrared (IR) 100 meter/pixel mosaic (version 12) released in the - summer of 2014 by Arizona State University. Values represent only a visual - representation of night-time temperatures. The original values have been stretched - and blended to make a more seamless mosaic. Coverage is only from 60N to 60S - latitude.

Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen, - J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image - datasets: 1. Techniques and data processing for Thermal Emission Imaging System - (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008, - doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from - URL). This map is hosted on the OpenSpace server in Utah.]], + Description = [[Themis Night layer for Mars. This map is hosted on the OpenSpace + server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" .. "Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index e93338f2f1..aa8e5ae021 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -4,19 +4,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Viking_MDIM_Sweden", Name = "Viking MDIM [Sweden]", - FilePath = mapServiceConfigs .. "/LiU/MDIM.wms" -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "Viking MDIM [Sweden]", - Version = "1.0", + FilePath = mapServiceConfigs .. "/LiU/MDIM.wms", Description = [[This global image map of Mars has a resolution of 256 pixels/degree (scale approximately 232 meters per pixel (m) at the equator). The colorized mosaic was completed by NASA AMES which warped the original Viking colorized @@ -35,8 +23,21 @@ asset.meta = { as an accurate basemap on which data from future missions can be plotted. (Description from URL).

References: Williams, D. R. (2018). Viking Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 This map is - hosted on the OpenSpace server in Sweden.]], + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Viking MDIM [Sweden]", + Version = "1.0", + Description = [[ Alternate image layer for Mars. This map is hosted + on the OpenSpace server in Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset index 47ca495d1d..550069100e 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -4,19 +4,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Viking_MDIM_Utah", Name = "Viking MDIM [Utah]", - FilePath = mapServiceConfigs .. "/Utah/Mdim.wms" -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "Viking MDIM [Utah]", - Version = "1.0", + FilePath = mapServiceConfigs .. "/Utah/Mdim.wms", Description = [[This global image map of Mars has a resolution of 256 pixels/degree (scale approximately 232 meters per pixel (m) at the equator). The colorized mosaic was completed by NASA AMES which warped the original Viking colorized @@ -35,8 +23,21 @@ asset.meta = { as an accurate basemap on which data from future missions can be plotted. (Description from URL).

References: Williams, D. R. (2018). Viking Mission to Mars. https://nssdc.gsfc.nasa.gov/planetary/viking.html Additional - references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 This map is - hosted on the OpenSpace server in Utah.]], + references available here: http://astrogeology.usgs.gov/maps/mdim-2-1 ]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Viking MDIM [Utah]", + Version = "1.0", + Description = [[ Alternate image layer for Mars. This map is hosted + on the OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" .. "Mars_Viking_MDIM21_ClrMosaic_global_232m", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index dada2c2baf..a46993113c 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -5,19 +5,7 @@ local layer = { Identifier = "Mola_Europe", Name = "Mola Elevation [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", - TilePixelSize = 90 -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "Mola Elevation [Sweden]", - Version = "1.0", + TilePixelSize = 90, Description = [[ This digital elevation model (DEM) is based on data from the Mars Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents @@ -31,9 +19,22 @@ asset.meta = { elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL). This map is hosted on the OpenSpace server in - Sweden.]], + URL). Data Reference: (See URL).]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Mola Elevation [Sweden]", + Version = "1.0", Author = "USGS", + Description = [[ Global elevation layer for Mars. This layer is hosted on the + OpenSpace server in Sweden.]], URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", License = "NASA/PDS", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index 9bc260a861..c433db084a 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -5,19 +5,7 @@ local layer = { Identifier = "Mola_Utah", Name = "Mola Elevation [Utah]", FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", - TilePixelSize = 90 -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) -end) - -asset.export("layer", layer) - - -asset.meta = { - Name = "Mola Elevation [Utah]", - Version = "1.0", + TilePixelSize = 90, Description = [[ This digital elevation model (DEM) is based on data from the Mars Orbiter Laser Altimeter (MOLA; Smith et al., 2001), an instrument on NASA's Mars Global Surveyor (MGS) spacecraft (Albee et al., 2001). The MOLA DEM represents @@ -31,8 +19,21 @@ asset.meta = { elevation uncertainty is at least ±3 m due to the global error in the areoid (±1.8 meters; Neumann et al., 2001) and regional uncertainties in its shape (Neumann, 2002). Pixel resolution is 463 meters per pixel (m). (Description from - URL). Data Reference: (See URL). This map is hosted on the OpenSpace server in - Utah.]], + URL). Data Reference: (See URL).]], +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + +asset.export("layer", layer) + + +asset.meta = { + Name = "Mola Elevation [Utah]", + Version = "1.0", + Description = [[ Global elevation layer for Mars. This layer is hosted on the + OpenSpace server in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" .. "Mars_MGS_MOLA_DEM_mosaic_global_463m", diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 25f836c95e..97d7a0d453 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -41,7 +41,9 @@ local Mars = { }, Tag = { "planet_solarSystem", "planet_terrestrial" }, GUI = { - Path = "/Solar System/Planets/Mars" + Name = "Mars", + Path = "/Solar System/Planets/Mars", + Description = [[ Main globe for Mars with labels and map layers.]] } } @@ -68,7 +70,8 @@ local MarsLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Mars Label", - Path = "/Solar System/Planets/Mars" + Path = "/Solar System/Planets/Mars", + Description = [[ Main label for Mars]] } } diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index cac3aa4b4c..fb634073cf 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -29,7 +29,9 @@ local Deimos = { }, Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, GUI = { - Path = "/Solar System/Planets/Mars" + Name = "Deimos", + Path = "/Solar System/Planets/Mars", + Description = [[One of two moons of Mars.]] } } @@ -50,10 +52,22 @@ local DeimosTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, GUI = { Name = "Deimos Trail", - Path = "/Solar System/Planets/Mars" + Path = "/Solar System/Planets/Mars", + Description = [[Trail for Deimos]] } } assetHelper.registerSceneGraphNodesAndExport(asset, { Deimos, DeimosTrail }) + + +asset.meta = { + Name = "Deimos", + Version = "1.0", + Description = [[ RenderableGlobe and Trail for Deimos.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "Deimos,DeimosTrail" +} diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 639ba6dcf9..9c7ba76bec 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -29,7 +29,9 @@ local Phobos = { }, Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" }, GUI = { - Path = "/Solar System/Planets/Mars" + Name = "Phobos", + Path = "/Solar System/Planets/Mars", + Description = [[One of two moons of Mars.]] } } @@ -50,10 +52,22 @@ local PhobosTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" }, GUI = { Name = "Phobos Trail", - Path = "/Solar System/Planets/Mars" + Path = "/Solar System/Planets/Mars", + Description = [[Trail for Phobos.]] } } assetHelper.registerSceneGraphNodesAndExport(asset, { Phobos, PhobosTrail }) + + +asset.meta = { + Name = "Phobos", + Version = "1.0", + Description = [[ RenderableGlobe and Trail for Phobos.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "Phobos,PhobosTrail" +} diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index d5f533ffc0..047d9b16f7 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -21,7 +21,9 @@ local MarsTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, GUI = { Name = "Mars Trail", - Path = "/Solar System/Planets/Mars" + Path = "/Solar System/Planets/Mars", + Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see + base spice asset)]], } } @@ -33,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrail }) asset.meta = { Name = "Mars Trail", Version = "1.0", - Description = [[ Trail of Mars as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[ Main Mars trail from SPICE.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset new file mode 100644 index 0000000000..2db55ba747 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -0,0 +1,44 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local MarsTrailEarth = { + Identifier = "MarsTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MARS BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Mars trail from Earth", + Path = "/Solar System/Planets/Mars", + Hidden = false, + Description = [[ Trail of Mars as observed by the Earth]], + } +} + +asset.meta = { + Name = "Mars Trail from Earth", + Version = "1.0", + Description = [[ Trail of Mars, parented to Earth with Earth as the SPICE observer. + Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "MarsTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index 73a7805cf3..e499f1204e 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -15,7 +15,8 @@ local MarsBarycenter = { GUI = { Name = "Mars Barycenter", Path = "/Solar System/Planets/Mars", - Hidden = true + Hidden = true, + Description = [[ SPICE Translation for targeting Mars Barycenter]], } } @@ -25,7 +26,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter }) asset.meta = { Name = "Mars Transforms", Version = "1.0", - Description = [[ Mars Barycenter transform]], + Description = [[ Transform with position for Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 0505423034..a2d8f3e0e2 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -62,7 +62,7 @@ local MercuryLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Mercury Label", - Path = "/Solar System/Planets/Mercury" + Path = "/Solar System/Planets/Mercury", } } diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index 279dc22404..c6de66699a 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -21,7 +21,8 @@ local MercuryTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, GUI = { Name = "Mercury Trail", - Path = "/Milky Way/Gaia/Mercury" + Path = "/Milky Way/Gaia/Mercury", + Description = [[ Trail of Mercury as observed by the Sun.]], } } @@ -33,7 +34,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrail }) asset.meta = { Name = "Mercury Trail", Version = "1.0", - Description = [[ Trail of Mercury as observed by the Sun. Data from NASA Spice (see + Description = [[ Main trail for Mercury. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset new file mode 100644 index 0000000000..482d7406c3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -0,0 +1,44 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local MercuryTrailEarth = { + Identifier = "MercuryTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Mercury trail from Earth", + Path = "/Solar System/Planets/Mercury", + Hidden = false, + Description = [[ Trail of Mercury as observed by the Earth.]], + } +} + +asset.meta = { + Name = "Mercury Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Mercury, as observed by the Earth rather then the + Sun.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "MercuryTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 63dc3a5783..1e4f43bbe3 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -15,7 +15,8 @@ local MercuryBarycenter = { GUI = { Name = "Mercury Barycenter", Path = "/Solar System/Planets/Mercury", - Hidden = true + Hidden = true, + Description = [[ Mercury Barycenter position]], } } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index 700881423a..a4fc70ae9a 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -21,7 +21,9 @@ local Neptune = { }, Tag = { "planet_solarSystem", "planet_giants" }, GUI = { - Path = "/Solar System/Planets/Neptune" + Name = "Neptune", + Path = "/Solar System/Planets/Neptune", + Description = [[Neptune globe]] } } @@ -42,7 +44,8 @@ local NeptuneLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Neptune Label", - Path = "/Solar System/Planets/Neptune" + Path = "/Solar System/Planets/Neptune", + Description = [[ Main planet label for Neptune.]], } } diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index 09fca57b02..3eb2f3241b 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -32,7 +32,8 @@ local NeptuneTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, GUI = { Name = "Neptune Trail", - Path = "/Solar System/Planets/Neptune" + Path = "/Solar System/Planets/Neptune", + Description = [[ Trail of Neptune as observed by the Sun.]] } } @@ -44,8 +45,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrail }) asset.meta = { Name = "Neptune Trail", Version = "1.0", - Description = [[ Trail of Neptune as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[ Main trail of Neptune. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset new file mode 100644 index 0000000000..f40341733d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -0,0 +1,44 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local NeptuneTrailEarth = { + Identifier = "NeptuneTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "NEPTUNE BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Neptune trail from Earth", + Path = "/Solar System/Planets/Neptune", + Hidden = false, + Description = [[ Trail of Neptune as observed by the Earth.]], + } +} + +asset.meta = { + Name = "Neptune Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Neptune, as observed by the Earth rather then the + Sun.]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "VenusTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index c96ea56343..19a99b6b61 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -15,7 +15,8 @@ local NeptuneBarycenter = { GUI = { Name = "Neptune Barycenter", Path = "/Solar System/Planets/Neptune", - Hidden = true + Hidden = true, + Description = [[ Neptune Barycenter position]], } } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index 8d18022098..fdfb63cc43 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -22,7 +22,8 @@ local DioneTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Dione Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Dione as observed by Saturn]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { DioneTrail }) asset.meta = { Name = "Dione Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Dione as observed by Saturn. Data from - NASA Spice (see base spice asset)]], + Description = [[ Trail for Dione. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 9d926f761a..3d1cd6d750 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -44,7 +44,9 @@ local Enceladus = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Name = "Enceladus", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Enceladus globe with labels]], } } @@ -56,7 +58,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { Enceladus }) asset.meta = { Name = "Enceladus", Version = "1.0", - Description = [[ Enceladus globe with labels]], + Description = [[ Enceladus globe with labels and map layers]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset index e199284208..cbb634c0fa 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -5,6 +5,12 @@ local layer = { Identifier = "Global_Mosaic_100m_HPF", Name = "Cassini Global Mosaic 100m HPF", FilePath = mapServiceConfigs .. "/Cassini_ISS_Global_Mosaic_100m_HPF.wms", + Description = [[ This mosaic represents the completion of a global control network of + Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of + 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control + network. The image selection criteria were based on coverage, quality, and a + spatial resolution between 50 and 500 meters per pixel (m) with phase angles less + than 120 degrees. (Description from URL).]] } asset.onInitialize(function () @@ -17,13 +23,8 @@ asset.export("layer", layer) asset.meta = { Name = "Cassini Global Mosaic 100m HPF", Version = "1.0", - Description = [[ This mosaic represents the completion of a global control network of - Enceladus containing Cassini Imaging Science Subsystem (ISS) images. A total of - 586 images in CLR, GRN, UV3, and IR3 filters were selected for the control - network. The image selection criteria were based on coverage, quality, and a - spatial resolution between 50 and 500 meters per pixel (m) with phase angles less - than 120 degrees. (Description from URL). This map is hosted on the OpenSpace - server Sweden]], + Description = [[ Cassini Global mosaic for Enceladus. This map is hosted on the + OpenSpace server Sweden.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Enceladus/Cassini/" .. "Enceladus_Cassini_ISS_Global_Mosaic_100m_HPF", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index c6c68e4281..bb22b29067 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -22,7 +22,8 @@ local EnceladusTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Enceladus Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn.]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { EnceladusTrail }) asset.meta = { Name = "Enceladus Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Enceladus as observed by Saturn. Data from - NASA Spice (see base spice asset)]], + Description = [[ Trail for Enceladus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index b098c534fb..944df7fec9 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -44,6 +44,7 @@ local Hyperion = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { + Name = "Hyperion", Path = "/Solar System/Planets/Saturn/Moons" } } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 23397b42a4..fa28e41a0f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -44,7 +44,9 @@ local Iapetus = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Name = "Iapetus", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Third largest moon of Saturn. ]] } } diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 261b18b13e..1403fc3903 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -22,7 +22,8 @@ local IapetusTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Iapetus Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn.]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { IapetusTrail }) asset.meta = { Name = "Iapetus Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Iapetus as observed by Saturn. Data from NASA - Spice (see base spice asset)]], + Description = [[Main trail for Iapetus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 619a30c1ee..adf306573e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -44,7 +44,9 @@ local Mimas = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Name = "Mimas", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[That's no moon...]] } } diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index eb4ae92420..5849273109 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -22,7 +22,8 @@ local MimasTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Mimas Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Mimas as observed by Saturn.]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { MimasTrail }) asset.meta = { Name = "Mimas Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Mimas as observed by Saturn. Data from NASA - Spice (see base spice asset)]], + Description = [[ Main trail for Mimas. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index b6e21025c3..871bc2ba74 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -44,7 +44,9 @@ local Rhea = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Name = "Rhea", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Second largest moon of Saturn.]] } } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index 94c19d53ec..bc7c5092bb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -22,7 +22,8 @@ local RheaTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Rhea Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Rhea as observed by Saturn.]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { RheaTrail }) asset.meta = { Name = "Rhea Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Rhea as observed by Saturn. Data from NASA - Spice (see base spice asset)]], + Description = [[ Main trail for Rhea. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index b1b4a64a1d..eadd772084 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -37,7 +37,9 @@ local Saturn = { }, Tag = { "planet_solarSystem", "planet_giants" }, GUI = { - Path = "/Solar System/Planets/Saturn" + Name = "Saturn", + Path = "/Solar System/Planets/Saturn", + Description = [[Saturn globe.]] } } @@ -58,7 +60,8 @@ local SaturnLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Saturn Label", - Path = "/Solar System/Planets/Saturn" + Path = "/Solar System/Planets/Saturn", + Description = [[ Main planet label for Saturn.]], } } diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index 00cebdec5f..bdabe2f983 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -22,7 +22,8 @@ local TethysTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Tethys Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Tethys as observed by Saturn.]], } } @@ -34,8 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { TethysTrail }) asset.meta = { Name = "Tethys Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Tethys as observed by Saturn. Data from NASA - Spice (see base spice asset)]], + Description = [[ Main trail for Tethys. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset index fcae769eb0..93aed7e860 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -5,6 +5,14 @@ local layer = { Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", Name = "Cassini ISS Global Mosaic [Sweden]", FilePath = mapServiceConfigs .. "/LiU/ISS_P19658_Mosaic_Global_4km.wms", + Description = [[ This global digital map of Saturn's moon Titan was created using + images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map + was produced in June 2015 using data collected through Cassini's flyby on April 7, + 2014, known as "T100". The mean radius of Titan used for projection of this map is + 1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m). + Titan is assumed to be spherical until a control network -- a model of the moon's + shape based on multiple images tied together at defined points on the surface -- + is created at some point in the future. (Description from URL)]], } asset.onInitialize(function () @@ -17,16 +25,11 @@ asset.export("layer", layer) asset.meta = { Name = "Cassini ISS Global Mosaic", Version = "1.0", - Description = [[ This global digital map of Saturn's moon Titan was created using - images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map - was produced in June 2015 using data collected through Cassini's flyby on April 7, - 2014, known as "T100". The mean radius of Titan used for projection of this map is - 1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m). - Titan is assumed to be spherical until a control network -- a model of the moon's - shape based on multiple images tied together at defined points on the surface -- - is created at some point in the future. (Description from URL)]], + Description = [[ Cassini global image layer for Titan. This layer is hosted on the + OpenSpace server in Sweden]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" .. "Titan_ISS_P19658_Mosaic_Global_4km", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Cassini_ISS_Global_Mosaic_4km_LiU" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index b349e56070..82a121bfba 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -44,7 +44,9 @@ local Titan = { }, Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" }, GUI = { - Path = "/Solar System/Planets/Saturn/Moons" + Name = "Titan", + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[Largest moon of Saturn.]] } } @@ -59,5 +61,6 @@ asset.meta = { Description = [[ Titan globe with labels.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "Titan" } diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index f311532022..0c404e2a00 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -22,7 +22,8 @@ local TitanTrail = { Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" }, GUI = { Name = "Titan Trail", - Path = "/Solar System/Planets/Saturn/Moons" + Path = "/Solar System/Planets/Saturn/Moons", + Description = [[ Trail of Saturn's moon Titan as observed by Saturn.]], } } @@ -33,9 +34,9 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { TitanTrail }) asset.meta = { Name = "Titan Trail", Version = "1.0", - Description = [[ Trail of Saturn's moon Titan as observed by Saturn. Data from NASA - Spice (see base spice asset)]], + Description = [[ Main trail for Titan. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = "TitanTrail" } diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index d3a6ee2fa5..a49d2e5d25 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -20,7 +20,8 @@ local SaturnTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, GUI = { Name = "Saturn Trail", - Path = "/Solar System/Planets/Saturn" + Path = "/Solar System/Planets/Saturn", + Description = [[ Trail of Saturn as observed by the Sun.]], } } @@ -32,8 +33,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrail }) asset.meta = { Name = "Saturn Trail", Version = "1.0", - Description = [[ Trail of Saturn as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[ Main trail of Saturn. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset new file mode 100644 index 0000000000..cae480d1b4 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -0,0 +1,44 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local SaturnTrailEarth = { + Identifier = "SaturnTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "SATURN BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Saturn trail from Earth", + Path = "/Solar System/Planets/Saturn", + Hidden = false, + Description = [[ Trail of Saturn as observed by the Earth.]], + } +} + +asset.meta = { + Name = "Saturn Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Saturn, as observed by the Earth rather then the + Sun. Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "VenusTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 620c3de4b5..0edc4e247c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -15,7 +15,8 @@ local SaturnBarycenter = { GUI = { Name = "Saturn Barycenter", Path = "/Solar System/Planets/Saturn", - Hidden = true + Hidden = true, + Description = [[ Saturn Barycenter position]] } } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 0b4f15524b..05173b34df 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -20,7 +20,8 @@ local UranusTrail = { Tag = { "planetTrail_solarSystem", "planetTrail_giants" }, GUI = { Name = "Uranus Trail", - Path = "/Solar System/Planets/Uranus" + Path = "/Solar System/Planets/Uranus", + Description = [[ Trail of Uranus as observed by the Sun.]], } } @@ -31,8 +32,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrail }) asset.meta = { Name = "Uranus Trail", Version = "1.0", - Description = [[ Trail of Uranus as observed by the Sun. Data from NASA Spice (see - base spice asset)]], + Description = [[ Main trail of Uranus. Data from NASA Spice (see base spice asset)]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset new file mode 100644 index 0000000000..205eae88c8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -0,0 +1,44 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') +asset.require("spice/base") + + + +local UranusTrailEarth = { + Identifier = "UranusTrailEarth", + Parent = earthTransforms.EarthBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "URANUS BARYCENTER", + Observer = "EARTH" + }, + Color = { 1.0, 0.5, 0.2 }, + Period = 224.695, + Resolution = 1000, + Enabled = false + }, + Tag = { "planetTrail_solarSystem_alt", "planetTrail_terrestrial_alt" }, + GUI = { + Name = "Uranus trail from Earth", + Path = "/Solar System/Planets/Uranus", + Hidden = false, + Description = [[ Trail of Uranus as observed by the Earth.]], + } +} + +asset.meta = { + Name = "Uranus Trail from Earth", + Version = "1.0", + Description = [[ Alternate trail of Uranus, as observed by the Earth rather then the + Sun. Data from NASA SPICE (see base spice asset)]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license", + Identifiers = "VenusTrailEarth" +} + + +assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index f94ff2e3d7..93b67831fa 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -17,7 +17,8 @@ local UranusBarycenter = { GUI = { Name = "Uranus Barycenter", Path = "/Solar System/Planets/Uranus", - Hidden = true + Hidden = true, + Description = [[ Uranus Barycenter position]], } } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index dd8de4f44a..fd8a081fa6 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -21,7 +21,9 @@ local Uranus = { }, Tag = { "planet_solarSystem", "planet_giants" }, GUI = { - Path = "/Solar System/Planets/Uranus" + Name = "Uranus", + Path = "/Solar System/Planets/Uranus", + Description = [[Globe for Uranus.]] } } @@ -42,7 +44,8 @@ local UranusLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Uranus Label", - Path = "/Solar System/Planets/Uranus" + Path = "/Solar System/Planets/Uranus", + Description = [[ Main planet label for Uranus.]], } } diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 54b284bf1d..10add43bb0 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -57,7 +57,8 @@ local Atmosphere = { }, GUI = { Name = "Venus Atmosphere", - Path = "/Solar System/Planets/Venus" + Path = "/Solar System/Planets/Venus", + Description = "Simulation of Venus' Atmosphere" } } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset index 2679f376e9..f77cb91605 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -4,20 +4,6 @@ local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { Identifier = "Magellan_Mosaic_Utah", Name = "Magellan Mosaic [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.vrt", - BlendMode = "Color", - Settings = { - Gamma = 2.0 - } -} - -asset.onInitialize(function () - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.meta = { - Name = "Venus Magellan Mosaic", - Version = "1.0", Description = [[ Color layer for Venus. This mosaic was created from the Magellan F-BIDRs, (Full resolution Basic Image Data Records), the highest resolution radar images of the Venus surface (~75 m/pixel). Because Venus is shrouded by a @@ -34,10 +20,27 @@ asset.meta = { the radar system was sending signals to the left of the spacecraft. The SAR operated in this left-looking mode during cycles 1 and 3 of the mission. (Description from USGS)]], + FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.0 + } +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + +asset.meta = { + Name = "Venus Magellan Mosaic", + Version = "1.0", + Description = [[Map layer for Venus containting Venus Magellan Mosaic from the USGS. + Hosted on the OpenSpace servers in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/" .. "Venus_Magellan_LeftLook_mosaic_global_75m", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Magellan_Mosaic_Utah" } diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset index 8893b2bbac..3831c96aad 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -4,6 +4,16 @@ local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { Identifier = "Magellan", Name = "Magellan Elevation [Utah]", + Description = [[ Elevation layer for Venus. The represents the version 2 + (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). + The range to surface is derived by fitting altimeter echoes from the fan-beam + altimetry antenna as a function of time to Hagfors' radar backscatter model + templates. The ranges are subtracted from the spacecraft radial + coordinate (derived from Doppler tracking), yielding measurements of + planetary radius. The data are filtered to remove low-frequency errors in + the in-plane elements of each spacecraft orbit, and then originally re-sampled + into sinusoidal, Mercator, and north and south polar stereographic projections + at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], FilePath = mapServiceConfigs .. "/Utah/MagellanDEM.wms", TilePixelSize = 64, Settings = { @@ -19,20 +29,13 @@ end) asset.meta = { Name = "Venus Magellan DEM", Version = "1.0", - Description = [[ Elevation layer for Venus. The represents the version 2 - (1997 release) of the Global Topographic Data Record (GTDR-SINUS.3;2). - The range to surface is derived by fitting altimeter echoes from the fan-beam - altimetry antenna as a function of time to Hagfors' radar backscatter model - templates. The ranges are subtracted from the spacecraft radial - coordinate (derived from Doppler tracking), yielding measurements of - planetary radius. The data are filtered to remove low-frequency errors in - the in-plane elements of each spacecraft orbit, and then originally re-sampled - into sinusoidal, Mercator, and north and south polar stereographic projections - at a resolution of 5 kilometers per pixel (4641 meters per pixel [m]).]], + Description = [[Map layer for Venus containting Venus Magellan DEM from the USGS. + Hosted on the OpenSpace servers in Utah.]], Author = "USGS", URL = "https://astrogeology.usgs.gov/search/map/Venus/Magellan/RadarProperties" .. "/Venus_Magellan_Topography_Global_4641m_v02", - License = "NASA/PDS" + License = "NASA/PDS", + Identifiers = "Magellan" } asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index c1dc4b379e..51b50f2ce6 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -22,7 +22,8 @@ local VenusTrail = { GUI = { Name = "Venus Trail", Path = "/Solar System/Planets/Venus", - Hidden = true + Description = "Main trail for Venus", + Hidden = false } } diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 59d4e533bd..2549309464 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -1,13 +1,12 @@ local assetHelper = asset.require('util/asset_helper') local transforms = asset.require('scene/solarsystem/sun/transforms') +local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') asset.require("spice/base") -local etransforms = asset.require('scene/solarsystem/planets/earth/transforms') - local VenusTrailEarth = { Identifier = "VenusTrailEarth", - Parent = etransforms.EarthBarycenter.Identifier, + Parent = earthTransforms.EarthBarycenter.Identifier, Renderable = { Type = "RenderableTrailOrbit", Translation = { @@ -24,6 +23,7 @@ local VenusTrailEarth = { GUI = { Name = "Venus trail from Earth", Path = "/Solar System/Planets/Venus", + Description = "Alternate trail for Venus, showing Venus as observed from Earth.", Hidden = false } } diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 86e7c3cd56..ab915fd6dd 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -14,14 +14,16 @@ local VenusBarycenter = { }, GUI = { Name = "Venus Barycenter", - Path = "/Solar System/Planets/Venus" + Path = "/Solar System/Planets/Venus", + Hidden = true, + Description = "Position for Venus Barycenter" } } asset.meta = { Name = "Venus Transforms", Version = "1.0", - Description = [[ Venus Barycenter transform]], + Description = [[ Spice translation for Venus Barycenter]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index e415995c9d..03446c8ea1 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -44,7 +44,9 @@ local Venus = { }, Tag = { "planet_solarSystem", "planet_terrestrial" }, GUI = { - Path = "/Solar System/Planets/Venus" + Name = "Venus", + Path = "/Solar System/Planets/Venus", + Description = "Venus globe with labels and map layers." } } @@ -65,7 +67,8 @@ local VenusLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Venus Label", - Path = "/Solar System/Planets/Venus" + Path = "/Solar System/Planets/Venus", + Description = "Label for Venus, viewable within the solar system." } } diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index e1b278106a..eec5e1119d 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -9,14 +9,17 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 4 object.Renderable.TrailFade = 11 +object.GUI.Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to + Earth's but interior to Mars'. ]] + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Amor Asteroids", Version = "1.0", - Description = [[ Earth-approaching Near-Earth-Asteroids with orbits exterior to - Earth's but interior to Mars'. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Amor group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index ac14c06e40..2991a1e421 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -9,14 +9,17 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 10 +object.GUI.Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes + larger than Earth's. ]] + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Apollo Asteroids", Version = "1.0", - Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes larger - than Earth's. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Apollo group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset new file mode 100644 index 0000000000..cb16ce212a --- /dev/null +++ b/data/assets/scene/solarsystem/sssb/astraea.asset @@ -0,0 +1,60 @@ +local assetHelper = asset.require('util/asset_helper') +local sunTransforms = asset.require('scene/solarsystem/sun/transforms') + +local trajectory = asset.syncedResource({ + Name = "5 Astraea Trajectory", + Type = "HttpSynchronization", + Identifier = "astraea_horizons", + Version = 1 + }) + +local AstraeaTrail = { + Identifier = "AstraeaTrail", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailTrajectory", + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_astraea.dat" + }, + Color = { 0.9, 0.9, 0.0 }, + StartTime = "2014 JAN 01 00:00:00", + EndTime = "2023 JAN 01 00:00:00", + SampleInterval = 7000, + TimeStampSubsampleFactor = 1 + }, + GUI = { + Name = "5 Astraea Trail", + Path = "/Solar System/Interstellar" + } +} + +local AstraeaPosition = { + Identifier = "AstraeaPosition", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Transform = { + Translation = { + Type = "HorizonsTranslation", + HorizonsTextFile = trajectory .. "/horizons_astraea.dat" + }, + }, + GUI = { + Name = "5 Astraea", + Path = "/Solar System/Interstellar" + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { AstraeaPosition, AstraeaTrail }) + +asset.meta = { + Name = "5 Astraea", + Version = "1.0", + Description = [[ This asset contains the trail + and position of 5 Astraea from 2014 JAN 01 00:00:00 + to 2023 JAN 01 00:00:00. Data from JPL Horizons']], + Author = "Zach Shaffer", + URL = "https://ssd.jpl.nasa.gov/horizons.cgi", + License = [[ JPL-authored documents are sponsored by NASA under Contract + NAS7-030010. All documents available from this server may be protected + under the U.S. and Foreign Copyright Laws."]] +} diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index 477ec6fbea..03e920247e 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 18 +object.GUI.Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes + smaller than Earth's. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Aten Asteroids", Version = "1.0", - Description = [[ Earth-crossing Near-Earth-Asteroids with semi-major axes - smaller than Earth's. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Aten group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index 065bfe7f61..fbeb92d10d 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 25 +object.GUI.Description = [[ Near-Earth-Asteroids whose orbits are contained entirely + within the orbit of the Earth. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Atira Asteroids", Version = "1.0", - Description = [[ Near-Earth-Asteroids whose orbits are contained entirely within the - orbit of the Earth. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Atira group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index 0555603151..0381a2f176 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 6 object.Renderable.TrailFade = 18 +object.GUI.Description = [[ Asteroids with either a perihelion or a semi-major axis + between those of the four outer planets. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Centaur Asteroids", Version = "1.0", - Description = [[ Asteroids with either a perihelion or a semi-major axis between - those of the four outer planets. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Centaur group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index 0136f9f5a6..a29fa7b131 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 25 +object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + greater than 3 and a semi-major axis greater than that of Jupiter. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Chiron-Type Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - greater than 3 and a semi-major axis greater than that of Jupiter. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Chiron-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index 0f443b8623..ea4e3a8b1c 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 2 object.Renderable.TrailFade = 23 +object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + greater than 3 and a semi-major axis less than that of Jupiter. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Encke-Type Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - greater than 3 and a semi-major axis less than that of Jupiter. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Encke-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index 3fab4ad0b4..193ee90a80 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -9,13 +9,17 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 9 object.Renderable.TrailFade = 18 +object.GUI.Description = [[ Periodic comets with an orbital period between 20 and 200 + years. ]] + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Halley-Type Comets", Version = "1.0", - Description = [[ Periodic comets with an orbital period between 20 and 200 years. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Halley-Type group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index 1dccad7769..c177f130a4 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.5 +object.GUI.Description = [[ Asteroids with a semi-major axis less than 2.0 au and a + perihelion distance greater than 1.666 au. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Inner Main Asteroid Belt", Version = "1.0", - Description = [[ Asteroids with a semi-major axis less than 2.0 au and a perihelion - distance greater than 1.666 au. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining the Inner Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index c3206826f7..ec905e30dc 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 10 object.Renderable.TrailFade = 28 +object.GUI.Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of + between 2 and 3. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Family Comets", Version = "1.0", - Description = [[ Comets with a Tisserand's parameter with respect to Jupiter of - between 2 and 3. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Jupiter-family group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index 1219fa1055..ca3ad69849 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 5 +object.GUI.Description = [[ Asteroids trapped in Jupiter's L4/L5 Lagrange points + (semimajor axis of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Jupiter Trojan Asteroids", Version = "1.0", - Description = [[ Asteroids trapped in Jupiter's L4/L5 Lagrange points (semimajor axis - of between 4.6 and 5.5 au), with an eccentricity of less than 0.3. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Jupiter Trojan group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index af6766f115..de5c6a8394 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -10,14 +10,18 @@ object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 0.1 object.Renderable.UpperLimit = 50000 +object.GUI.Description = [[ Asteroids with a semi-major axis of between 2.0 and 3.2 au, + and a perihelion distance greater than 1.666 au. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Main Asteroid Belt", Version = "1.0", - Description = [[ Asteroids with a semi-major axis of between 2.0 and 3.2 au, and a - perihelion distance greater than 1.666 au. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index 0cd252fff6..aa3b02579e 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -9,14 +9,18 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 13 +object.GUI.Description = [[ Asteroids that cross the orbit of Mars, with a semi-major axis + of less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Mars-Crossing Asteroids", Version = "1.0", - Description = [[ Asteroids that cross the orbit of Mars, with a semi-major axis of - less than 3.2 au, and a perihelion distance of between 1.3 and 1.666 au. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Mars-Crossing group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index 124859718a..29b4744293 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -16,13 +16,17 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 1 object.Renderable.TrailFade = 2 +object.GUI.Description = [[ Asteroids with a semi-major axis of between 3.2 and 4.6 au. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Outer Main Asteroid Belt", Version = "1.0", - Description = [[ Asteroids with a semi-major axis of between 3.2 and 4.6 au. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Outer Main Asteroid Belt group.]], Author = "JPL Small-Body Database hosted by California Institute of Technology", URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010. diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index 618ddb8368..d3cb1148b2 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -11,16 +11,20 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 3 object.Renderable.TrailFade = 17 +object.GUI.Description = [[ Asteroids that are deemed potentially hazardous to Earth + based on their close approaches. All asteroids with an Earth Minimum Orbit + Intersection Distance (MOID) of 0.05 au or less, and with an absolute magnitude (H) + of 22.0 or less. ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Potentially-Hazardous Asteroids", Version = "1.0", - Description = [[ Asteroids that are deemed potentially hazardous to Earth - based on their close approaches. All asteroids with an Earth Minimum - Orbit Intersection Distance (MOID) of 0.05 au or less, and with an - absolute magnitude (H) of 22.0 or less. ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Potentially Hazardous group. ]], Author = [[JPL Small-Body Database hosted by California Institute of Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index bdbf593aa5..1eb5993f6c 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -40,7 +40,9 @@ local TeslaPosition = { }, GUI = { Name = "Tesla Roadster", - Path = "/Solar System/SSSB" + Path = "/Solar System/SSSB", + Description = [[Position and Trail of Tesla Roadster from 2018 FEB 8 + to 2022 FEB 7 00:00:00. Data from JPL Horizons.]] } } diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index bdab3b6f21..ba951fbb60 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -15,15 +15,19 @@ object.Renderable.Enabled = false object.Renderable.SegmentQuality = 8 object.Renderable.TrailFade = 10 +object.GUI.Description = [[ Any minor or dwarf planets in the solar system that orbit + the Sun at a greater average distance than Neptune (semi-major axis + of 30.1 AU). ]] + + assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Trans-Neptunian Asteroids", Version = "1.0", - Description = [[ Any minor or dwarf planets in the solar system that orbit - the Sun at a greater average distance than Neptune (semi-major axis - of 30.1 AU). ]], + Description = [[ RenderableSmallBody asset with data from from JPL Horizons + contiaining Trans-Neptunian group. ]], Author = [[JPL Small-Body Database hosted by California Institute of Technology]], URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi", diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index e2c89ebf45..2f673f94f6 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -27,14 +27,15 @@ local SunGlare = { }, GUI = { Name = "Sun Glare", - Path = "/Solar System/Sun" + Path = "/Solar System/Sun", + Description = [[ Sun glare effect. Enabled by default instead of sun orb.]] } } asset.meta = { Name = "Sun Glare", Version = "1.0", - Description = [[ Sun glare effect. Enabled by default instead of sun orb.]], + Description = [[ Image plane with sun glare effect.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index d0d4a463b9..1e34248055 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -19,14 +19,15 @@ local SunMarker = { }, GUI = { Name = "Sun Marker", - Path = "/Solar System/Sun" + Path = "/Solar System/Sun", + Description = [[ Sun marker with name, sized for Solar System view]] } } asset.meta = { Name = "Sun marker", Version = "1.0", - Description = [[ Sun marker with name, sized for Solar System view]], + Description = [[ Marker for the sun, with a stick and label.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 51474bc9cf..4ed82f44f5 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -14,7 +14,9 @@ local Sun = { PerformShading = false }, GUI = { - Path = "/Solar System/Sun" + Name = "Sun", + Path = "/Solar System/Sun", + Description = "Globe for the sun in our solar system." } } @@ -42,7 +44,8 @@ local SunLabel = { Tag = { "solarsystem_labels" }, GUI = { Name = "Sun Label", - Path = "/Solar System/Sun" + Path = "/Solar System/Sun", + Description = "Label for the sun in our solar system." } } diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 115e99d3b8..12defd23d2 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -15,6 +15,7 @@ local SolarSystemBarycenter = { GUI = { Name = "Solar System Barycenter", Path = "/Solar System", + Description = [[Barycenter of the solar system, expressed in the Galactic frame]], Hidden = true } } @@ -38,6 +39,7 @@ local SunIAU = { GUI = { Name = "SUN IAU", Path = "/Solar System/Sun", + Description = [[Spice frame for the Sun]], Hidden = true } } @@ -60,6 +62,7 @@ local SunECLIPJ2000 = { GUI = { Name = "SUN J2000", Path = "/Solar System/Sun", + Description = [[Spice rotation for Mean ecliptic and equinox of J2000]], Hidden = true } } diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h index 3bf4a2b600..d2b3bfc4d1 100644 --- a/include/openspace/scene/scenegraphnode.h +++ b/include/openspace/scene/scenegraphnode.h @@ -159,6 +159,7 @@ private: properties::StringProperty _guiPath; properties::StringProperty _guiDisplayName; + properties::StringProperty _guiDescription; // Transformation defined by ephemeris, rotation and scale struct { diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp index d9bdc6b8ec..cb84f810ed 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -94,6 +94,14 @@ namespace { "If the 'Type' of this layer is a solid color, this value determines what this " "solid color is." }; + + constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = { + "GuiDescription", + "Gui Description", + "This is the description for the scene graph node to be shown in the gui " + "example: Earth is a special place", + openspace::properties::Property::Visibility::Hidden + }; } // namespace documentation::Documentation Layer::Documentation() { @@ -219,6 +227,8 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict, , _remove(RemoveInfo) , _solidColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) , _layerGroupId(id) + , _guiDescription(GuiDescriptionInfo) + { documentation::testSpecificationAndThrow(Documentation(), layerDict, "Layer"); @@ -240,6 +250,11 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict, _enabled = layerDict.value(EnabledInfo.identifier); } + if (layerDict.hasKey(KeyDesc)) { + _guiDescription = description(); + addProperty(_guiDescription); + } + bool padTiles = true; if (layerDict.hasKeyAndValue(KeyPadTiles)) { padTiles = layerDict.value(KeyPadTiles); diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h index 1b7b50dd39..ec78efb292 100644 --- a/modules/globebrowsing/src/layer.h +++ b/modules/globebrowsing/src/layer.h @@ -87,6 +87,7 @@ private: properties::BoolProperty _enabled; properties::TriggerProperty _reset; properties::TriggerProperty _remove; + properties::StringProperty _guiDescription; layergroupid::TypeID _type; std::unique_ptr _tileProvider; diff --git a/openspace.cfg b/openspace.cfg index b8a6d1a8e8..76e919ca27 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -8,7 +8,7 @@ -- or a dome cluster system -- A regular 1280x720 window -SGCTConfig = sgct.config.single{} +SGCTConfig = sgct.config.single{vsync=true} -- A regular 1920x1080 window -- SGCTConfig = sgct.config.single{1920, 1080} -- A windowed 1920x1080 fullscreen diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index a9617799a0..1492495241 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -47,6 +47,7 @@ namespace { constexpr const char* KeyGuiName = "GUI.Name"; constexpr const char* KeyGuiPath = "GUI.Path"; constexpr const char* KeyGuiHidden = "GUI.Hidden"; + constexpr const char* KeyGuiDescription = "GUI.Description"; constexpr const char* KeyTransformTranslation = "Transform.Translation"; constexpr const char* KeyTransformRotation = "Transform.Rotation"; @@ -120,6 +121,14 @@ namespace { openspace::properties::Property::Visibility::Hidden }; + constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = { + "GuiDescription", + "Gui Description", + "This is the description for the scene graph node to be shown in the gui " + "example: Earth is a special place", + openspace::properties::Property::Visibility::Hidden + }; + constexpr openspace::properties::Property::PropertyInfo GuiHiddenInfo = { "GuiHidden", "Gui Hidden", @@ -161,6 +170,12 @@ ghoul::mm_unique_ptr SceneGraphNode::createFromDictionary( result->addProperty(result->_guiDisplayName); } + if (dictionary.hasKey(KeyGuiDescription)) { + result->setDescription(dictionary.value(KeyGuiDescription)); + result->_guiDescription = result->description(); + result->addProperty(result->_guiDescription); + } + if (dictionary.hasKey(KeyGuiHidden)) { result->_guiHidden = dictionary.value(KeyGuiHidden); result->addProperty(result->_guiHidden); @@ -314,6 +329,7 @@ SceneGraphNode::SceneGraphNode() , _guiHidden(GuiHiddenInfo) , _guiPath(GuiPathInfo) , _guiDisplayName(GuiNameInfo) + , _guiDescription(GuiDescriptionInfo) , _transform { ghoul::mm_unique_ptr( global::memoryManager.PersistentMemory.alloc() diff --git a/src/util/time.cpp b/src/util/time.cpp index 203abb7778..0590dafdc0 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -109,7 +109,7 @@ std::string_view Time::ISO8601() const { SpiceManager::ref().dateFromEphemerisTime(_time, b, S, Format); - return std::string_view(b, S); + return std::string_view(b, S-1); } void Time::ISO8601(char* buffer) const { From 7ed673e7738bfc73ceb2b2a7f098ec30990002d0 Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 8 Oct 2020 23:41:50 -0400 Subject: [PATCH 08/12] cleanup fixes --- openspace.cfg | 4 ++-- src/util/time.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openspace.cfg b/openspace.cfg index 76e919ca27..e3775e2316 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -48,7 +48,7 @@ SGCTConfig = sgct.config.single{vsync=true} -- Variable: Profile -- Sets the profile that should be loaded by OpenSpace. -Profile = "asteroids" +Profile = "default" -- Other default OpenSpace profiles are: -- apollo_sites, apollo8, asteroids, dawn -- default, default_full, gaia, juno, mars, messenger @@ -74,7 +74,7 @@ Paths = { PROFILES = "${DATA}/profiles", FONTS = "${DATA}/fonts", TASKS = "${DATA}/tasks", - SYNC = "E:/os/sync", + SYNC = "${BASE}/sync", SCREENSHOTS = "${BASE}/screenshots", WEB = "${DATA}/web", RECORDINGS = "${BASE}/recordings", diff --git a/src/util/time.cpp b/src/util/time.cpp index 0590dafdc0..203abb7778 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -109,7 +109,7 @@ std::string_view Time::ISO8601() const { SpiceManager::ref().dateFromEphemerisTime(_time, b, S, Format); - return std::string_view(b, S-1); + return std::string_view(b, S); } void Time::ISO8601(char* buffer) const { From 102454089aa45aadb2f25ab1c759f58ba2939966 Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 9 Oct 2020 14:24:46 -0400 Subject: [PATCH 09/12] update DU assets for gui.description --- data/assets/customization/gui.asset | 2 +- data/assets/scene/digitaluniverse/2dF.asset | 31 +++++----- data/assets/scene/digitaluniverse/2mass.asset | 18 +++--- data/assets/scene/digitaluniverse/6dF.asset | 23 ++++---- data/assets/scene/digitaluniverse/abell.asset | 26 +++++---- .../digitaluniverse/alternatestarlabels.asset | 16 +++--- .../scene/digitaluniverse/clusters.asset | 12 ++-- .../digitaluniverse/constellationbounds.asset | 8 ++- .../digitaluniverse/constellations.asset | 21 ++++--- .../scene/digitaluniverse/deepsky.asset | 25 +++++---- .../assets/scene/digitaluniverse/dwarfs.asset | 35 ++++++------ .../scene/digitaluniverse/exoplanets.asset | 17 +++--- .../digitaluniverse/globularclusters.asset | 15 ++++- .../assets/scene/digitaluniverse/groups.asset | 11 ++-- .../scene/digitaluniverse/h2regions.asset | 24 ++++---- .../assets/scene/digitaluniverse/kepler.asset | 23 ++++---- .../scene/digitaluniverse/localdwarfs.asset | 24 ++++---- .../scene/digitaluniverse/milkyway.asset | 20 ++++--- .../digitaluniverse/milkyway_arm_labels.asset | 13 +++-- .../digitaluniverse/milkyway_label.asset | 4 +- .../digitaluniverse/milkyway_sphere.asset | 7 ++- .../digitaluniverse/obassociations.asset | 24 ++++---- .../scene/digitaluniverse/openclusters.asset | 25 +++++---- .../digitaluniverse/planetarynebulae.asset | 18 +++--- .../scene/digitaluniverse/pulsars.asset | 27 ++++----- .../scene/digitaluniverse/quasars.asset | 18 +++--- data/assets/scene/digitaluniverse/sdss.asset | 33 +++++------ .../scene/digitaluniverse/starlabels.asset | 6 +- .../scene/digitaluniverse/starorbits.asset | 21 ++++--- data/assets/scene/digitaluniverse/stars.asset | 21 ++++--- .../scene/digitaluniverse/superclusters.asset | 15 ++--- .../digitaluniverse/supernovaremnants.asset | 12 ++-- data/assets/scene/digitaluniverse/tully.asset | 56 ++++++++++--------- data/assets/scene/digitaluniverse/voids.asset | 18 +++--- .../solarsystem/planets/earth/earth.asset | 2 +- .../nightlayers/earth_at_night_temporal.asset | 8 +-- data/assets/util/webgui.asset | 2 +- 37 files changed, 381 insertions(+), 300 deletions(-) diff --git a/data/assets/customization/gui.asset b/data/assets/customization/gui.asset index 6a43444b0a..e18cd44a7f 100644 --- a/data/assets/customization/gui.asset +++ b/data/assets/customization/gui.asset @@ -1,4 +1,4 @@ -asset.export("webguiDevelopmentMode", true) +asset.export("webguiDevelopmentMode", false) -- To make changes to the webgui: diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset index 31c9dc1703..bf848bcde3 100644 --- a/data/assets/scene/digitaluniverse/2dF.asset +++ b/data/assets/scene/digitaluniverse/2dF.asset @@ -35,7 +35,21 @@ local object = { }, GUI = { Name = "2dF Galaxies", - Path = "/Universe/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)]] } } @@ -46,20 +60,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "2dF Galaxies", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]], 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 014b854885..74631e6a09 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -37,7 +37,14 @@ local object = { }, GUI = { Name = "2MASS Galaxies", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + 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)]], } } @@ -48,13 +55,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "2MASS Galaxies", Version = "1.0", - 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)]], + Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS) + survey]], 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 9f71435dbe..5ae38458bb 100644 --- a/data/assets/scene/digitaluniverse/6dF.asset +++ b/data/assets/scene/digitaluniverse/6dF.asset @@ -35,7 +35,18 @@ local object = { }, GUI = { Name = "6dF Galaxies", - Path = "/Universe/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)]] } } @@ -46,15 +57,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "6dF Galaxies", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]], 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 07611c43e3..2f19ff5ff8 100644 --- a/data/assets/scene/digitaluniverse/abell.asset +++ b/data/assets/scene/digitaluniverse/abell.asset @@ -43,7 +43,19 @@ local object = { }, GUI = { Name = "Abell Galaxy Clusters", - Path = "/Universe/Galaxies" + 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)]], } } @@ -54,17 +66,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Abell Galaxy Clusters", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for The Abell catalog]], 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/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index bc07c442fe..28eb16aa9b 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -25,19 +25,21 @@ local object = { }, GUI = { Name = "Stars Labels - Alternate", - Path = "/Milky Way/Stars" + Path = "/Milky Way/Stars", + Description = [[Census 3,550 star names. DU Version 1.7.
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]], } } asset.meta = { Name = "Stars Labels - Alternate", Version = "1.0", - Description = [[Census 3,550 star names. DU Version 1.7. 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 = [[Digital Universe asset for alternate start labels]], 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/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index dde7790828..5bcab58b85 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -31,7 +31,12 @@ local object = { }, GUI = { Name = "Galaxy Cluster Labels", - Path = "/Universe/Galaxies" + 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)]], } } @@ -43,10 +48,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Clusters Labels", Version = "1.0", - 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)]], + Description = [[Digital Universe asset for Galaxy Clusters]], 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/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index a71d7f451f..dfbd683b70 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -36,7 +36,9 @@ local object = { }, GUI = { Name = "Constellation Bounds", - Path = "/Milky Way/Constellations" + Path = "/Milky Way/Constellations", + Description = [[A Spherical mesh dividing the sky into regions that fit the + constellations.]], } } @@ -48,8 +50,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Constellation Bounds", Version = "1.0", - Description = [[A Spherical mesh dividing the sky into regions that fit the - constellations.]], + Description = [[DU asset providing a Spherical mesh dividing the sky into regions that + fit the constellations.]], 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 9063dd01e0..6c024c8e70 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -48,7 +48,17 @@ local constellations = { Unit = "pc" }, GUI = { - Path = "/Milky Way/Constellations" + Name = "Constellations", + Path = "/Milky Way/Constellations", + Description = [[Census 88 constellations and labels. DU Version 2.3.
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]], } } @@ -60,14 +70,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalacti asset.meta = { Name = "Constellations", Version = "1.0", - Description = [[Census 88 constellations and labels. DU Version 2.3. 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 = [[Digital Universe asset for constellation lines]], 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/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset index a568a0fd64..00b3f1f180 100644 --- a/data/assets/scene/digitaluniverse/deepsky.asset +++ b/data/assets/scene/digitaluniverse/deepsky.asset @@ -51,7 +51,8 @@ local deepSkyPoints = { }, GUI = { Name = "Deep Sky Objects Points", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + Description = [[Point cloud and labels for Deep Sky Objects]] } } @@ -80,7 +81,17 @@ local deepSkyImages = { }, GUI = { Name = "Deep Sky Objects Images", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + 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 + size them accurately so that you can fly to the globular cluster M13, for + example, and see just how small the cluster of hundreds of thousands of stars + is relative to the rest of the Galaxy. Included Messier Objects by number are: + 6, 7, 11, 16, 18, 21, 23-26, 29, 34-39, 41, 46-48, 50, 52, 67, 93, 103, 2-5, + 9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, 79, 80, 92, 107, 27, 57, 76, + 97, 8, 17, 20, 78, 1 (Description from URL)

Data Reference: Largely + NOAO and various other sources (each image has a ref)]], } } @@ -90,15 +101,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImag asset.meta = { Name = "Deep Sky Objects Images", Version = "1.0", - 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 size them - accurately so that you can fly to the globular cluster M13, for example, and see just - how small the cluster of hundreds of thousands of stars is relative to the rest of the - Galaxy. Included Messier Objects by number are: 6, 7, 11, 16, 18, 21, 23-26, 29, 34-39 - , 41, 46-48, 50, 52, 67, 93, 103, 2-5, 9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, - 79, 80, 92, 107, 27, 57, 76, 97, 8, 17, 20, 78, 1 (Description from URL)

Data - Reference: Largely NOAO and various other sources (each image has a ref)]], + Description = [[Digital Universe asset for Deep Sky Objects and their Images]], Author = "Nate Greenstein, Matt Everhart, 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 index f0abdfb290..8036c82d69 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -41,7 +41,24 @@ local object = { }, GUI = { Name = "Brown Dwarfs", - Path = "/Milky Way" + 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)]] } } @@ -53,21 +70,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Brown Dwarfs", Version = "2.0", - 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)]], + 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 9487e024ef..4d4c7ef991 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -39,7 +39,15 @@ local object = { EnablePixelSizeControl = true, }, GUI = { - Path = "/Milky Way/Exoplanets" + Name = "Exoplanets", + Path = "/Milky Way/Exoplanets", + Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11.
+ 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)]], } } @@ -50,12 +58,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Exoplanets", Version = "1.0", - Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11. 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 = [[Digital Universe asset for Exoplanets]], 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/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index a5945ff726..fe47bd39f8 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -38,7 +38,20 @@ local object = { }, GUI = { Name = "Globular Clusters", - Path = "/Milky Way" + 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)]], } } diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 311474dd14..82263612bb 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -32,7 +32,11 @@ local object = { }, GUI = { Name = "Galaxy Group Labels", - Path = "/Universe/Galaxies" + 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)]] } } @@ -44,11 +48,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Group Labels", Version = "1.0", - 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)]], Author = "Brian Abbott (AMNH)", + Description = [[Digital Universe asset for Galaxy Groups]], URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", Identifiers = "NearbyGalaxyGroups" diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index 65165a2d3a..0906d6dab8 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -38,7 +38,18 @@ local object = { }, GUI = { Name = "HII Regions", - Path = "/Milky Way" + 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)]], } } @@ -50,16 +61,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "HII Regions", Version = "1.0", - 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)]], + Description = [[Digital Universe asset for HII Regions]], Author = "Carter Emmart, Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index f83274168b..b4186bdf9f 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -34,7 +34,17 @@ local object = { }, GUI = { Name = "Kepler Planetary Candidates", - Path = "/Milky Way/Exoplanets" + Path = "/Milky Way/Exoplanets", + Description = [[Census: 3,254 stars. DU Version 9.3.
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 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)]], } } @@ -46,16 +56,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Kepler Planetary Candidates", Version = "2.0", - Description = [[Census: 3,254 stars. DU Version 9.3. 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 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)]], + Description = [[Digital Universe asset for Kepler Planetary Candidates]], Author = "Brian Abbott, 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/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index 0e28296d4c..8e4c7a2175 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -39,7 +39,18 @@ local object = { }, GUI = { Name = "Local Group", - Path = "/Universe/Galaxies" + 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)]], } } @@ -51,16 +62,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Local Group", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for the Local Goup]], 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 eaf7ad329b..e25dfb64f2 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -21,7 +21,15 @@ local plane = { }, GUI = { Name = "Milky Way Galaxy Image", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + 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]] } } @@ -32,14 +40,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { Name = "MilkyWay Galaxy", Version = "2.0", - 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]], + Description = [[Digital Universe asset containt 2D image of the MilkyWay. For + extragalactic viewing]], 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 6ef9d9a449..c973b8bb9d 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -21,7 +21,12 @@ local plane = { }, GUI = { Name = "Milky Way Arms Labels", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + 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)]], } } @@ -31,11 +36,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) asset.meta = { Name = "Milky Way Arms Labels", Version = "1.0", - 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)]], + Description = [[ Image with arm labels for the Milky Way galaxy]], Author = "Brian Abbott (AMNH)", URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = [[ Copyright © American Museum of Natural History. All rights reserved. diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index ce80b67270..81c6dfb899 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -37,7 +37,9 @@ local homeLabel = { }, GUI = { Name = "Home Label", - Path = "/Universe/Galaxies" + Path = "/Universe/Galaxies", + Description = [[Label for the Milky Way titled "Home", sided for the galactic + level]], } } diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index be974120ab..78233b0354 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -32,7 +32,9 @@ local sphere = { }, GUI = { Name = "Milky Way Sphere", - Path = "/Milky Way" + 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]], } } @@ -43,8 +45,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) asset.meta = { Name = "Milky Way Galaxy Sphere", Version = "2.0", - Description = [[All sky image of the Milky Way that is visible when inside. Fades out - when zooming away from the Milky Way]], + 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 e9d2fa48dd..0f1ed67fe2 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -42,7 +42,18 @@ local object = { }, GUI = { Name = "OB Associations", - Path = "/Milky Way" + 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+)]], } } @@ -54,16 +65,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "OB Associations", Version = "2.0", - 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+)]], + Description = [[Digital Universe asset for OB Associations]], 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 0b705626c3..b171e04949 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -38,7 +38,18 @@ local object = { }, GUI = { Name = "Open Star Clusters", - Path = "/Milky Way" + Path = "/Milky Way", + Description = [[Census: 2,040 clusters. DU Version 5.7.
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: Optically + visible open clusters and Candidates (Dias+ 2002-2015)]], } } @@ -50,17 +61,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Open Star Clusters", Version = "2.0", - Description = [[Census: 2,040 clusters. DU Version 5.7. 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: Optically visible open clusters and Candidates - (Dias+ 2002-2015)]], + Description = [[Digital Universe asset for Open Star Clusters]], 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/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index 5537ce8c03..b81e6ee470 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -38,7 +38,15 @@ local object = { }, GUI = { Name = "Planetary Nebulae", - Path = "/Milky Way" + 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)]], } } @@ -50,13 +58,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Planetary Nebulae", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for Planetary Nebulae]], 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/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index 88cd099e47..cccce871b4 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -38,7 +38,19 @@ local object = { }, GUI = { Name = "Pulsars", - Path = "/Milky Way" + 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)]], } } @@ -50,18 +62,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Pulsars", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for Pulsars.]], 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/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index 2b6c876118..2aeeb6a4d9 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -36,7 +36,15 @@ local object = { }, GUI = { Name = "Quasars", - Path = "/Universe" + 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)]] } } @@ -48,13 +56,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Quasars", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for Quasars.]], 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/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index 495ab7aa22..21d66a7f02 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -44,7 +44,22 @@ local object = { }, GUI = { Name = "Sloan Digital Sky Survey", - Path = "/Universe/Galaxies" + 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/)]] } } @@ -56,21 +71,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Sloan Digital Sky Survey", Version = "2.0", - 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/)]], + Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]], 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/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index a9b60a1331..f0c352b71c 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -26,7 +26,9 @@ local object = { }, GUI = { Name = "Stars Labels", - Path = "/Milky Way/Stars" + Path = "/Milky Way/Stars", + Description = [[Labels for stars in the Milky Way. See 'Stars' for more + info.]], } } @@ -38,7 +40,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Star Labels", Version = "2.0", - Description = [[Labels for stars in the Milky Way. See 'Stars' asset for more info.]], + Description = [[Digital Universe asset for labels of the stars.]], 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/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset index 557c8b002b..fad2c66b5e 100644 --- a/data/assets/scene/digitaluniverse/starorbits.asset +++ b/data/assets/scene/digitaluniverse/starorbits.asset @@ -28,7 +28,8 @@ local sunOrbit = { }, GUI = { Name = "Sun Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of the Sun around the Milky Way"]] } } @@ -50,7 +51,8 @@ local barnardsOrbit = { }, GUI = { Name = "Barnards Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Barnard's Star around the Milky Way"]] } } @@ -72,7 +74,8 @@ local kapteynsOrbit = { }, GUI = { Name = "Kapteyns Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Kapteyn's Star around the Milky Way"]] } } @@ -94,7 +97,8 @@ local lacaille9352Orbit = { }, GUI = { Name = "Lacaille 9352 Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of Lacaille9352 around the Milky Way"]] } } @@ -116,7 +120,8 @@ local lSR1826Orbit = { }, GUI = { Name = "LSR1826+3014 Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of LSR1826+3014 around the Milky Way"]] } } @@ -138,7 +143,8 @@ local lSRJ0822Orbit = { }, GUI = { Name = "LSRJ0822+1700 Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of LSRJ0822+1700 around the Milky Way"]] } } @@ -160,7 +166,8 @@ local pM_J13420Orbit = { }, GUI = { Name = "PM_J13420-3415 Orbit", - Path = "/Milky Way/Stars/Stars Orbits" + Path = "/Milky Way/Stars/Stars Orbits", + Description = [["Orbits of PM_J13420-3415 around the Milky Way"]] } } diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset index 5632a6d297..3978780626 100644 --- a/data/assets/scene/digitaluniverse/stars.asset +++ b/data/assets/scene/digitaluniverse/stars.asset @@ -43,7 +43,15 @@ local stars = { RenderMethod = "Texture Based" -- or PSF }, GUI = { - Path = "/Milky Way/Stars" + Name = "Stars", + Path = "/Milky Way/Stars", + Description = [[Census: 117,003 stars with 321 labels.
DU Version 7.8. 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: + XHIP: An Extended Hipparcos Compilation (Anderson E., Francis C. 2012); + Hipparcos Catalog (European Space Agency 1997); Gliese Catalog (Gliese and + Jahriess 1991)]], } } @@ -62,7 +70,9 @@ local sunstar = { }, GUI = { Name = "Sun", - Path = "/Milky Way/Stars" + Path = "/Milky Way/Stars", + Description = [[Individual star to represent the sun when outside of the solar + system]] } } @@ -72,12 +82,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar }) asset.meta = { Name = "Stars", Version = "2.0", - Description = [[Census: 117,003 stars with 321 labels. DU Version 7.8. 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: XHIP: An Extended - Hipparcos Compilation (Anderson E., Francis C. 2012); Hipparcos Catalog - (European Space Agency 1997); Gliese Catalog (Gliese and Jahriess 1991)]], + Description = [[Digital Universe asset for the stars.]], 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/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index 499441aa13..2f7321900d 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -38,7 +38,13 @@ local object = { }, GUI = { Name = "Galaxy Superclusters", - Path = "/Universe/Galaxies" + 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)]] } } @@ -50,12 +56,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Galaxy Superclusters", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for Galaxy Superclusters.]], 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 9d30968697..5496d65f5c 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -40,7 +40,12 @@ local object = { }, GUI = { Name = "Supernova Remnants", - Path = "/Milky Way" + 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)]], } } @@ -52,10 +57,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { object }) asset.meta = { Name = "Supernova Remnants", Version = "2.0", - 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)]], + Description = [[Digital Universe asset for Supernova Remnants.]], 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/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index c92b5a00f3..64222fcf54 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -54,7 +54,23 @@ local tullyPoints = { }, GUI = { Name = "Tully Galaxies", - Path = "/Universe/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 + 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)]] } } @@ -83,7 +99,17 @@ local tullyImages = { }, GUI = { Name = "Tully Galaxies Images", - Path = "/Universe/Galaxies" + 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)]] } } @@ -94,30 +120,8 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages } asset.meta = { Name = "Tully Galaxies", Version = "3.0", - 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 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.

- Galaxy images. 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)]], + Description = [[Digital Universe asset for Tully Galaxies, including point cloud and + images.]], 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 c297ec0fd0..7c5814cb47 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -27,15 +27,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 + 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]] } } diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index eedc15659b..73d63828c9 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -48,7 +48,7 @@ local Earth = { GUI = { Name = "Earth", Path = "/Solar System/Planets/Earth", - Description = "Earth Globe" + Description = "Third rock from the Sun" } } diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index 0296762356..a804c0552c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -29,7 +29,7 @@ local layer = { available from the Visible Infrared Imaging Radiometer Suite (VIIRS) on the joint NASA/NOAA Suomi National Polar orbiting Partnership (Suomi NPP) satellite. The sensor resolution is 750 m at nadir, imagery resolution is 500 m, and the - temporal resolution is daily.]], + temporal resolution is daily. (Description from NASA Worldview)]], } asset.onInitialize(function () @@ -40,12 +40,12 @@ asset.export("layer", layer) asset.meta = { - Name = "Earth at Night 2012", + Name = "Earth at Night (Temporal)", Version = "1.0", - Description = [[May layer for earth with daily night image. This layer is a GIBS + Description = [[Temporal layer for earth with daily night image. This layer is a GIBS hosted layer created with openspace.globebrowsing.createTemporalGibsGdalXml ]], Author = "OpenSpace Team", - URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", + URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", License = "NASA", Identifiers = "Earth_at_Night_Temporal" } \ No newline at end of file diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index ecdb0faae0..63d785dcbc 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -3,7 +3,7 @@ asset.require('./static_server') local guiCustomization = asset.require('customization/gui') -- Select which commit hashes to use for the frontend and backend -local frontendHash = "e520f14d3fffc915b7b900f4fc6d888070f458c4" +local frontendHash = "d85b4022813caafb0fdde18bea2c2f51768816fa" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ From 0f667685daeb897ed82184594b44a16285e2ef1e Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 9 Oct 2020 16:28:22 -0400 Subject: [PATCH 10/12] update for modelgeometry; fix for pioneer sync --- data/assets/examples/globetranslation.asset | 8 +- .../missions/apollo/11/apollo11.asset | 12 +- .../solarsystem/missions/apollo/11/lem.asset | 4 +- .../missions/apollo/15/apollo15.asset | 4 +- .../missions/apollo/17/bouldersstation2.asset | 12 +- .../missions/apollo/17/bouldersstation6.asset | 12 +- .../missions/apollo/17/bouldersstation7.asset | 4 +- .../solarsystem/missions/apollo/17/lem.asset | 4 +- .../solarsystem/missions/dawn/dawn.asset | 12 +- .../solarsystem/missions/dawn/vesta.asset | 4 +- .../solarsystem/missions/gaia/gaia.asset | 4 +- .../solarsystem/missions/insight/edl.asset | 124 +++++----- .../solarsystem/missions/juno/juno.asset | 4 +- .../missions/messenger/messengerSC.asset | 20 +- .../missions/newhorizons/label.asset | 4 +- .../missions/newhorizons/model.asset | 4 +- .../missions/osirisrex/bennu.asset | 4 +- .../missions/osirisrex/model.asset | 12 +- .../missions/perseverance/model.asset | 220 +++++++++--------- .../missions/pioneer/pioneer10.asset | 17 +- .../missions/pioneer/pioneer11.asset | 17 +- .../missions/pioneer/pioneermodel.asset | 23 ++ .../solarsystem/missions/rosetta/67p.asset | 4 +- .../missions/rosetta/rosetta.asset | 52 ++--- .../missions/voyager/voyager1.asset | 4 +- .../missions/voyager/voyager2.asset | 4 +- data/assets/util/asset_helper.asset | 4 +- 27 files changed, 297 insertions(+), 300 deletions(-) create mode 100644 data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset index 4f400883bd..3345e68fe7 100644 --- a/data/assets/examples/globetranslation.asset +++ b/data/assets/examples/globetranslation.asset @@ -32,11 +32,11 @@ local Example_Fixed_Height = { Renderable = { Type = "RenderableModel", Body = "NEW HORIZONS", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/NewHorizonsCleanModel.obj", ColorTexture = textures .. "/NHTexture.jpg" - } + }} }, GUI = { Path = "/Example" @@ -57,11 +57,11 @@ local Example_Adaptive_Height = { Renderable = { Type = "RenderableModel", Body = "NEW HORIZONS", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/NewHorizonsCleanModel.obj", ColorTexture = textures .. "/NHTexture.jpg" - } + }} }, GUI = { Path = "/Example" diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset index 8fa2acf516..e408e51389 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset @@ -56,11 +56,11 @@ local Apollo11Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj", ColorTexture = models .. "/gray.png" - }, + }}, LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) }, GUI = { @@ -175,11 +175,11 @@ local Apollo11LemDescentModel = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = lem_model.modelFolder .. "/lmremoved.obj", ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg" - }, + }}, SpecularIntensity = 0.0, RotationVector = { 273.750,28.0,309.85 }, LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) @@ -205,11 +205,11 @@ local Apollo11LemLandedModel = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg" - }, + }}, SpecularIntensity = 0.0, RotationVector = { 273.750,28.0,309.85 }, LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset index 5186ed9057..24f630ca96 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset @@ -36,11 +36,11 @@ local Apollo11LemModel = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj", ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg" - }, + }}, RotationVector = { 91.044090,171.229706,111.666664 }, LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) }, diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 584a064313..560aac5cb7 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -63,12 +63,12 @@ local Apollo15 = { -- Parent = Apollo15.Identifier, -- Renderable = { -- Type = "RenderableModel", --- Geometry = { +-- Geometry = {{ -- Type = "MultiModelGeometry", -- -- GeometryFile = models .. "/Apollo_Spacecraft.obj" -- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj", -- ColorTexture = models .. "/gray.png" --- }, +-- }}, -- LightSources = LightSources, -- DisableFaceCulling = true -- }, diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset index e14c5e7566..343b6859ff 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset @@ -47,11 +47,11 @@ local Station2Boulder1Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/b1-v2.obj", ColorTexture = models .. "/b1-v2_u1_v1.jpeg" - }, + }}, RotationVector = { 243.243256 ,206.270264, 309.677429 }, LightSources = LightSources, PerformShading = false, @@ -93,11 +93,11 @@ local Station2Boulder2Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/b2model.obj", ColorTexture = models .. "/b2model_u1_v1.jpeg" - }, + }}, RotationVector = { 66.162155, 7.783780, 114.193550 }, LightSources = LightSources, PerformShading = false, @@ -139,11 +139,11 @@ local Station2Boulder3Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/b3model.obj", ColorTexture = models .. "/b3model_u1_v1.jpeg" - }, + }}, RotationVector = { 161.513519 ,243.243256, 65.806450 }, LightSources = LightSources, PerformShading = false, diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset index 828c2b039b..54dd555a22 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset @@ -58,11 +58,11 @@ local Station6Frag1Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/A17-S6-frag1.obj", ColorTexture = models .. "/A17-S6-frag1.png" - }, + }}, RotationVector = { 235.909088,165.000000,286.299194 }, LightSources = LightSources, PerformShading = false, @@ -105,11 +105,11 @@ local Station6Frag2Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/station6_boulder_frag2.obj", ColorTexture = models .. "/frag2crop_u1_v1.jpeg" - }, + }}, RotationVector = { 336.959991,210.239990,325.984253 }, LightSources = LightSources, PerformShading = false, @@ -140,11 +140,11 @@ local Station6Frag3Model = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/station6_boulder_frag3.obj", ColorTexture = models .. "/frag3crop_u1_v1.jpeg" - }, + }}, RotationVector = { 293.181824,255.000000,4.090910 }, LightSources = LightSources, PerformShading = false, diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset index 6385768d1d..f15fc34f93 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset @@ -47,11 +47,11 @@ local Station7BoulderModel = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/b7model.obj", ColorTexture = models .. "/b7model_u1_v1.jpeg" - }, + }}, RotationVector = { 1.945950,274.378387,212.903214 }, LightSources = LightSources, PerformShading = false, diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset index 9c901a59a2..84455792ef 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset @@ -34,11 +34,11 @@ local Apollo17LemModel = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj", ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg" - }, + }}, SpecularIntensity = 0.0, RotationVector = { 110.255219,171.229706,126.666664 }, LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier) diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index 5fefe46052..d1c5faffd9 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -650,11 +650,11 @@ local Dawn = { Renderable = { Type = "RenderableModel", Body = "DAWN", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/mainbodydawn.obj", ColorTexture = textures .. "/gray.png" - }, + }}, LightSources = LightSources }, GUI = { @@ -682,11 +682,11 @@ local DawnSolarArray1 = { Renderable = { Type = "RenderableModel", Body = "DAWN", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/solarpanelleft.obj", ColorTexture = textures .. "/gray.png" - }, + }}, LightSources = LightSources }, GUI = { @@ -713,11 +713,11 @@ local DawnSolarArray2 = { Renderable = { Type = "RenderableModel", Body = "DAWN", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/solarpanelright.obj", ColorTexture = textures .. "/gray.png" - }, + }}, LightSources = LightSources }, GUI = { diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 2d555b6834..6e10d8c818 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -45,11 +45,11 @@ local Vesta = { }, Renderable = { Type = "RenderableModelProjection", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/VestaComet_5000.obj", ColorTexture = textures .. "/dummy.jpg" - }, + }}, BoundingSphereRadius = 10.0, Projection = { Sequence = images, diff --git a/data/assets/scene/solarsystem/missions/gaia/gaia.asset b/data/assets/scene/solarsystem/missions/gaia/gaia.asset index 55de00a894..2fe536e223 100644 --- a/data/assets/scene/solarsystem/missions/gaia/gaia.asset +++ b/data/assets/scene/solarsystem/missions/gaia/gaia.asset @@ -39,11 +39,11 @@ local Gaia = { Renderable = { Type = "RenderableModel", Body = "GAIA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = model .. "/gaia.obj", ColorTexture = textures .. "/gaia-baked.png" - }, + }}, LightSources = { { Type = "SceneGraphLightSource", diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset index 62552b57f7..09b3f11358 100644 --- a/data/assets/scene/solarsystem/missions/insight/edl.asset +++ b/data/assets/scene/solarsystem/missions/insight/edl.asset @@ -167,11 +167,11 @@ local Insight_Entry_CapsuleA = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj", ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -192,11 +192,11 @@ local Insight_Entry_Capsule_Ring = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj", ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -217,11 +217,11 @@ local Insight_Entry_Capsule_Plugs = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj", ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -242,11 +242,11 @@ local Insight_Entry_Heatshield = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj", ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -267,11 +267,11 @@ local Insight_Parachute_0 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj", ColorTexture = models_chutes .. "/chute_diff.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -292,11 +292,11 @@ local Insight_Parachute_Cords_0 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj", ColorTexture = models_chutes .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -317,11 +317,11 @@ local Insight_Parachute_20 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj", ColorTexture = models_chutes .. "/chute_diff.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -342,11 +342,11 @@ local Insight_Parachute_Cords_20 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj", ColorTexture = models_chutes .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -367,11 +367,11 @@ local Insight_Parachute_40 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj", ColorTexture = models_chutes .. "/chute_diff.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -392,11 +392,11 @@ local Insight_Parachute_Cords_40 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj", ColorTexture = models_chutes .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -417,11 +417,11 @@ local Insight_Lander_A001 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -442,11 +442,11 @@ local Insight_Lander_A002 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -467,11 +467,11 @@ local Insight_Lander_A003 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -492,11 +492,11 @@ local Insight_Lander_A004 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -517,11 +517,11 @@ local Insight_Lander_A005 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -542,11 +542,11 @@ local Insight_Lander_A006 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -567,11 +567,11 @@ local Insight_Lander_A007 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -592,11 +592,11 @@ local Insight_Lander_A008 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -617,11 +617,11 @@ local Insight_Lander_foil1 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj", ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -642,11 +642,11 @@ local Insight_Lander_Tex01 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -667,11 +667,11 @@ local Insight_Lander_Tex02 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj", ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -692,11 +692,11 @@ local Insight_Legs_Stowed_tex = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj", ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -717,11 +717,11 @@ local Insight_Legs_Stowed_AO06 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj", ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -742,11 +742,11 @@ local Insight_Legs_Deployed_tex = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj", ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -767,11 +767,11 @@ local Insight_Legs_Deployed_AO06 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj", ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -792,11 +792,11 @@ local Insight_Panels_Stowed_tex = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj", ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -817,11 +817,11 @@ local Insight_Panels_Stowed_tex2 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj", ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -842,11 +842,11 @@ local Insight_Panels_Stowed_AO01 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj", ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -867,11 +867,11 @@ local Insight_Panels_Deployed_tex = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj", ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -892,11 +892,11 @@ local Insight_Panels_Deployed_tex2 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj", ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, @@ -917,11 +917,11 @@ local Insight_Panels_Deployed_AO06 = { Parent = Insight.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj", ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources, }, diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 7f3d8412c3..99b8952964 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -157,11 +157,11 @@ local Juno = { }, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = model .. "/Juno.obj", ColorTexture = textures .. "/gray.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) }, diff --git a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset index f78d1f3655..8d3ac248ce 100644 --- a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset +++ b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset @@ -92,11 +92,11 @@ local MessengerProbeBlack = { Parent = Messenger.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MessengerProbe_black.obj", ColorTexture = models .. "/Tex_black.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -111,11 +111,11 @@ local MessengerProbeFoil = { Parent = Messenger.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MessengerProbe_foil.obj", ColorTexture = models .. "/foil_n2.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -130,11 +130,11 @@ local MessengerProbeHeatShield = { Parent = Messenger.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MessengerProbe_heatShield.obj", ColorTexture = models .. "/AO_heatshield4.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -149,11 +149,11 @@ local MessengerProbeMetal = { Parent = Messenger.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MessengerProbe_metal.obj", ColorTexture = models .. "/Tex_grey.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -169,11 +169,11 @@ local MessengerProbePanels = { Parent = Messenger.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MessengerProbe_panels.obj", ColorTexture = models .. "/Messenger_tex.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset index 69267f9f5f..e436c35923 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset @@ -14,11 +14,11 @@ local Labels = { Renderable = { Type = "RenderableModel", Body = "NEW HORIZONS", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/Labels.obj", ColorTexture = textures .. "/labels.png" - }, + }}, AmbientIntensity = 0.8 }, GUI = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset index b5b95ba870..3eb175e145 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset @@ -22,11 +22,11 @@ local NewHorizons = { Renderable = { Type = "RenderableModel", Body = "NEW HORIZONS", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/NewHorizonsCleanModel.obj", ColorTexture = textures .. "/NHTexture.jpg" - }, + }}, AmbientIntensity = 0.0, DiffuseIntensity = 1.0, SpecularIntensity = 1.0, diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index c6c5856413..151d9db4d1 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -34,11 +34,11 @@ local Bennu = { Renderable = { Type = "RenderableModelProjection", Body = BENNU_BODY, - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/BennuTextured.obj", ColorTexture = textures .. "/gray.png" - }, + }}, Projection = { Sequence = asset.localResource('InstrumentTimes'), SequenceType = "instrument-times", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index b383470092..d77740400b 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -216,11 +216,11 @@ local OsirisRex = { Renderable = { Type = "RenderableModel", Body = "OSIRIS-REX", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj", ColorTexture = textures .. "/osirisTex.png" - }, + }}, LightSources = LightSources }, GUI = { @@ -246,11 +246,11 @@ local PolyCam = { Renderable = { Type = "RenderableModel", Body = "OSIRIS-REX", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj", ColorTexture = textures .. "/osirisTex.png" - }, + }}, LightSources = LightSources }, GUI = { @@ -265,11 +265,11 @@ local Rexis = { Renderable = { Type = "RenderableModel", Body = "OSIRIS-REX", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj", ColorTexture = textures .. "/osirisTex.png" - }, + }}, LightSources = LightSources }, Transform = { diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset index 95554d5a6e..37fae9f463 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/model.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset @@ -61,11 +61,11 @@ local Body = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_1.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false, }, @@ -83,11 +83,11 @@ local Body_detail = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false, }, @@ -104,11 +104,11 @@ local Body_staticParts_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_2.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -124,11 +124,11 @@ local Body_staticParts_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_3.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -144,11 +144,11 @@ local Body_staticParts_3 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_4.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -164,11 +164,11 @@ local Body_staticParts_4 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_5.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -184,11 +184,11 @@ local Body_staticParts_5 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_BODY_new_A0.obj", ColorTexture = textures .. "/parts_AO.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -205,11 +205,11 @@ local RA_Shoulder_AZ = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -225,11 +225,11 @@ local RA_Shoulder_AZ_detail_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -245,11 +245,11 @@ local RA_Shoulder_AZ_detail_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -266,11 +266,11 @@ local RA_Shoulder_EL_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -287,11 +287,11 @@ local RA_Shoulder_EL_detail_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -307,11 +307,11 @@ local RA_Shoulder_EL_detail_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -329,11 +329,11 @@ local RA_Shoulder_EL_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -350,11 +350,11 @@ local RA_Elbow_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_ELBOW_1.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -370,11 +370,11 @@ local RA_Elbow_detail_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj", ColorTexture = textures .. "/tex_04.png", - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -390,11 +390,11 @@ local RA_Elbow_detail_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -411,11 +411,11 @@ local RA_Elbow_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_ELBOW_2.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -433,11 +433,11 @@ local RA_Wrist = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -453,11 +453,11 @@ local RA_Wrist_details = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -474,11 +474,11 @@ local RA_Turret = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -495,11 +495,11 @@ local RA_Turret_details_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -515,11 +515,11 @@ local RA_Turret_details_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -536,11 +536,11 @@ local RSM_root = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RSM_ROOT.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -556,11 +556,11 @@ local RSM_AZ = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RSM_AZ.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -576,11 +576,11 @@ local RSM_EL = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_RSM_EL.obj", ColorTexture = textures .. "/tex_04.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -597,11 +597,11 @@ local HGA_AZ = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -617,11 +617,11 @@ local HGA_EL = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_HGA_EL.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -638,11 +638,11 @@ local SAM_Cover_1 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj", ColorTexture = textures .. "/MSLTextureTest.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -658,11 +658,11 @@ local SAM_Cover_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj", ColorTexture = textures .. "/MSLTextureTest.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -678,11 +678,11 @@ local CHEMIN_Bottom = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_CHEMIN.obj", ColorTexture = textures .. "/MSLTextureTest.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -699,11 +699,11 @@ local Wheel_Base = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_BASE.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -718,11 +718,11 @@ local Wheel_Base_2 = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -739,11 +739,11 @@ local Wheel_Leg_1_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -759,11 +759,11 @@ local Wheel_Leg_1A_L_detail = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -779,11 +779,11 @@ local Wheel_Leg_1B_L_detail = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -799,11 +799,11 @@ local Wheel_Leg_2_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -819,11 +819,11 @@ local Wheel_Wrist_F_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -839,11 +839,11 @@ local Wheel_Wrist_hub_F_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -859,11 +859,11 @@ local Wheel_F_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_L.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -879,11 +879,11 @@ local Wheel_C_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_L.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -899,11 +899,11 @@ local Wheel_Wrist_B_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -919,11 +919,11 @@ local Wheel_Wrist_hub_B_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false, }, @@ -940,11 +940,11 @@ local Wheel_B_L = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_L.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -961,11 +961,11 @@ local Wheel_Leg_1_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -981,11 +981,11 @@ local Wheel_Leg_1A_R_detail = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1001,11 +1001,11 @@ local Wheel_Leg_1B_R_detail = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj", ColorTexture = textures .. "/tex_05.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1021,11 +1021,11 @@ local Wheel_Leg_2_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1041,12 +1041,12 @@ local Wheel_Wrist_F_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj", --GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1062,11 +1062,11 @@ local Wheel_Wrist_hub_F_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj", ColorTexture = textures .. "/tex_02.png", - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1082,11 +1082,11 @@ local Wheel_F_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_R.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1102,11 +1102,11 @@ local Wheel_C_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_R.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1122,11 +1122,11 @@ local Wheel_Wrist_B_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1142,11 +1142,11 @@ local Wheel_Wrist_hub_B_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj", ColorTexture = textures .. "/tex_02.png" - }, + }}, LightSources = LightSources, PerformShading = false }, @@ -1162,11 +1162,11 @@ local Wheel_B_R = { Renderable = { Type = "RenderableModel", Body = "MARS SCIENCE LABORATORY", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/MSL_WHEEL_R.obj", ColorTexture = textures .. "/tex_03.png" - }, + }}, LightSources = LightSources, PerformShading = false }, diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset index 04d9cab085..f76730f83c 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset @@ -1,12 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') +local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel") -local modelFolder = asset.syncedResource({ - Name = "Pioneer 10/11 Models", - Type = "HttpSynchronization", - Identifier = "pioneer_10_11_model", - Version = 2 -}) local kernelsFolder = asset.syncedResource({ Name = "Pioneer Kernels", @@ -30,15 +25,7 @@ local Pioneer10 = { Kernels = kernelsList }, }, - Renderable = { - Type = "RenderableModel", - Geometry = { - Type = "MultiModelGeometry", - GeometryFile = modelFolder .. "/Pioneer.obj", - ColorTexture = modelFolder .. "/gray.png" - }, - LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) - }, + Renderable = model.PioneerModel, GUI = { Name = "Pioneer 10", Path = "/Solar System/Missions/Pioneer/10" diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset index def3eeacc5..5e69367ae1 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset @@ -1,12 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') +local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel") -local modelFolder = asset.syncedResource({ - Name = "Pioneer 10/11 Models", - Type = "HttpSynchronization", - Identifier = "pioneer_10_11_model", - Version = 2 -}) local kernelsFolder = asset.syncedResource({ Name = "Pioneer Kernels", @@ -33,15 +28,7 @@ local Pioneer11 = { Kernels = kernelsList }, }, - Renderable = { - Type = "RenderableModel", - Geometry = { - Type = "MultiModelGeometry", - GeometryFile = modelFolder .. "/Pioneer.obj", - ColorTexture = modelFolder .. "/gray.png" - }, - LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier) - }, + Renderable = model.PioneerModel, GUI = { Name = "Pioneer 11", Path = "/Solar System/Missions/Pioneer/11" diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset new file mode 100644 index 0000000000..abb8a49cc9 --- /dev/null +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset @@ -0,0 +1,23 @@ +local assetHelper = asset.require('util/asset_helper') + + +local modelFolder = asset.syncedResource({ + Name = "Pioneer 10/11 Models", + Type = "HttpSynchronization", + Identifier = "pioneer_10_11_model", + Version = 2 +}) + +local ModelRenderable = { + Type = "RenderableModel", + Geometry = {{ + Type = "MultiModelGeometry", + GeometryFile = modelFolder .. "/Pioneer.obj", + ColorTexture = modelFolder .. "/gray.png" + }}, + LightSources = assetHelper.getDefaultLightSources( + sunTransforms.SolarSystemBarycenter.Identifier + ) +} + +asset.export("PioneerModel", ModelRenderable) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index fd9d09ff50..d3d6405208 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -54,11 +54,11 @@ local Comet67P = { }, Renderable = { Type = "RenderableModelProjection", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/67P_rotated_5_130.obj", ColorTexture = textures .. "/gray.jpg" - }, + }}, Projection = { Sequence = { imagesDestination }, SequenceType = "image-sequence", diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 8b29ea4180..a910a9d7f3 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -138,11 +138,11 @@ local RosettaBlackFoil = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/black_foil.obj", ColorTexture = textures .. "/foil_silver_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -158,11 +158,11 @@ local RosettaBlackParts = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/black_parts.obj", ColorTexture = textures .. "/foil_silver_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -178,11 +178,11 @@ local RosettaDish = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/dish.obj", ColorTexture = textures .. "/dish_AO.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -198,11 +198,11 @@ local RosettaParts = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/parts.obj", ColorTexture = textures .. "/parts2_AO.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -218,11 +218,11 @@ local RosettaSilverFoil = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/silver_foil.obj", ColorTexture = textures .. "/foil_silver_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -238,11 +238,11 @@ local RosettaVents = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/vents.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -258,11 +258,11 @@ local RosettaWingA = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .."/wingA.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -278,11 +278,11 @@ local RosettaWingB = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/wingB.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -298,11 +298,11 @@ local RosettaYellowFoil = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/yellow_foil.obj", ColorTexture = textures .. "/foil_gold_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -347,11 +347,11 @@ local PhilaeFoil = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/lander_foil.obj", ColorTexture = textures .. "/foil_silver_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -367,11 +367,11 @@ local PhilaeLids = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/lander_lids.obj", ColorTexture = textures .. "/parts2_AO.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -387,11 +387,11 @@ local PhilaeParts = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/lander_parts.obj", ColorTexture = textures .. "/foil_silver_ramp.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, @@ -407,11 +407,11 @@ local PhilaeSolarPanels = { Renderable = { Type = "RenderableModel", Body = "ROSETTA", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/lander_solarp.obj", ColorTexture = textures .. "/tex_01.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index 6cd6ba65ba..d812c7c4da 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -80,11 +80,11 @@ local Voyager1Main = { Parent = Voyager1.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/voyager-main.obj", ColorTexture = models .. "/voyager-main.jpg" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 1e179753dd..ba066da0c2 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -102,11 +102,11 @@ local Voyager2Antenna = { Parent = Voyager2.Identifier, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/voyager-antenna.obj", ColorTexture = models .. "/voyager-antenna.png" - }, + }}, ModelTransform = RotationMatrix, LightSources = LightSources }, diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index 24009580c4..c171b6f3ca 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -165,11 +165,11 @@ local createModelPart = function (parent, sunLightSourceNode, models, geometry, Parent = parent, Renderable = { Type = "RenderableModel", - Geometry = { + Geometry = {{ Type = "MultiModelGeometry", GeometryFile = models .. "/" .. geometry .. ".obj", ColorTexture = models .. "/" .. texture - }, + }}, LightSources = lightSources, PerformShading = performShading, DisableFaceCulling = true From 607d008cbf0d9aaf40b7c60af21384fe2fcd6c7b Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 10 Oct 2020 12:20:45 +0200 Subject: [PATCH 11/12] Fixing newlines at the end of files --- data/assets/scene/digitaluniverse/2mass.asset | 2 +- .../constellations/constellation_keybinds.asset | 2 +- .../dwarf_planets/pluto/charon/default_layers.asset | 2 +- .../charon/layers/colorlayers/greyscale_usgs.asset | 2 +- .../solarsystem/dwarf_planets/pluto/kernels.asset | 2 +- .../solarsystem/missions/pioneer/pioneermodel.asset | 2 +- .../scene/solarsystem/planets/earth/atmosphere.asset | 2 +- .../solarsystem/planets/earth/default_layers.asset | 2 +- .../planets/earth/layers/colorlayers/bmng_sweden.asset | 2 +- .../planets/earth/layers/colorlayers/bmng_utah.asset | 2 +- .../earth/layers/colorlayers/esri_viirs_combo.asset | 2 +- .../earth/layers/colorlayers/esri_world_imagery.asset | 2 +- .../layers/colorlayers/fallbacks/blue_marble.asset | 2 +- ...sst_l4_g1sst_sea_surface_temperature_temporal.asset | 2 +- ...hrsst_l4_mur_sea_surface_temperature_temporal.asset | 2 +- .../modis_terra_chlorophyll_a_temporal.asset | 2 +- .../layers/colorlayers/terra_modis_temporal.asset | 2 +- .../earth/layers/colorlayers/viirs_snpp_temporal.asset | 2 +- .../earth/layers/nightlayers/earth_at_night_2012.asset | 2 +- .../layers/nightlayers/earth_at_night_temporal.asset | 2 +- .../nightlayers/fallbacks/earth_night_texture.asset | 2 +- .../solarsystem/planets/earth/moon/moon_labels.asset | 2 +- .../planets/jupiter/callisto/default_layers.asset | 2 +- .../solarsystem/planets/jupiter/default_layers.asset | 2 +- .../planets/jupiter/europa/default_layers.asset | 2 +- .../layers/colorlayers/voyager_global_mosaic.asset | 1 - .../planets/jupiter/ganymede/default_layers.asset | 2 +- .../planets/jupiter/io/default_layers.asset | 2 +- .../scene/solarsystem/planets/jupiter/kernels.asset | 2 +- .../planets/jupiter/minor/carme_group.asset | 1 - .../scene/solarsystem/planets/mars/atmosphere.asset | 2 +- .../solarsystem/planets/mars/default_layers.asset | 2 +- .../planets/mars/layers/colorlayers/HiRISE.asset | 2 -- .../mars/layers/colorlayers/moc_wa_color_liu.asset | 1 - .../mars/layers/colorlayers/moc_wa_color_utah.asset | 2 -- .../mars/layers/colorlayers/mola_hrsc_sweden.asset | 2 +- .../mars/layers/colorlayers/mola_hrsc_utah.asset | 2 +- .../layers/colorlayers/mola_pseudo_color_sweden.asset | 1 - .../layers/colorlayers/mola_pseudo_color_utah.asset | 1 - .../mars/layers/colorlayers/viking_mdim_sweden.asset | 1 - .../solarsystem/planets/mercury/default_layers.asset | 2 +- .../solarsystem/planets/neptune/default_layers.asset | 2 +- .../solarsystem/planets/neptune/inner_moons.asset | 2 +- .../planets/neptune/irregular_prograde_moons.asset | 4 ++-- .../planets/neptune/irregular_retrograde_moons.asset | 2 +- .../scene/solarsystem/planets/neptune/kernels.asset | 3 ++- .../planets/saturn/dione/default_layers.asset | 2 +- .../scene/solarsystem/planets/saturn/dione/trail.asset | 2 +- .../planets/saturn/enceladus/default_layers.asset | 2 +- .../solarsystem/planets/saturn/enceladus/trail.asset | 2 +- .../solarsystem/planets/saturn/hyperion/trail.asset | 2 +- .../planets/saturn/iapetus/default_layers.asset | 2 +- .../solarsystem/planets/saturn/iapetus/trail.asset | 2 +- .../scene/solarsystem/planets/saturn/kernels.asset | 2 +- .../planets/saturn/mimas/default_layers.asset | 2 +- .../scene/solarsystem/planets/saturn/mimas/trail.asset | 2 +- .../solarsystem/planets/saturn/minor/other_group.asset | 2 +- .../scene/solarsystem/planets/saturn/rhea/trail.asset | 2 +- .../scene/solarsystem/planets/uranus/inner_moons.asset | 2 +- .../planets/uranus/irregular_prograde_moons.asset | 2 +- .../planets/uranus/irregular_retrograde_moons.asset | 2 +- .../scene/solarsystem/planets/uranus/kernels.asset | 2 +- .../scene/solarsystem/planets/uranus/major_moons.asset | 2 +- data/assets/scene/solarsystem/sssb/amor_asteroid.asset | 2 +- .../scene/solarsystem/sssb/apollo_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/aten_asteroid.asset | 2 +- .../assets/scene/solarsystem/sssb/atira_asteroid.asset | 2 +- .../scene/solarsystem/sssb/centaur_asteroid.asset | 2 +- .../scene/solarsystem/sssb/chiron-type_comet.asset | 2 +- .../scene/solarsystem/sssb/encke-type_comet.asset | 2 +- .../scene/solarsystem/sssb/halley-type_comet.asset | 2 +- .../solarsystem/sssb/inner_main_belt_asteroid.asset | 2 +- .../scene/solarsystem/sssb/jupiter-family_comet.asset | 2 +- .../solarsystem/sssb/jupiter_trojan_asteroid.asset | 2 +- .../scene/solarsystem/sssb/main_belt_asteroid.asset | 2 +- .../solarsystem/sssb/mars-crossing_asteroid.asset | 2 +- .../solarsystem/sssb/outer_main_belt_asteroid.asset | 2 +- data/assets/scene/solarsystem/sssb/pha.asset | 2 +- data/assets/scene/solarsystem/sssb/swifttuttle.asset | 10 +++++----- .../assets/scene/solarsystem/sssb/tesla_roadster.asset | 5 +++-- .../sssb/transneptunian_object_asteroid.asset | 2 +- openspace.cfg | 2 +- 82 files changed, 82 insertions(+), 90 deletions(-) diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset index 74631e6a09..f852f3a707 100644 --- a/data/assets/scene/digitaluniverse/2mass.asset +++ b/data/assets/scene/digitaluniverse/2mass.asset @@ -61,4 +61,4 @@ asset.meta = { URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe", License = "AMNH Digital Universe", Identifiers = "2MASS" -} \ No newline at end of file +} diff --git a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset index bfc038703c..d976a676da 100644 --- a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset +++ b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset @@ -44,4 +44,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT License" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index fa48f1b2ef..267e9e8494 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset index 003387927a..b27d24046e 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -29,4 +29,4 @@ asset.meta = { URL = "https://astrogeology.usgs.gov/search/map/Charon/NewHorizons/" .. "Charon_NewHorizons_Global_Mosaic_300m_Jul2017", License = "NASA/PDS" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset index 0651499ebf..cead19ee5e 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset @@ -20,4 +20,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset index abb8a49cc9..1903e5bb71 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset @@ -20,4 +20,4 @@ local ModelRenderable = { ) } -asset.export("PioneerModel", ModelRenderable) \ No newline at end of file +asset.export("PioneerModel", ModelRenderable) diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index d71cd4e645..dc4e7e157e 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -114,4 +114,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "EarthAtmosphere" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index 956024a3f0..459913ca3e 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -64,4 +64,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index f35807a566..94f2c838ef 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -24,4 +24,4 @@ asset.meta = { URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", Identifiers = "BMNG_Sweden" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index 87360ed059..d5d737c5a3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -24,4 +24,4 @@ asset.meta = { URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", Identifiers = "BMNG_Utah" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index db522d791f..1d91155ffc 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -56,4 +56,4 @@ asset.meta = { URL = "http://www.openspaceproject.com", License = "MIT License", Identifiers = "ESRI_VIIRS_Combo" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset index 24377003f4..7f9e511ee7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -32,4 +32,4 @@ asset.meta = { URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9", License = "Esri Master License Agreement", Identifiers = "ESRI_World_Imagery" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index cbee4ce00a..1d77344d5a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -19,4 +19,4 @@ asset.meta = { URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", Identifiers = "Blue_Marble" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index e23407d97c..0e4d577f5e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -35,4 +35,4 @@ asset.meta = { "eosdis-components/gibs", License = "NASA", Identifiers = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset index 9f229fee6c..c1e0ba9f84 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -33,4 +33,4 @@ asset.meta = { "eosdis-components/gibs", License = "NASA", Identifiers = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset index 3bde5037d6..32cea1a7e7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -33,4 +33,4 @@ asset.meta = { "eosdis-components/gibs", License = "NASA", Identifiers = "MODIS_Terra_Chlorophyll_A_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index aa01c7d0d0..86a60fa0fa 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -32,4 +32,4 @@ asset.meta = { "eosdis-components/gibs", License = "NASA", Identifiers = "Terra_Modis_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index 63c07cb92c..db531b8e26 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -32,4 +32,4 @@ asset.meta = { "eosdis-components/gibs", License = "NASA", Identifiers = "VIIRS_SNPP_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 10fd9d4570..22f27a259a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -26,4 +26,4 @@ asset.meta = { URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map", License = "NASA", Identifiers = "Earth_at_Night_2012" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset index a804c0552c..8effe06be3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -48,4 +48,4 @@ asset.meta = { URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC", License = "NASA", Identifiers = "Earth_at_Night_Temporal" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index 1336317600..6e0b9579a6 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -17,4 +17,4 @@ asset.meta = { URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble", License = "NASA", Identifiers = "Earth_Night_Texture" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset index 216331e938..543fe45d03 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon_labels.asset @@ -5,4 +5,4 @@ local LabelsPath = asset.syncedResource({ Version = 1 }) -asset.export("LabelsPath", LabelsPath) \ No newline at end of file +asset.export("LabelsPath", LabelsPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset index 1471a20be4..3a25007312 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset index fbe791b64a..90e28e7615 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset index d6ff31fb00..fb98ba0847 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -18,4 +18,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset index 9f0a259b4c..30de152eb3 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -33,4 +33,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "Voyager_Global_Mosaic" } - diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset index fa070a9b66..28575c7e7c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset index a178d71fa0..88ea13de9c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset index dba44a68c1..6509c4929d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -15,4 +15,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index 33c86e016d..094feb72a2 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -274,4 +274,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license" } - diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 47bcb07173..3fa72cf416 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -77,4 +77,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "MarsAtmosphere" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset index 62f24e5f4a..08c7963363 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -46,4 +46,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset index 585f56e3a6..4f3dbb3fbe 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset @@ -21,5 +21,3 @@ asset.meta = { License = "Esri Master License Agreement", Identifiers = "OnMarsHiRISELS" } - - diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset index a918b7c0c8..e9f44a9537 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -35,4 +35,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "MOLA_HRSC_Sweden" } - diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset index 7978ba949b..54a3dab794 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -35,5 +35,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "MOC_WA_Color_Utah" } - - diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset index 070cf6bc61..4c2f156f20 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -26,4 +26,4 @@ asset.meta = { URL = "http://www.openspaceproject.com", License = "NASA/PDS", Identifiers = "MOLA_HRSC_Sweden" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset index eaffac2691..ac48e10230 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -26,4 +26,4 @@ asset.meta = { URL = "http://www.openspaceproject.com", License = "NASA/PDS", Identifiers = "MOLA_HRSC_Sweden" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset index b0c4e876ba..73920dac15 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -39,4 +39,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "MOLA_Pseudo_Color_Sweden" } - diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset index 4c4099949f..3844cc5f09 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -39,4 +39,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "MOLA_Pseudo_Color_Utah" } - diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset index aa8e5ae021..e43878ff1f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -44,4 +44,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "Viking_MDIM_Sweden" } - diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset index 53d468bacb..d815269d83 100644 --- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -53,4 +53,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset index c875d40437..4f16da0714 100644 --- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index 5e83a29bd2..ba5c8eb7ef 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -146,4 +146,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 82dd0c75fe..61581a4e36 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -57,7 +57,7 @@ local irregularProgradeMoons = { Tags = tags, GUI = { Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons" - }, + }, TrailColor = trailColor, OrbitPeriod = 9740.73, Kernels = kernel086 @@ -81,4 +81,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index 612241c8ac..9c2c0ee0c5 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -80,4 +80,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset index e6f155ae1b..588330a97f 100644 --- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset +++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset @@ -10,6 +10,7 @@ asset.export("nep086", Kernels .. '/nep086.bsp') asset.export("nep087", Kernels .. '/nep087.bsp') asset.export("nep088", Kernels .. '/nep088.bsp') + asset.meta = { Name = "Neptune Spice Kernels", Version = "1.0", @@ -17,4 +18,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset index 859c8b4e58..32b2f9c147 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index fdfb63cc43..37e6344f9d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -39,4 +39,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset index 8369a20bae..289882ed7f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -19,4 +19,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index bb22b29067..aaacb70977 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -40,4 +40,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "EnceladusTrail" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index c22d487200..69a3841d9f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -40,4 +40,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "HyperionTrail" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset index b1a5726afd..22bd2e4002 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index 1403fc3903..f6be22d1b7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -40,4 +40,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "IapetusTrail" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset index b0b5ba847c..1b0f0742d9 100644 --- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset index fdad13313f..3521c2beb4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -17,4 +17,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index 5849273109..ce87f56a85 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -40,4 +40,4 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license", Identifiers = "MimasTrail" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index 067649caf6..8758895bdb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -241,4 +241,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index bc7c5092bb..c6fb7bf97a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -39,4 +39,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index 54e0deced1..e720bee54f 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -239,4 +239,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index 6b9d29dc92..a07ee3b8c5 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -44,4 +44,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index da3b314b2d..71c22b3e15 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -158,4 +158,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset index 9c196b1985..6b29d5d058 100644 --- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -16,4 +16,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/", License = "NASA" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 8fc9854302..4075473142 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -108,4 +108,4 @@ asset.meta = { Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset index eec5e1119d..bf980397b7 100644 --- a/data/assets/scene/solarsystem/sssb/amor_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/amor_asteroid.asset @@ -26,4 +26,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]], Identifiers = "sssb_sssb_data_amor_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset index 2991a1e421..ba7fe9c9e6 100644 --- a/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/apollo_asteroid.asset @@ -26,4 +26,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_apollo_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset index 03e920247e..cba5c40e93 100644 --- a/data/assets/scene/solarsystem/sssb/aten_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/aten_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_aten_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset index fbeb92d10d..bc7cd92e66 100644 --- a/data/assets/scene/solarsystem/sssb/atira_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/atira_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]], Identifiers = "sssb_sssb_data_atira_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset index 0381a2f176..ab7d80067d 100644 --- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_centaur_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset index a29fa7b131..dd1aa61d3a 100644 --- a/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/chiron-type_comet.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_chiron-type_comet" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset index ea4e3a8b1c..b3516e4e91 100644 --- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_encke-type_comet" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset index 193ee90a80..cfbe090cbe 100644 --- a/data/assets/scene/solarsystem/sssb/halley-type_comet.asset +++ b/data/assets/scene/solarsystem/sssb/halley-type_comet.asset @@ -26,4 +26,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_halley-type_comet" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset index c177f130a4..c28f479795 100644 --- a/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_inner_main_belt_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset index ec905e30dc..a2bbe595ff 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_jupiter-family_comet" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset index ca3ad69849..f272d92e68 100644 --- a/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_jupiter_trojan_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset index de5c6a8394..4535fb686b 100644 --- a/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset @@ -28,4 +28,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_main_belt_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset index aa3b02579e..7da4f37d64 100644 --- a/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset @@ -27,4 +27,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_mars-crossing_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index 29b4744293..3044e4f78e 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -33,4 +33,4 @@ asset.meta = { All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_outer_main_belt_asteroid" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/pha.asset b/data/assets/scene/solarsystem/sssb/pha.asset index d3cb1148b2..fec3d582b9 100644 --- a/data/assets/scene/solarsystem/sssb/pha.asset +++ b/data/assets/scene/solarsystem/sssb/pha.asset @@ -32,4 +32,4 @@ asset.meta = { NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws.]], Identifiers = "sssb_sssb_data_pha" -} \ No newline at end of file +} diff --git a/data/assets/scene/solarsystem/sssb/swifttuttle.asset b/data/assets/scene/solarsystem/sssb/swifttuttle.asset index f4040b048a..142f26b84e 100644 --- a/data/assets/scene/solarsystem/sssb/swifttuttle.asset +++ b/data/assets/scene/solarsystem/sssb/swifttuttle.asset @@ -43,6 +43,11 @@ local SwiftTuttlePosition = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { + SwiftTuttlePosition, SwiftTuttleTrail +}) + + asset.meta = { Name = "Swift Tuttle", Version = "1.0", @@ -55,8 +60,3 @@ asset.meta = { under the U.S. and Foreign Copyright Laws."]], Identifiers = "SwiftTuttlePosition,SwiftTuttleTrail" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { - SwiftTuttlePosition, SwiftTuttleTrail -}) diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset index 1eb5993f6c..caa5f90f2c 100644 --- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset +++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset @@ -46,6 +46,9 @@ local TeslaPosition = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadsterTrail }) + + asset.meta = { Name = "Tesla Roadster", Version = "1.0", @@ -58,5 +61,3 @@ asset.meta = { under the U.S. and Foreign Copyright Laws.]], Identifiers = "TeslaPosition,TeslaRoadsterTrail" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { TeslaPosition, TeslaRoadsterTrail }) diff --git a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset index ba951fbb60..d458ca2591 100644 --- a/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset @@ -35,4 +35,4 @@ asset.meta = { NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]], Identifiers = "sssb_sssb_data_transneptunian_object_asteroid" -} \ No newline at end of file +} diff --git a/openspace.cfg b/openspace.cfg index e3775e2316..6a6405b674 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -191,7 +191,7 @@ GlobalRotation = { 0.0, 0.0, 0.0 } MasterRotation = { 0.0, 0.0, 0.0 } ScreenSpaceRotation = { 0.0, 0.0, 0.0 } -RenderingMethod = "Framebuffer" -- alternative: "ABuffer" +RenderingMethod = "Framebuffer" OpenGLDebugContext = { Activate = false, FilterIdentifier = { From 2a122f9751103bc7f9f0cdb8d71240c5f8c34b20 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 10 Oct 2020 12:50:38 +0200 Subject: [PATCH 12/12] Some more cleanup of empty lines --- .../scene/digitaluniverse/alternatestarlabels.asset | 1 + data/assets/scene/digitaluniverse/clusters.asset | 2 -- .../scene/digitaluniverse/constellationbounds.asset | 2 -- data/assets/scene/digitaluniverse/constellations.asset | 2 -- data/assets/scene/digitaluniverse/dwarfs.asset | 2 -- data/assets/scene/digitaluniverse/exoplanets.asset | 1 - data/assets/scene/digitaluniverse/globularclusters.asset | 2 -- data/assets/scene/digitaluniverse/groups.asset | 2 -- data/assets/scene/digitaluniverse/h2regions.asset | 2 -- data/assets/scene/digitaluniverse/kepler.asset | 2 -- data/assets/scene/digitaluniverse/localdwarfs.asset | 2 -- data/assets/scene/digitaluniverse/milkyway.asset | 1 - data/assets/scene/digitaluniverse/milkyway_label.asset | 2 -- data/assets/scene/digitaluniverse/milkyway_sphere.asset | 1 - data/assets/scene/digitaluniverse/obassociations.asset | 2 -- data/assets/scene/digitaluniverse/openclusters.asset | 2 -- data/assets/scene/digitaluniverse/planetarynebulae.asset | 2 -- data/assets/scene/digitaluniverse/pulsars.asset | 2 -- data/assets/scene/digitaluniverse/quasars.asset | 2 -- data/assets/scene/digitaluniverse/sdss.asset | 2 -- data/assets/scene/digitaluniverse/starlabels.asset | 2 -- data/assets/scene/digitaluniverse/superclusters.asset | 2 -- .../assets/scene/digitaluniverse/supernovaremnants.asset | 2 -- data/assets/scene/digitaluniverse/tully.asset | 1 - data/assets/scene/digitaluniverse/voids.asset | 2 -- .../milkyway/constellations/constellation_keybinds.asset | 1 + data/assets/scene/milkyway/milkyway/eso.asset | 2 -- data/assets/scene/milkyway/milkyway/volume.asset | 1 + .../scene/milkyway/objects/orionnebula/cluster.asset | 1 + .../scene/milkyway/objects/orionnebula/nebula.asset | 1 + data/assets/scene/milkyway/stars/denver.asset | 6 +++--- .../solarsystem/dwarf_planets/pluto/charon/charon.asset | 2 -- .../dwarf_planets/pluto/charon/charon_trail.asset | 2 -- .../scene/solarsystem/dwarf_planets/pluto/kernels.asset | 1 + .../solarsystem/dwarf_planets/pluto/minor/hydra.asset | 2 -- .../solarsystem/dwarf_planets/pluto/minor/kerberos.asset | 2 -- .../solarsystem/dwarf_planets/pluto/minor/nix.asset | 2 -- .../solarsystem/dwarf_planets/pluto/minor/styx.asset | 2 -- .../solarsystem/dwarf_planets/pluto/pluto_trail.asset | 2 -- .../scene/solarsystem/dwarf_planets/pluto/trail.asset | 2 -- .../solarsystem/dwarf_planets/pluto/transforms.asset | 2 -- .../solarsystem/interstellar/c-2019_q4_borisov.asset | 5 +++-- .../assets/scene/solarsystem/interstellar/oumuamua.asset | 5 +++-- .../scene/solarsystem/missions/apollo/11/apollo11.asset | 1 - .../scene/solarsystem/missions/apollo/15/apollo15.asset | 2 -- data/assets/scene/solarsystem/missions/dawn/ceres.asset | 2 -- .../scene/solarsystem/missions/dawn/dawn_kernels.asset | 2 +- data/assets/scene/solarsystem/missions/dawn/vesta.asset | 1 - data/assets/scene/solarsystem/missions/juno/juno.asset | 2 -- .../scene/solarsystem/missions/newhorizons/fov.asset | 2 -- .../scene/solarsystem/missions/newhorizons/kernels.asset | 2 -- .../scene/solarsystem/missions/newhorizons/label.asset | 2 -- .../scene/solarsystem/missions/newhorizons/model.asset | 2 -- .../scene/solarsystem/missions/newhorizons/trail.asset | 2 -- .../solarsystem/missions/newhorizons/transforms.asset | 2 -- .../scene/solarsystem/missions/osirisrex/bennu.asset | 1 - .../scene/solarsystem/missions/osirisrex/model.asset | 2 -- .../solarsystem/missions/osirisrex/script_schedule.asset | 2 +- .../scene/solarsystem/missions/osirisrex/trail.asset | 2 -- .../solarsystem/missions/osirisrex/transforms.asset | 2 -- .../solarsystem/missions/perseverance/perseverance.asset | 2 -- .../scene/solarsystem/missions/rosetta/rosetta.asset | 2 -- .../scene/solarsystem/missions/voyager/voyager1.asset | 2 -- .../scene/solarsystem/missions/voyager/voyager2.asset | 2 -- .../scene/solarsystem/planets/default_layers.asset | 1 + .../scene/solarsystem/planets/earth/atmosphere.asset | 2 -- .../amsr2_gcom_w1_sea_ice_concentration_temporal.asset | 1 + .../earth/layers/colorlayers/aqua_modis_temporal.asset | 1 + .../planets/earth/layers/colorlayers/bmng_sweden.asset | 1 + .../planets/earth/layers/colorlayers/bmng_utah.asset | 1 + .../earth/layers/colorlayers/esri_imagery_world_2D.asset | 1 + .../earth/layers/colorlayers/esri_viirs_combo.asset | 1 + .../earth/layers/colorlayers/fallbacks/blue_marble.asset | 1 + .../earth/layers/colorlayers/terra_modis_temporal.asset | 1 + .../earth/layers/colorlayers/viirs_snpp_temporal.asset | 1 + .../heightlayers/fallbacks/blue_marble_height.asset | 5 +++-- .../earth/layers/heightlayers/terrain_tileset.asset | 6 +++--- .../earth/layers/nightlayers/earth_at_night_2012.asset | 1 + .../nightlayers/fallbacks/earth_night_texture.asset | 1 + .../assets/scene/solarsystem/planets/earth/markers.asset | 1 - .../scene/solarsystem/planets/earth/moon/trail.asset | 5 +++-- .../solarsystem/planets/earth/satellites/misc/iss.asset | 1 + .../planets/earth/satellites/weather/terra.asset | 2 +- data/assets/scene/solarsystem/planets/earth/trail.asset | 2 -- .../solarsystem/planets/jupiter/callisto/callisto.asset | 2 -- .../solarsystem/planets/jupiter/callisto/trail.asset | 2 -- .../solarsystem/planets/jupiter/europa/europa.asset | 2 -- .../scene/solarsystem/planets/jupiter/europa/trail.asset | 2 -- .../solarsystem/planets/jupiter/ganymede/ganymede.asset | 2 -- .../solarsystem/planets/jupiter/ganymede/trail.asset | 2 -- .../assets/scene/solarsystem/planets/jupiter/io/io.asset | 2 -- .../scene/solarsystem/planets/jupiter/io/trail.asset | 2 -- .../scene/solarsystem/planets/jupiter/kernels.asset | 1 + .../solarsystem/planets/jupiter/minor/ananke_group.asset | 2 -- .../solarsystem/planets/jupiter/minor/carme_group.asset | 2 -- .../solarsystem/planets/jupiter/minor/carpo_group.asset | 2 -- .../planets/jupiter/minor/himalia_group.asset | 2 -- .../solarsystem/planets/jupiter/minor/inner_group.asset | 2 -- .../solarsystem/planets/jupiter/minor/other_groups.asset | 2 -- .../planets/jupiter/minor/pasiphae_group.asset | 2 -- .../planets/jupiter/minor/themisto_group.asset | 2 -- .../assets/scene/solarsystem/planets/jupiter/trail.asset | 2 -- .../scene/solarsystem/planets/jupiter/trail_earth.asset | 1 - .../scene/solarsystem/planets/mars/atmosphere.asset | 2 -- .../planets/mars/layers/colorlayers/HiRISE.asset | 1 + .../planets/mars/layers/colorlayers/ctx_blended_01.asset | 1 + .../mars/layers/colorlayers/mola_hrsc_sweden.asset | 1 + .../planets/mars/layers/colorlayers/mola_hrsc_utah.asset | 1 + .../scene/solarsystem/planets/mars/moons/deimos.asset | 2 -- .../scene/solarsystem/planets/mars/moons/phobos.asset | 2 -- data/assets/scene/solarsystem/planets/mars/trail.asset | 2 -- .../scene/solarsystem/planets/mars/trail_earth.asset | 6 +++--- .../assets/scene/solarsystem/planets/mercury/trail.asset | 2 -- .../scene/solarsystem/planets/mercury/trail_earth.asset | 6 +++--- .../scene/solarsystem/planets/neptune/inner_moons.asset | 2 -- .../planets/neptune/irregular_prograde_moons.asset | 2 -- .../planets/neptune/irregular_retrograde_moons.asset | 2 -- .../assets/scene/solarsystem/planets/neptune/trail.asset | 2 -- .../scene/solarsystem/planets/neptune/trail_earth.asset | 6 +++--- .../scene/solarsystem/planets/neptune/triton.asset | 2 -- .../scene/solarsystem/planets/saturn/dione/dione.asset | 2 -- .../scene/solarsystem/planets/saturn/dione/trail.asset | 2 -- .../solarsystem/planets/saturn/enceladus/enceladus.asset | 2 -- .../solarsystem/planets/saturn/enceladus/trail.asset | 2 -- .../solarsystem/planets/saturn/hyperion/hyperion.asset | 2 -- .../solarsystem/planets/saturn/hyperion/trail.asset | 2 -- .../solarsystem/planets/saturn/iapetus/iapetus.asset | 2 -- .../scene/solarsystem/planets/saturn/iapetus/trail.asset | 2 -- .../scene/solarsystem/planets/saturn/kernels.asset | 1 + .../scene/solarsystem/planets/saturn/mimas/mimas.asset | 2 -- .../scene/solarsystem/planets/saturn/mimas/trail.asset | 2 -- .../solarsystem/planets/saturn/minor/gallic_group.asset | 2 -- .../solarsystem/planets/saturn/minor/inuit_group.asset | 2 -- .../solarsystem/planets/saturn/minor/norse_group.asset | 3 --- .../solarsystem/planets/saturn/minor/other_group.asset | 1 - .../scene/solarsystem/planets/saturn/rhea/rhea.asset | 2 -- .../scene/solarsystem/planets/saturn/rhea/trail.asset | 2 -- .../planets/saturn/tethys/default_layers.asset | 1 + .../scene/solarsystem/planets/saturn/tethys/tethys.asset | 2 -- .../scene/solarsystem/planets/saturn/tethys/trail.asset | 2 -- .../planets/saturn/titan/default_layers.asset | 1 + .../scene/solarsystem/planets/saturn/titan/titan.asset | 2 -- .../scene/solarsystem/planets/saturn/titan/trail.asset | 1 - data/assets/scene/solarsystem/planets/saturn/trail.asset | 2 -- .../solarsystem/planets/uranus/default_layers.asset | 1 + .../scene/solarsystem/planets/uranus/inner_moons.asset | 2 -- .../planets/uranus/irregular_prograde_moons.asset | 1 - .../planets/uranus/irregular_retrograde_moons.asset | 2 -- .../scene/solarsystem/planets/uranus/kernels.asset | 1 + .../uranus/layers/colorlayers/uranus_texture.asset | 5 +++-- .../scene/solarsystem/planets/uranus/major_moons.asset | 2 +- data/assets/scene/solarsystem/planets/uranus/trail.asset | 1 - .../scene/solarsystem/planets/uranus/trail_earth.asset | 6 +++--- .../scene/solarsystem/planets/venus/atmosphere.asset | 4 ++-- .../scene/solarsystem/planets/venus/default_layers.asset | 1 + .../venus/layers/colorlayers/magellan_mosaic_utah.asset | 6 +++--- .../planets/venus/layers/heightlayers/magellan.asset | 5 +++-- data/assets/scene/solarsystem/planets/venus/trail.asset | 6 +++--- .../scene/solarsystem/planets/venus/trail_earth.asset | 6 +++--- .../scene/solarsystem/planets/venus/transforms.asset | 6 +++--- data/assets/scene/solarsystem/planets/venus/venus.asset | 5 +++-- data/assets/scene/solarsystem/sssb/astraea.asset | 1 + data/assets/scene/solarsystem/sssb/c2019y4atlas.asset | 9 +++++---- .../solarsystem/sssb/outer_main_belt_asteroid.asset | 1 - data/assets/scene/solarsystem/sun/default_layers.asset | 1 + data/assets/scene/solarsystem/sun/glare.asset | 6 +++--- .../solarsystem/sun/layers/colorlayers/sun_texture.asset | 5 +++-- data/assets/scene/solarsystem/sun/marker.asset | 6 +++--- data/assets/scene/solarsystem/sun/sun.asset | 6 +++--- data/assets/scene/solarsystem/sun/sun_textures.asset | 5 +++-- data/assets/scene/solarsystem/sun/transforms.asset | 5 +++-- data/assets/spice/base.asset | 6 +++--- data/assets/util/asset_helper.asset | 2 -- data/assets/util/generate_bookmarks.asset | 1 - data/assets/util/renderable_helper.asset | 2 +- data/assets/util/screenshots_endpoint.asset | 2 +- data/assets/util/state_machine_helper.asset | 1 - data/assets/util/static_server.asset | 2 +- 178 files changed, 118 insertions(+), 286 deletions(-) diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset index 28eb16aa9b..7adb9ca9b9 100644 --- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset +++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset @@ -36,6 +36,7 @@ local object = { } } + asset.meta = { Name = "Stars Labels - Alternate", Version = "1.0", diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset index 5bcab58b85..7525c55978 100644 --- a/data/assets/scene/digitaluniverse/clusters.asset +++ b/data/assets/scene/digitaluniverse/clusters.asset @@ -40,8 +40,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset index dfbd683b70..6c64402132 100644 --- a/data/assets/scene/digitaluniverse/constellationbounds.asset +++ b/data/assets/scene/digitaluniverse/constellationbounds.asset @@ -42,8 +42,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset index 6c024c8e70..93a522bbe9 100644 --- a/data/assets/scene/digitaluniverse/constellations.asset +++ b/data/assets/scene/digitaluniverse/constellations.asset @@ -62,8 +62,6 @@ local constellations = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalactic, constellations }) diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset index 8036c82d69..2135911fe8 100644 --- a/data/assets/scene/digitaluniverse/dwarfs.asset +++ b/data/assets/scene/digitaluniverse/dwarfs.asset @@ -62,8 +62,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset index 4d4c7ef991..81ea3477ca 100644 --- a/data/assets/scene/digitaluniverse/exoplanets.asset +++ b/data/assets/scene/digitaluniverse/exoplanets.asset @@ -51,7 +51,6 @@ local object = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset index fe47bd39f8..9b0f95ebb3 100644 --- a/data/assets/scene/digitaluniverse/globularclusters.asset +++ b/data/assets/scene/digitaluniverse/globularclusters.asset @@ -55,8 +55,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset index 82263612bb..1f324cef43 100644 --- a/data/assets/scene/digitaluniverse/groups.asset +++ b/data/assets/scene/digitaluniverse/groups.asset @@ -40,8 +40,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset index 0906d6dab8..a54f40fe2f 100644 --- a/data/assets/scene/digitaluniverse/h2regions.asset +++ b/data/assets/scene/digitaluniverse/h2regions.asset @@ -53,8 +53,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset index b4186bdf9f..8480f925a1 100644 --- a/data/assets/scene/digitaluniverse/kepler.asset +++ b/data/assets/scene/digitaluniverse/kepler.asset @@ -48,8 +48,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset index 8e4c7a2175..41fb19c836 100644 --- a/data/assets/scene/digitaluniverse/localdwarfs.asset +++ b/data/assets/scene/digitaluniverse/localdwarfs.asset @@ -54,8 +54,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index e25dfb64f2..058a333f2c 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -33,7 +33,6 @@ local plane = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { plane }) diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset index 81c6dfb899..aca337344c 100644 --- a/data/assets/scene/digitaluniverse/milkyway_label.asset +++ b/data/assets/scene/digitaluniverse/milkyway_label.asset @@ -43,8 +43,6 @@ local homeLabel = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel }) diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset index 78233b0354..28b14ded2a 100644 --- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset +++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset @@ -38,7 +38,6 @@ local sphere = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { sphere }) diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset index 0f1ed67fe2..93d0c4d316 100644 --- a/data/assets/scene/digitaluniverse/obassociations.asset +++ b/data/assets/scene/digitaluniverse/obassociations.asset @@ -57,8 +57,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset index b171e04949..4da9e44a02 100644 --- a/data/assets/scene/digitaluniverse/openclusters.asset +++ b/data/assets/scene/digitaluniverse/openclusters.asset @@ -53,8 +53,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset index b81e6ee470..3c56a24762 100644 --- a/data/assets/scene/digitaluniverse/planetarynebulae.asset +++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset @@ -50,8 +50,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset index cccce871b4..8b572b9391 100644 --- a/data/assets/scene/digitaluniverse/pulsars.asset +++ b/data/assets/scene/digitaluniverse/pulsars.asset @@ -54,8 +54,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset index 2aeeb6a4d9..c1363977d8 100644 --- a/data/assets/scene/digitaluniverse/quasars.asset +++ b/data/assets/scene/digitaluniverse/quasars.asset @@ -48,8 +48,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset index 21d66a7f02..aea7142560 100644 --- a/data/assets/scene/digitaluniverse/sdss.asset +++ b/data/assets/scene/digitaluniverse/sdss.asset @@ -63,8 +63,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset index f0c352b71c..62fda28888 100644 --- a/data/assets/scene/digitaluniverse/starlabels.asset +++ b/data/assets/scene/digitaluniverse/starlabels.asset @@ -32,8 +32,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset index 2f7321900d..9e2f74d287 100644 --- a/data/assets/scene/digitaluniverse/superclusters.asset +++ b/data/assets/scene/digitaluniverse/superclusters.asset @@ -48,8 +48,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset index 5496d65f5c..29b0f6bc3e 100644 --- a/data/assets/scene/digitaluniverse/supernovaremnants.asset +++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset @@ -49,8 +49,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset index 64222fcf54..31cc4cb3ab 100644 --- a/data/assets/scene/digitaluniverse/tully.asset +++ b/data/assets/scene/digitaluniverse/tully.asset @@ -113,7 +113,6 @@ local tullyImages = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages }) diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset index 7c5814cb47..8156708b9e 100644 --- a/data/assets/scene/digitaluniverse/voids.asset +++ b/data/assets/scene/digitaluniverse/voids.asset @@ -40,8 +40,6 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset index d976a676da..ac310f24a2 100644 --- a/data/assets/scene/milkyway/constellations/constellation_keybinds.asset +++ b/data/assets/scene/milkyway/constellations/constellation_keybinds.asset @@ -37,6 +37,7 @@ asset.onDeinitialize(function () scene_helper.unbindKeys(Keybindings) end) + asset.meta = { Name = "Constellation Image Keybinds", Version = "1.0", diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset index 95eb437099..1820632dc6 100644 --- a/data/assets/scene/milkyway/milkyway/eso.asset +++ b/data/assets/scene/milkyway/milkyway/eso.asset @@ -35,6 +35,4 @@ local object = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset index 0bed16b0fa..4f87af5456 100644 --- a/data/assets/scene/milkyway/milkyway/volume.asset +++ b/data/assets/scene/milkyway/milkyway/volume.asset @@ -53,6 +53,7 @@ local MilkyWayVolumeGalaxy = { local objects = { MilkyWayVolumeGalaxy } assetHelper.registerSceneGraphNodesAndExport(asset, objects) + asset.meta = { Name = "Milky Way Volume", Version = "1.0", diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset index 1848c7526f..d2c3ff1727 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset @@ -29,6 +29,7 @@ local OrionClusterStars = { assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars }) + asset.meta = { Name = "Orion Nebula Star Cluster", Version = "1.0", diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index f6e01b2cc4..0eaf64e257 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -135,6 +135,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { OrionNebulaProplydsModel }) + asset.meta = { Name = "Orion Nebula Model", Version = "1.0", diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset index 7882e62afe..d33c65aaea 100644 --- a/data/assets/scene/milkyway/stars/denver.asset +++ b/data/assets/scene/milkyway/stars/denver.asset @@ -40,6 +40,9 @@ local object = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { object }) + + asset.meta = { Name = "Stars Denver", Version = "1.0", @@ -49,6 +52,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "Creative Commons Attribution-Share Alike 3.0 Unported" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index 7d9b5cf5b9..35e6fe6436 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -50,8 +50,6 @@ local Charon = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Charon }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset index 4398413b00..6550289152 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset @@ -23,8 +23,6 @@ local CharonTrailBarycentric = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset index cead19ee5e..1baaddf851 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset @@ -13,6 +13,7 @@ local PlutoKernels = { asset.export("PlutoKernels", PlutoKernels) + asset.meta = { Name = "Pluto Spice Kernels", Version = "1.0", diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset index 09c1b6c758..8a7c503b23 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -46,8 +46,6 @@ local HydraTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset index 692c242bb4..3f2a73b90e 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -46,8 +46,6 @@ local KerberosTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset index 003469592a..6daccf91a5 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -46,8 +46,6 @@ local NixTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset index 8002ecbbab..81021e53fb 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -46,8 +46,6 @@ local StyxTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset index 98305eae87..6ae14d9b14 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset @@ -23,8 +23,6 @@ local PlutoTrailBarycentric = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset index 28ab9d499e..44eafbb893 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset @@ -27,8 +27,6 @@ local PlutoBarycenterTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset index 81958d8c34..f9be7f483d 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset @@ -22,8 +22,6 @@ local PlutoBarycenter = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter }) diff --git a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset index 14e7b433db..2796e28dc1 100644 --- a/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset +++ b/data/assets/scene/solarsystem/interstellar/c-2019_q4_borisov.asset @@ -43,6 +43,9 @@ local C2019Q4BorisovPosition = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2019Q4BorisovTrail }) + + asset.meta = { Name = "C/2019 Q4 Borisov", Version = "1.0", @@ -55,5 +58,3 @@ asset.meta = { NAS7-030010. All documents available from this server may be protected under the U.S. and Foreign Copyright Laws."]] } - -assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2019Q4BorisovTrail }) diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset index 6e14e3155d..cf6cce4a0a 100644 --- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset +++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset @@ -44,6 +44,9 @@ local OumuamuaPosition = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, OumuamuaTrail }) + + asset.meta = { Name = "'Oumuamua", Version = "1.0", @@ -53,5 +56,3 @@ asset.meta = { URL = "https://ssd.jpl.nasa.gov/horizons.cgi", License = "NASA" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, OumuamuaTrail }) diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset index e408e51389..26aa8175f2 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset @@ -220,7 +220,6 @@ local Apollo11LemLandedModel = { } } - local exportList = { Apollo11Position, Apollo11LemPosition, diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 560aac5cb7..7e6001679f 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -110,6 +110,4 @@ for k,v in pairs(model_part) do table.insert(list, v) end - assetHelper.registerSceneGraphNodesAndExport(asset, list) - diff --git a/data/assets/scene/solarsystem/missions/dawn/ceres.asset b/data/assets/scene/solarsystem/missions/dawn/ceres.asset index 0e7fd2fead..ade7683eea 100644 --- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset +++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset @@ -55,6 +55,4 @@ local Ceres = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Ceres }) diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset index bac98c64a6..c559946178 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset @@ -5,4 +5,4 @@ local Kernels = asset.syncedResource({ Version = 2 }) -asset.export("Kernels", Kernels) \ No newline at end of file +asset.export("Kernels", Kernels) diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 6e10d8c818..b2889c09ad 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -136,5 +136,4 @@ local VestaTrail = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { Vesta, VestaTrail }) diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 99b8952964..3fa10954f3 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -197,6 +197,4 @@ local JunoTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Juno, JunoTrail }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset index 45c7f7ba7e..1b46601397 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset @@ -368,8 +368,6 @@ local Rex = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Lorri, RalphLeisa, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset index ed6816032b..e008d59119 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset @@ -41,8 +41,6 @@ local PlutoKernels = { Kernels .. "/NavSE_plu047_od122.bsp" } - - asset.export("Kernels", Kernels) asset.export("NewHorizonsKernels", NewHorizonsKernels) asset.export("PlutoKernels", PlutoKernels) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset index e436c35923..6b6aae4f5e 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset @@ -26,6 +26,4 @@ local Labels = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Labels }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset index 3eb175e145..7df1162644 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset @@ -50,8 +50,6 @@ local NewHorizons = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { NewHorizons }) asset.export("NewHorizonsTextures", textures) asset.export("NewHorizonsModels", models) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset index 9ebb30c5d6..dbb2a6d987 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset @@ -29,8 +29,6 @@ local TrailAtPluto = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { TrailAtPluto }) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset index 2ce8b47f00..cbcbab62da 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset @@ -46,8 +46,6 @@ local NewHorizonsPosition = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterAccurate, NewHorizonsPosition diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index 151d9db4d1..8d672d4d43 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -111,5 +111,4 @@ local BennuTrail = { } - assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail }) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index d77740400b..8d9d4537e2 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -334,8 +334,6 @@ local RexisFov = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { OsirisRex, PolyCam, diff --git a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset index 4bbf29979c..c30315862d 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset @@ -15,4 +15,4 @@ end) asset.onDeinitialize(function () openspace.scriptScheduler.clear() -end) \ No newline at end of file +end) diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset index b156ee96c6..92fbaf68ac 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset @@ -71,8 +71,6 @@ local OsirisRexTrailBennu = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { OsirisRexTrailEarth, OsirisRexTrailSolarSystem, diff --git a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset index e464ab5e20..62a2e42faa 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset @@ -21,6 +21,4 @@ local BennuBarycenter = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { BennuBarycenter }) diff --git a/data/assets/scene/solarsystem/missions/perseverance/perseverance.asset b/data/assets/scene/solarsystem/missions/perseverance/perseverance.asset index 64667cbd70..f1e3b55cd7 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/perseverance.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/perseverance.asset @@ -1,5 +1,3 @@ --perseverance.asset asset.require('./model') asset.require('./trail') - - diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index a910a9d7f3..7a839f5281 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -513,8 +513,6 @@ local PhilaeTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Rosetta, RosettaModel, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index d812c7c4da..a03d0be7cc 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -230,8 +230,6 @@ local VoyagerTrailCruiseSaturnInf = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Voyager1, Voyager1Main, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index ba066da0c2..2fa89e5719 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -325,8 +325,6 @@ local VoyagerTrailCruiseNeptuneInf = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Voyager2, Voyager2Main, diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset index 6815becb02..4fc2b0ada0 100644 --- a/data/assets/scene/solarsystem/planets/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -27,6 +27,7 @@ asset.require('./uranus/default_layers') asset.require('./venus/default_layers') + asset.meta = { Name = "Default Solar System Layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index dc4e7e157e..c46df1f9b4 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -101,8 +101,6 @@ local Atmosphere = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset index b739801e57..cbca713bac 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -26,6 +26,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset index 79c5d249e9..503d014e93 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -31,6 +31,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "Aqua Modis (Temporal)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset index 94f2c838ef..64314513ab 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -15,6 +15,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "Blue Marble Next Generation (Sweden)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset index d5d737c5a3..7f115b2db3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -15,6 +15,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "Blue Marble Next Generation (Utah)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset index 3768f310b3..cfd621fbae 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -22,6 +22,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "ESRI Imagery World 2D", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset index 1d91155ffc..10522fae95 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -47,6 +47,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "ESRI VIIRS Combo", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 1d77344d5a..59cbafb1cc 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -10,6 +10,7 @@ local layer = { asset.export("layer", layer) + asset.meta = { Name = "Blue Marble", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset index 86a60fa0fa..b114f114b6 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -22,6 +22,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "Terra Modis (Temporal)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset index db531b8e26..1a8982274f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -22,6 +22,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "VIIRS SNPP (Temporal)", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 5d9d5d6af4..c896d37583 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -7,6 +7,9 @@ local layer = { Description = [[ Topographic layer from Blue Marble Next Generation]] } +asset.export("layer", layer) + + asset.meta = { Name = "Earth Bluemarble Height", Version = "1.0", @@ -17,5 +20,3 @@ asset.meta = { License = "NASA", Identifiers = "Earth_Bluemarble_Height" } - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index 5f1594b2ab..19c40c9b84 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -20,6 +20,9 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) +asset.export("layer", layer) + + asset.meta = { Name = "World Elevation (3D)", Version = "1.0", @@ -30,6 +33,3 @@ asset.meta = { License = "Esri Master License Agreement", Identifiers = "Terrain_tileset" } - - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index 22f27a259a..659125449e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -18,6 +18,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "Earth at Night 2012", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset index 6e0b9579a6..38b8a630fe 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -9,6 +9,7 @@ local layer = { asset.export("layer", layer) + asset.meta = { Name = "Blue Marble Night", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 0b9a08e8af..29e0dd8f73 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -22,7 +22,6 @@ local EarthMarker = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { EarthMarker }) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset index d15b2eeea6..e1e17c44dc 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset @@ -25,6 +25,9 @@ local MoonTrail = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) + + asset.meta = { Name = "Moon Trail", Version = "1.0", @@ -35,5 +38,3 @@ asset.meta = { License = "MIT license", Identifiers = "MoonTrail" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { MoonTrail }) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index 7941a368ac..eb2a843420 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -291,6 +291,7 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.ISSparentNode.Rotation.yAxis-InvertObject", true) end) + asset.meta = { Name = "ISS", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset index 295ef36fb1..0cdae52344 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset @@ -104,13 +104,13 @@ asset.onInitialize(function () end) - asset.onDeinitialize(function () for _, node in ipairs(nodes) do openspace.removeSceneGraphNode(node) end end) + asset.meta = { Name = "Terra", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset index ab0462b88d..f750fa6103 100644 --- a/data/assets/scene/solarsystem/planets/earth/trail.asset +++ b/data/assets/scene/solarsystem/planets/earth/trail.asset @@ -25,8 +25,6 @@ local EarthTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { EarthTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 530010c2f0..254e335c2e 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -50,8 +50,6 @@ local Callisto = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Callisto }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index f3030a28a0..8a6b20b932 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -27,8 +27,6 @@ local CallistoTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { CallistoTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index c0cdf4b1dc..866fe6d973 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -50,8 +50,6 @@ local Europa = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Europa }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 3da40b0a17..b046be6929 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -27,8 +27,6 @@ local EuropaTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { EuropaTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 36cbe09035..265bd4b4fa 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -50,8 +50,6 @@ local Ganymede = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Ganymede }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index f2edd4eed3..ffd26252e8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -27,8 +27,6 @@ local GanymedeTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { GanymedeTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 44b6c0ce6c..43f6786cc6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -50,8 +50,6 @@ local Io = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Io }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index c630e5a596..9752f31aa7 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -27,8 +27,6 @@ local IoTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { IoTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset index 6509c4929d..d6346db64d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -8,6 +8,7 @@ local Kernels = asset.syncedResource({ asset.export("jup310", Kernels .. '/jup310.bsp') asset.export("jup341", Kernels .. '/jup341.bsp') + asset.meta = { Name = "Jupiter Spice Kernels", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index 0da1aeb32f..d054212f4a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -191,8 +191,6 @@ local anankeGroup = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(anankeGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index 094feb72a2..3581f98f57 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -255,8 +255,6 @@ local carmeGroup = { }, } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(carmeGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 74e152da06..ed8974eabe 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -29,8 +29,6 @@ local carpoGroup = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(carpoGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index 6fdaddf579..f4d1d8573b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -94,8 +94,6 @@ local himaliaGroup = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(himaliaGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index 6a705a642f..0710efed8c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -77,8 +77,6 @@ local innerMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index 593a76e9c5..2668c2a019 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -149,8 +149,6 @@ local otherGroups = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(otherGroups) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index b7ab453417..0839c8f271 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -340,8 +340,6 @@ local pasiphaeGroup = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(pasiphaeGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index 42cde2410d..9e280321a6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -29,8 +29,6 @@ local themistoGroup = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(themistoGroup) diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index c63168a2f4..7d3afaaebd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -25,8 +25,6 @@ local JupiterTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrail }) diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 8866f662fa..3abeef018a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -39,5 +39,4 @@ asset.meta = { Identifiers = "VenusTrailEarth" } - assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset index 3fa72cf416..06b1d7a1c8 100644 --- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset @@ -64,8 +64,6 @@ local Atmosphere = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset index 4f3dbb3fbe..edd5ec0a78 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset @@ -1,6 +1,7 @@ --todo add hirise through asset file like we do for ctx_blended. --curretly added via globebrowsing customization + asset.meta = { Name = "HiRISE Local Set", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset index 72cac29ff0..f6ae50ead9 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -33,6 +33,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "CTX Blended beta01", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset index 4c2f156f20..a5862618ff 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -17,6 +17,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "MOLA HRSC [Sweden]", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset index ac48e10230..87a1e1cf94 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -17,6 +17,7 @@ end) asset.export("layer", layer) + asset.meta = { Name = "MOLA HRSC [Utah]", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index fb634073cf..621d9252f0 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -57,8 +57,6 @@ local DeimosTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Deimos, DeimosTrail }) diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 9c7ba76bec..cbd9353046 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -57,8 +57,6 @@ local PhobosTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Phobos, PhobosTrail }) diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index 047d9b16f7..04c64c8b92 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -27,8 +27,6 @@ local MarsTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrail }) diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index 2db55ba747..e24f49a1fe 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -29,6 +29,9 @@ local MarsTrailEarth = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrailEarth }) + + asset.meta = { Name = "Mars Trail from Earth", Version = "1.0", @@ -39,6 +42,3 @@ asset.meta = { License = "MIT license", Identifiers = "MarsTrailEarth" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { MarsTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset index c6de66699a..bba93b5374 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset @@ -26,8 +26,6 @@ local MercuryTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrail }) diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index 482d7406c3..979e9a6abd 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -29,6 +29,9 @@ local MercuryTrailEarth = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrailEarth }) + + asset.meta = { Name = "Mercury Trail from Earth", Version = "1.0", @@ -39,6 +42,3 @@ asset.meta = { License = "MIT license", Identifiers = "MercuryTrailEarth" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index ba5c8eb7ef..b2820fb9b4 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -129,8 +129,6 @@ local innerMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 61581a4e36..0c9f78b039 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -64,8 +64,6 @@ local irregularProgradeMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularProgradeMoons) diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index 9c2c0ee0c5..26e9d46ead 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -63,8 +63,6 @@ local irregularRetrogradeMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularRetrogradeMoons) diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index 3eb2f3241b..7faf40750a 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -37,8 +37,6 @@ local NeptuneTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrail }) diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index f40341733d..1fd86c1337 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -29,6 +29,9 @@ local NeptuneTrailEarth = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrailEarth }) + + asset.meta = { Name = "Neptune Trail from Earth", Version = "1.0", @@ -39,6 +42,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusTrailEarth" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index 7551185ff5..6e8dcb5d4d 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -22,8 +22,6 @@ local Triton = { Kernels = kernel } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes({ Triton }) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index e381a2800d..bee85a6396 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -48,8 +48,6 @@ local Dione = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Dione }) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index 37e6344f9d..c94b6799ab 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -27,8 +27,6 @@ local DioneTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { DioneTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 3d1cd6d750..9285f80cd1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -50,8 +50,6 @@ local Enceladus = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Enceladus }) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index aaacb70977..647228d2e1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -27,8 +27,6 @@ local EnceladusTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { EnceladusTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 944df7fec9..3103501c3e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -49,8 +49,6 @@ local Hyperion = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Hyperion }) diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index 69a3841d9f..bf16f431d2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -26,8 +26,6 @@ local HyperionTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { HyperionTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index fa28e41a0f..63132da3ad 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -50,8 +50,6 @@ local Iapetus = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Iapetus }) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index f6be22d1b7..c8c089970b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -27,8 +27,6 @@ local IapetusTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { IapetusTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset index 1b0f0742d9..04bb883e80 100644 --- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -10,6 +10,7 @@ asset.export("sat368", Kernels .. '/sat368.bsp') asset.export("sat375", Kernels .. '/sat375.bsp') asset.export("sat393", Kernels .. '/sat393.bsp') + asset.meta = { Name = "Saturn Spice Kernels", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index adf306573e..e56c74a28d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -50,8 +50,6 @@ local Mimas = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Mimas }) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index ce87f56a85..32355adc85 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -27,8 +27,6 @@ local MimasTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { MimasTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index b03c84275c..6417551036 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -77,8 +77,6 @@ local gallicGroup = { }, } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(gallicGroup) diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index 112f84ddaa..3bdd0ea65f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -93,8 +93,6 @@ local inuitGroup = { }, } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(inuitGroup) diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index 0f35c54ead..119b033e96 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -488,15 +488,12 @@ local norseGroup = { }, } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(norseGroup) ) - asset.meta = { Name = "Saturn Norse Group Moons", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index 8758895bdb..7a74aebf7a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -223,7 +223,6 @@ local otherGroup = { } } - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(otherGroup) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index 871bc2ba74..fbbe12a40d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -50,8 +50,6 @@ local Rhea = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Rhea }) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index c6fb7bf97a..7e8a76469b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -27,8 +27,6 @@ local RheaTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { RheaTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset index f815ce15f5..cdb813d935 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -8,6 +8,7 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Tethys.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + asset.meta = { Name = "Default Tethys Layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 8d6d1d052c..e4440665df 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -48,8 +48,6 @@ local Tethys = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Tethys }) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index bdabe2f983..d7ce108cc4 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -27,8 +27,6 @@ local TethysTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { TethysTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset index f29cc04068..972c2d6787 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -10,6 +10,7 @@ asset.onInitialize(function () colorLayer.layer.Identifier .. ".Enabled", true) end) + asset.meta = { Name = "Default Titan Layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index 82a121bfba..e60c2042eb 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -50,8 +50,6 @@ local Titan = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { Titan }) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 0c404e2a00..64176c0c3e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -27,7 +27,6 @@ local TitanTrail = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { TitanTrail }) diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index a49d2e5d25..05d35198cd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -25,8 +25,6 @@ local SaturnTrail = { } } - - assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrail }) diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset index c5979a5e77..a724445e80 100644 --- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -8,6 +8,7 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Uranus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + asset.meta = { Name = "Default Uranus Layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index e720bee54f..20da8fec8e 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -221,8 +221,6 @@ local innerMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(innerMoons) diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index a07ee3b8c5..1cbfd292c0 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -29,7 +29,6 @@ local irregularMoons = { } } - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularMoons) diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 71c22b3e15..a3a9b4d22b 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -141,8 +141,6 @@ local irregularMoons = { } } - - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(irregularMoons) diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset index 6b29d5d058..efcf3617b2 100644 --- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -9,6 +9,7 @@ asset.export("ura091", Kernels .. "/ura091-rocks-merge.bsp") asset.export("ura111", Kernels .. "/ura111.bsp") asset.export("ura112", Kernels .. "/ura112.bsp") + asset.meta = { Name = "Uranus Spice Kernels", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset index 6b9bcf6f34..62f8b14981 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -10,6 +10,9 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.export("layer", layer) + + asset.meta = { Name = "Uranus texture", Version = "1.0", @@ -18,5 +21,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license" } - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 4075473142..8f903fe638 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -93,12 +93,12 @@ local majorMoons = { } } - assetHelper.registerSceneGraphNodesAndExport( asset, proceduralGlobes.createGlobes(majorMoons) ) + asset.meta = { Name = "Uranus Marjor Moons", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 05173b34df..d1101204bf 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -25,7 +25,6 @@ local UranusTrail = { } } - assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrail }) diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 205eae88c8..2390b5cb48 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -29,6 +29,9 @@ local UranusTrailEarth = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) + + asset.meta = { Name = "Uranus Trail from Earth", Version = "1.0", @@ -39,6 +42,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusTrailEarth" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 10add43bb0..ca97a2cbd7 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -61,6 +61,8 @@ local Atmosphere = { Description = "Simulation of Venus' Atmosphere" } } +assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) + asset.meta = { Name = "Venus Atmosphere", @@ -71,5 +73,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusAtmosphere" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere }) diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index 432f0475aa..18fb90fcd3 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -15,6 +15,7 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) end) + asset.meta = { Name = "Default Venus Layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset index f77cb91605..c54eca68d3 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -31,6 +31,9 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.export("layer", layer) + + asset.meta = { Name = "Venus Magellan Mosaic", Version = "1.0", @@ -42,6 +45,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "Magellan_Mosaic_Utah" } - - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset index 3831c96aad..8ffd0677b1 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -26,6 +26,9 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) end) +asset.export("layer", layer) + + asset.meta = { Name = "Venus Magellan DEM", Version = "1.0", @@ -37,5 +40,3 @@ asset.meta = { License = "NASA/PDS", Identifiers = "Magellan" } - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index 51b50f2ce6..e683a11ee7 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -27,6 +27,9 @@ local VenusTrail = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrail }) + + asset.meta = { Name = "Venus Trail", Version = "1.0", @@ -37,6 +40,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusTrail" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrail }) diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 2549309464..a9cc3633d9 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -28,6 +28,9 @@ local VenusTrailEarth = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrailEarth }) + + asset.meta = { Name = "Venus Trail from Earth", Version = "1.0", @@ -38,6 +41,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusTrailEarth" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { VenusTrailEarth }) diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index ab915fd6dd..1f84882347 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -20,6 +20,9 @@ local VenusBarycenter = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) + + asset.meta = { Name = "Venus Transforms", Version = "1.0", @@ -29,6 +32,3 @@ asset.meta = { License = "MIT license", Identifiers = "VenusBarycenter" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 03446c8ea1..0b2871f033 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -72,6 +72,9 @@ local VenusLabel = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel }) + + asset.meta = { Name = "Venus", Version = "1.0", @@ -81,5 +84,3 @@ asset.meta = { License = "MIT license", Identifiers = "Venus,VenusLabel" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel }) diff --git a/data/assets/scene/solarsystem/sssb/astraea.asset b/data/assets/scene/solarsystem/sssb/astraea.asset index cb16ce212a..17ce92dcef 100644 --- a/data/assets/scene/solarsystem/sssb/astraea.asset +++ b/data/assets/scene/solarsystem/sssb/astraea.asset @@ -46,6 +46,7 @@ local AstraeaPosition = { assetHelper.registerSceneGraphNodesAndExport(asset, { AstraeaPosition, AstraeaTrail }) + asset.meta = { Name = "5 Astraea", Version = "1.0", diff --git a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset index 9c0b9679a2..2ad536f7fb 100644 --- a/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset +++ b/data/assets/scene/solarsystem/sssb/c2019y4atlas.asset @@ -46,6 +46,11 @@ local C2019Y4AtlasPosition = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { + C2019Y4AtlasPosition, C2019Y4AtlasTrail +}) + + asset.meta = { Name = "C/2019 Y4 Atlas", Version = "1.0", @@ -56,7 +61,3 @@ asset.meta = { License = "NASA", Identifiers = "C2019Y4AtlasPosition,C2019Y4AtlasTrail" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { - C2019Y4AtlasPosition, C2019Y4AtlasTrail -}) diff --git a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset index 3044e4f78e..f98a8db61b 100644 --- a/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset +++ b/data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset @@ -18,7 +18,6 @@ object.Renderable.TrailFade = 2 object.GUI.Description = [[ Asteroids with a semi-major axis of between 3.2 and 4.6 au. ]] - assetHelper.registerSceneGraphNodesAndExport(asset, { object }) diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset index d3688c876e..c28573d81c 100644 --- a/data/assets/scene/solarsystem/sun/default_layers.asset +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -8,6 +8,7 @@ asset.onInitialize(function () openspace.setPropertyValueSingle("Scene.Sun.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) + asset.meta = { Name = "Default Sun layers", Version = "1.0", diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 2f673f94f6..4f2aa4e267 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -32,6 +32,9 @@ local SunGlare = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { SunGlare }) + + asset.meta = { Name = "Sun Glare", Version = "1.0", @@ -41,6 +44,3 @@ asset.meta = { License = "MIT license", Identifiers = "SunGlare" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { SunGlare }) diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset index 53b67a646a..a9e550212b 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -10,6 +10,9 @@ asset.onInitialize(function () openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) +asset.export("layer", layer) + + asset.meta = { Name = "Sun Texture", Version = "1.0", @@ -18,5 +21,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license" } - -asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index 1e34248055..191ee0073c 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -24,6 +24,9 @@ local SunMarker = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { SunMarker }) + + asset.meta = { Name = "Sun marker", Version = "1.0", @@ -33,6 +36,3 @@ asset.meta = { License = "MIT license", Identifiers = "SunMarker" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { SunMarker }) diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 4ed82f44f5..be58afe588 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -49,6 +49,9 @@ local SunLabel = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { Sun, SunLabel }) + + asset.meta = { Name = "Sun", Version = "1.0", @@ -58,6 +61,3 @@ asset.meta = { License = "MIT license", Identifiers = "Sun,SunLabel" } - - -assetHelper.registerSceneGraphNodesAndExport(asset, { Sun, SunLabel }) diff --git a/data/assets/scene/solarsystem/sun/sun_textures.asset b/data/assets/scene/solarsystem/sun/sun_textures.asset index 364b18366c..b38fdab4b0 100644 --- a/data/assets/scene/solarsystem/sun/sun_textures.asset +++ b/data/assets/scene/solarsystem/sun/sun_textures.asset @@ -5,6 +5,9 @@ local TexturesPath = asset.syncedResource({ Version = 4 }) +asset.export("TexturesPath", TexturesPath) + + asset.meta = { Name = "Sun Textures", Version = "4.0", @@ -13,5 +16,3 @@ asset.meta = { URL = "http://openspaceproject.com", License = "MIT license" } - -asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 12defd23d2..e05b46acf4 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -67,6 +67,9 @@ local SunECLIPJ2000 = { } } +assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 }) + + asset.meta = { Name = "Sun Transforms", Version = "1.0", @@ -77,5 +80,3 @@ asset.meta = { License = "MIT license", Identifiers = "SolarSystemBarycenter,SunIAU,SunECLIPJ2000" } - -assetHelper.registerSceneGraphNodesAndExport(asset, { SolarSystemBarycenter, SunIAU, SunECLIPJ2000 }) diff --git a/data/assets/spice/base.asset b/data/assets/spice/base.asset index ca49594abc..2f4199a0d7 100644 --- a/data/assets/spice/base.asset +++ b/data/assets/spice/base.asset @@ -16,6 +16,9 @@ local kernels = { syncedDirectory .. "/de430_1850-2150.bsp" } +assetHelper.registerSpiceKernels(asset, kernels) + + asset.meta = { Name = "SPICE Base", Version = "1.0", @@ -25,6 +28,3 @@ asset.meta = { URL = "https://naif.jpl.nasa.gov/naif/data_generic.html", License = "NASA" } - - -assetHelper.registerSpiceKernels(asset, kernels) diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index c171b6f3ca..c8463192f7 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -180,8 +180,6 @@ local createModelPart = function (parent, sunLightSourceNode, models, geometry, } end - - asset.export("registerSceneGraphNodes", registerSceneGraphNodes) asset.export("registerSceneGraphNodesAndExport", registerSceneGraphNodesAndExport) asset.export("registerScreenSpaceRenderables", registerScreenSpaceRenderables) diff --git a/data/assets/util/generate_bookmarks.asset b/data/assets/util/generate_bookmarks.asset index 2e3da2a9e3..b500522d92 100644 --- a/data/assets/util/generate_bookmarks.asset +++ b/data/assets/util/generate_bookmarks.asset @@ -82,4 +82,3 @@ local getBookmarks = function (guiPath, bookmarkfile) end asset.export('getBookmarks', getBookmarks) - diff --git a/data/assets/util/renderable_helper.asset b/data/assets/util/renderable_helper.asset index 2cac5f3931..31ef99a3df 100644 --- a/data/assets/util/renderable_helper.asset +++ b/data/assets/util/renderable_helper.asset @@ -12,4 +12,4 @@ end asset.export('toggle', toggle) -asset.export('setEnabled', setEnabled) \ No newline at end of file +asset.export('setEnabled', setEnabled) diff --git a/data/assets/util/screenshots_endpoint.asset b/data/assets/util/screenshots_endpoint.asset index 712b0a5a8b..40a58e0277 100644 --- a/data/assets/util/screenshots_endpoint.asset +++ b/data/assets/util/screenshots_endpoint.asset @@ -18,4 +18,4 @@ end) asset.onDeinitialize(function () -- TODO: Remove endpoints. As of 2019-10-29, OpenSpace sometimes -- crashes when endpoints are removed while the application is closing. -end) \ No newline at end of file +end) diff --git a/data/assets/util/state_machine_helper.asset b/data/assets/util/state_machine_helper.asset index 1444f3e20c..945041fdc3 100644 --- a/data/assets/util/state_machine_helper.asset +++ b/data/assets/util/state_machine_helper.asset @@ -55,5 +55,4 @@ local createStateMachine = function (states) return machine end - asset.export('createStateMachine', createStateMachine) diff --git a/data/assets/util/static_server.asset b/data/assets/util/static_server.asset index 94759f5936..3e98da9fdd 100644 --- a/data/assets/util/static_server.asset +++ b/data/assets/util/static_server.asset @@ -18,4 +18,4 @@ asset.onInitialize(function () openspace.setPropertyValueSingle( "Modules.WebGui.ServerProcessEntryPoint", backend .. "/backend/backend.js" ) -end) \ No newline at end of file +end)