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 {