diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 883a90d373..95f5c661ac 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -58,10 +58,12 @@ asset.onInitialize(function () -- Add local patches described at the top of this file for obj, list in pairs(vrt_folders) do for _, dir in pairs(list) do - openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj) + if (dir ~= '') then + openspace.globebrowsing.addBlendingLayersFromDirectory(dir, obj) - if CreateFocusNodes then - openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj) + if CreateFocusNodes then + openspace.globebrowsing.addFocusNodesFromDirectory(dir, obj) + end end end end diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset new file mode 100644 index 0000000000..1ee6157510 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -0,0 +1,55 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('./../transforms') +asset.require("spice/base") +asset.request('./../trail') +local labelsPath = asset.require('./../pluto_globelabels').LabelsPath + + + +local Charon = { + Identifier = "Charon", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "CHARON", + Observer = "PLUTO BARYCENTER", + Kernels = NewHorizonsKernels + }, + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_CHARON", + DestinationFrame = "GALACTIC" + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 6.035E5, 6.035E5, 6.035E5 }, + SegmentsPerPatch = 64, + Layers = {}, + Labels = { + Enable = false, + FileName = labelsPath .. "/charon.labels", + LabelAlignmentOption = "Horizontally", -- or Circularly + LabelsFontSize = 14.0, + LabelsSize = 8.0, + LabelsMinSize = 1.0, + LabelsMaxSize = 1500.0, + ProximityEnabled = false, + LabelsFadeInEnabled = true, + FadeInStartingDistance = 500000.0, + FadeOutStartingDistance = 1000000.0, + LabelsForceDomeRendering = true, + LabelsDistanceEPS = 1350000.0, + LabelsColor = { 1.0, 1.0, 0.0 } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { Charon }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset new file mode 100644 index 0000000000..4a64b0d59b --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon_trail.asset @@ -0,0 +1,28 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('../transforms') +asset.require("spice/base") + + +local CharonTrailBarycentric = { + Identifier = "CharonBarycentricTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "CHARON", + Observer = "PLUTO BARYCENTER" + }, + Color = { 0.00, 0.62, 1.00 }, + Period = 6.38723, + Resolution = 1000 + }, + GUI = { + Name = "Charon Barycentric Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset new file mode 100644 index 0000000000..f33e3e6c24 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./charon') +local globeIdentifier = globeAsset.Charon.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset new file mode 100644 index 0000000000..f8c906d910 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -0,0 +1,7 @@ +local layer = { + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset new file mode 100644 index 0000000000..135f5c3541 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/greyscale_usgs").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset new file mode 100644 index 0000000000..8537adb532 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./pluto') +local globeIdentifier = globeAsset.Pluto.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset new file mode 100644 index 0000000000..d451e59e79 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset @@ -0,0 +1,7 @@ +local layer = { + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset new file mode 100644 index 0000000000..135f5c3541 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/greyscale_usgs").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset new file mode 100644 index 0000000000..10edebc8a9 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -0,0 +1,51 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('../transforms') +local kernels = asset.require('../kernels').PlutoKernels + + + +local Hydra = { + Identifier = "Hydra", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "HYDRA", + Observer = "PLUTO BARYCENTER", + Kernels = kernels + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.53E5, 0.53E5, 0.53E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + +local HydraTrail = { + Identifier = "HydraTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "HYDRA", + Observer = "PLUTO BARYCENTER", + }, + Color = { 0.00, 0.62, 1.00 }, + Period = 38.20177, + Resolution = 1000 + }, + GUI = { + Name = "Hydra Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset new file mode 100644 index 0000000000..25aec2f0b6 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -0,0 +1,51 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('../transforms') +local kernels = asset.require('../kernels').PlutoKernels + + + +local Kerberos = { + Identifier = "Kerberos", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "KERBEROS", + Observer = "PLUTO BARYCENTER", + Kernels = PlutoKernels + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.1E5, 0.1E5, 0.1E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + +local KerberosTrail = { + Identifier = "KerberosTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "KERBEROS", + Observer = "PLUTO BARYCENTER", + }, + Color = { 0.00, 0.62, 1.00 }, + Period = 32.16756, + Resolution = 1000 + }, + GUI = { + Name = "Hydra Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset new file mode 100644 index 0000000000..fac09bf119 --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -0,0 +1,51 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('../transforms') +local kernels = asset.require('../kernels').PlutoKernels + + + +local Nix = { + Identifier = "Nix", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "NIX", + Observer = "PLUTO BARYCENTER", + Kernels = PlutoKernels + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.45E5, 0.45E5, 0.45E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + +local NixTrail = { + Identifier = "NixTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "NIX", + Observer = "PLUTO BARYCENTER", + }, + Color = { 0.00, 0.62, 1.00 }, + Period = 24.85463, + Resolution = 1000 + }, + GUI = { + Name = "Nix Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail }) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset new file mode 100644 index 0000000000..ceca463f5f --- /dev/null +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -0,0 +1,51 @@ +local assetHelper = asset.require('util/asset_helper') +local transforms = asset.require('../transforms') +local kernels = asset.require('../kernels').PlutoKernels + + + +local Styx = { + Identifier = "Styx", + Parent = transforms.PlutoBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "STYX", + Observer = "PLUTO BARYCENTER", + Kernels = PlutoKernels + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 0.45E5, 0.45E5, 0.45E5 }, + SegmentsPerPatch = 64, + Layers = {} + }, + GUI = { + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + +local StyxTrail = { + Identifier = "StyxTrail", + Parent = transforms.PlutoBarycenter.Identifier, + Renderable = { + Type = "RenderableTrailOrbit", + Translation = { + Type = "SpiceTranslation", + Target = "STYX", + Observer = "PLUTO BARYCENTER", + }, + Color = { 0.00, 0.62, 1.00 }, + Period = 20.16155, + Resolution = 1000 + }, + GUI = { + Name = "Styx Trail", + Path = "/Solar System/Dwarf Planets/Pluto" + } +} + + + +assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail }) diff --git a/data/assets/scene/solarsystem/planets.asset b/data/assets/scene/solarsystem/planets.asset deleted file mode 100644 index 0783d64e0d..0000000000 --- a/data/assets/scene/solarsystem/planets.asset +++ /dev/null @@ -1,36 +0,0 @@ -asset.request('./planets/mercury/mercury') - -asset.request('./planets/venus/venus') -asset.request('./planets/venus/atmosphere') - -asset.request('./planets/earth/earth') -asset.request('./planets/earth/atmosphere') -asset.request('./planets/earth/markers') -asset.request('./planets/earth/nycmodel/upperMan.asset') -asset.request('./planets/earth/nycmodel/lowerMan.asset') -asset.request('./planets/earth/moon/moon') - -asset.request('./planets/mars/mars') -asset.request('./planets/mars/atmosphere') - -asset.request('./planets/jupiter/jupiter') -asset.request('./planets/jupiter/major_moons') - -asset.request('./planets/saturn/saturn') -asset.request('./planets/saturn/major_moons') - -asset.request('./planets/uranus/uranus') -asset.request('./planets/uranus/major_moons') - -asset.request('./planets/neptune/neptune') -asset.request('./planets/neptune/major_moons') - - -asset.meta = { - Name = "Planets", - Version = "1.0", - Description = [[ Collection of planets in the solar system ]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" -} diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset new file mode 100644 index 0000000000..2ad62dd2c1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/default_layers.asset @@ -0,0 +1,28 @@ +asset.require('./earth/default_layers') +asset.require('./earth/moon/default_layers') + +asset.require('./jupiter/default_layers') +asset.require('./jupiter/callisto/default_layers') +asset.require('./jupiter/europa/default_layers') +asset.require('./jupiter/ganymede/default_layers') +asset.require('./jupiter/io/default_layers') + +asset.require('./mars/default_layers') + +asset.require('./mercury/default_layers') + +asset.require('./neptune/default_layers') + +asset.require('./saturn/default_layers') +asset.require('./saturn/dione/default_layers') +asset.require('./saturn/enceladus/default_layers') +asset.require('./saturn/hyperion/default_layers') +asset.require('./saturn/iapetus/default_layers') +asset.require('./saturn/mimas/default_layers') +asset.require('./saturn/rhea/default_layers') +asset.require('./saturn/tethys/default_layers') +asset.require('./saturn/titan/default_layers') + +asset.require('./uranus/default_layers') + +asset.require('./venus/default_layers') diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset new file mode 100644 index 0000000000..96e165923e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -0,0 +1,33 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./earth') +local globeIdentifier = globeAsset.Earth.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') +local colorFallbackLayer = asset.require('./layers/colorlayers/blue_marble_fallback').layer +local nightFallbackLayer = asset.require('./layers/nightlayers/earth_night_texture').layer +local heightFallbackLayer = asset.require('./layers/heightlayers/blue_marble_height_fallback').layer + +colorFallbackLayer.Enabled = true +heightFallbackLayer.Enabled = true +nightFallbackLayer.Enabled = true + +local colorLayer = asset.require('./layers/colorlayers/esri_viirs_combo').layer +local heightLayer = asset.require('./layers/heightlayers/terrain_tileset').layer +local nightLayer = asset.require('./layers/nightlayers/earth_at_night_2012').layer +local waterMask = asset.require('./layers/watermasks/modis_water_mask').layer + +colorLayer.Enabled = true +colorLayer.Fallback = colorFallbackLayer + +heightLayer.Enabled = true +heightLayer.Fallback = heightFallbackLayer + +nightLayer.Enabled = true +nightLayer.Fallback = nightFallbackLayer + +waterMask.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) 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 new file mode 100644 index 0000000000..5c6b8ddc33 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal", + Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "AMSRU2_Sea_Ice_Concentration_12km", + "2012-05-08", + "Yesterday", + "1d", + "2km", + "png" + ) +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..cfdf9d13f1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "Aqua_Modis_Temporal", + Name = "Aqua Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Aqua_CorrectedReflectance_TrueColor", + "2002-07-04", + "Yesterday", + "1d", + "250m", + "jpg" + ) +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset new file mode 100644 index 0000000000..942c2f5343 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../earth_textures").TexturesPath + +local layer = { + Identifier = "Blue_Marble", + Name = "Blue Marble", + FilePath = texturesPath .. "/earth_bluemarble.jpg", +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..d9ea551409 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "BMNG_Sweden", + Name = "BMNG [Sweden]", + FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..a96f4b1250 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "BMNG_Utah", + Name = "BMNG [Utah]", + FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..ba24b18cf9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "ESRI_Imagery_World_2D", + Name = "ESRI Imagery World 2D", + FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..1cde8cd46b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -0,0 +1,38 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "ESRI_VIIRS_Combo", + Name = "ESRI VIIRS Combo", + Type = "ByLevelTileLayer", + LevelTileProviders = { + { + MaxLevel = 4, + TileProvider = { + Identifier = "Temporal_VIIRS_SNPP", + Name = "Temporal VIIRS SNPP", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Today", + "1d", + "250m", + "jpg" + ), + PadTiles = false + } + }, + { + MaxLevel = 22, + TileProvider = { + Identifier = "ESRI_World_Imagery", + Name = "ESRI World Imagery", + FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms", + PadTiles = false + } + }, + }, + PadTiles = false, +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..05ac0221c3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "ESRI_World_Imagery", + Name = "ESRI World Imagery", + FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..0d8d9070f5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", + Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "GHRSST_L4_MUR_Sea_Surface_Temperature", + "2002-06-01", + "Yesterday", + "1d", + "1km", + "png" + ) +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..dd648c68c3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "Terra_Modis_Temporal", + Name = "Terra Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_CorrectedReflectance_TrueColor", + "2000-02-24", + "Yesterday", + "1d", + "250m", + "jpg" + ) +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..1bc027c5a3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "MODIS_Terra_Chlorophyll_A_Temporal", + Name = "MODIS Terra Chlorophyll A (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_Chlorophyll_A", + "2013-07-02", + "Yesterday", + "1d", + "1km", + "png" + ) +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..dd648c68c3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "Terra_Modis_Temporal", + Name = "Terra Modis (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_CorrectedReflectance_TrueColor", + "2000-02-24", + "Yesterday", + "1d", + "250m", + "jpg" + ) +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..634fdd0c2a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "VIIRS_SNPP_Temporal", + Name = "VIIRS SNPP (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_CorrectedReflectance_TrueColor", + "2015-11-24", + "Yesterday", + "1d", + "250m", + "jpg" + ) +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset new file mode 100644 index 0000000000..03e3dd4b7c --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset @@ -0,0 +1,48 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/esri_viirs_combo").layer, + asset.require(colorLayersPath .. "/esri_world_imagery").layer, + asset.require(colorLayersPath .. "/esri_imagery_world_2d").layer, + asset.require(colorLayersPath .. "/viirs_snpp_temporal").layer, + asset.require(colorLayersPath .. "/aqua_modis_temporal").layer, + asset.require(colorLayersPath .. "/terra_modis_temporal").layer, + asset.require(colorLayersPath .. "/bmng_utah").layer, + asset.require(colorLayersPath .. "/bmng_sweden").layer, + asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal").layer, + asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal").layer, + asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal").layer, + asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal").layer +} + +local heightLayersPath = "./heightlayers" +local heightLayers = { + asset.require(heightLayersPath .. "/terrain_tileset").layer +} + +local nightLayersPath = "./nightlayers" +local nightLayers = { + asset.require(nightLayersPath .. "/earth_at_night_2012").layer, + asset.require(nightLayersPath .. "/earth_at_night_temporal").layer +} + +local overlaysPath = "./overlays" +local overlays = { + asset.require(overlaysPath .. "/coastlines").layer, + asset.require(overlaysPath .. "/reference_features").layer, + asset.require(overlaysPath .. "/reference_labels").layer, + asset.require(overlaysPath .. "/tile_indices").layer, + asset.require(overlaysPath .. "/size_reference").layer +} + +local waterMasksPath = "./watermasks" +local waterMasks = { + asset.require(waterMasksPath .. "/gebco_sweden").layer, + asset.require(waterMasksPath .. "/gebco_utah").layer, + asset.require(waterMasksPath .. "/modis_water_mask").layer +} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height_fallback.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height_fallback.asset new file mode 100644 index 0000000000..0ea5928e43 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height_fallback.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../earth_textures").TexturesPath + +local layer = { + Name = "Earth Bluemarble Height", + Identifier = "Earth_Bluemarble_Height", + FilePath = texturesPath .. "/earth_bluemarble_height.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset new file mode 100644 index 0000000000..d943d69ab4 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -0,0 +1,10 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Terrain_tileset", + Name = "Terrain tileset", + FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms", + TilePixelSize = 64, +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset new file mode 100644 index 0000000000..fb3fe68019 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Earth_at_Night_2012", + Name = "Earth at Night 2012", + FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..f5ddd9009b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -0,0 +1,15 @@ +local layer = { + Identifier = "Earth_at_Night_Temporal", + Name = "Earth at Night (Temporal)", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "VIIRS_SNPP_DayNightBand_ENCC", + "2012-05-08", + "Yesterday", + "1d", + "500m", + "png" + ) +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset new file mode 100644 index 0000000000..4d11cbff30 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../earth_textures").TexturesPath + +local layer = { + Identifier = "Earth_Night", + Name = "Earth Night", + FilePath = texturesPath .. "/earth_night.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset new file mode 100644 index 0000000000..e97bc82db2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset @@ -0,0 +1,8 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Coastlines", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset new file mode 100644 index 0000000000..10b6d5762f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Reference_Features", + Name = "Reference Features", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset new file mode 100644 index 0000000000..0254f65792 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Reference_Labels", + Name = "Reference Labels", + FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset new file mode 100644 index 0000000000..6c91588e40 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset @@ -0,0 +1,10 @@ +local earthAsset = asset.require("./../../earth") + +local layer ={ + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = earthAsset.Earth.Renderable.Radii +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset new file mode 100644 index 0000000000..5957fd348d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Tile_Indices", + Name = "Tile Indices", + Type = "TileIndexTileLayer" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset new file mode 100644 index 0000000000..99090e404e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Name = "Gebco [Sweden]", + Identifier = "Gebco_Sweden", + FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset new file mode 100644 index 0000000000..3b48b71fb2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Name = "Gebco [Utah]", + Identifier = "Gebco_Utah", + FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset new file mode 100644 index 0000000000..56acd3c123 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset @@ -0,0 +1,9 @@ +local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MODIS_Water_Mask", + Name = "MODIS Water Mask", + FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset new file mode 100644 index 0000000000..ca781487ae --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -0,0 +1,16 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./moon') +local globeIdentifier = globeAsset.Moon.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/wac_utah').layer +local heightLayer = asset.require('./layers/heightlayers/loladem_utah').layer + +colorLayer.Enabled = true +heightLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset new file mode 100644 index 0000000000..0a4ebb7b8f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "ClemUvvis_Sweden", + Name = "Clem Uvvis [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Clem_Uvvis.wms", + Settings = { + Gamma = 1.14, + Multiplier = 1.4 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset new file mode 100644 index 0000000000..ea9a14da82 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "ClemUvvis_Utah", + Name = "Clem Uvvis [Utah]", + FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms", + Settings = { + Gamma = 1.14, + Multiplier = 1.4 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset new file mode 100644 index 0000000000..21962f4389 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Kaguya_Sweden", + Name = "Kaguya [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Kaguya.vrt", + Settings = { + Gamma = 1.0, + Multiplier = 1.23 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset new file mode 100644 index 0000000000..d2353246aa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Kaguya_Utah", + Name = "Kaguya [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Kaguya.vrt", + Settings = { + Gamma = 1.0, + Multiplier = 1.23 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset new file mode 100644 index 0000000000..ed3d24f7c8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Lola_Clr_Shade_Sweden", + Name = "Lola Color Shade [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset new file mode 100644 index 0000000000..bc96ae1118 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Lola_Clr_Shade_Utah", + Name = "Lola Color Shade [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset new file mode 100644 index 0000000000..7b2e7e98a2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Lola_Shade_Sweden", + Name = "Lola Shade [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset new file mode 100644 index 0000000000..d110a913c9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Lola_Shade_Utah", + Name = "Lola Shade [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset new file mode 100644 index 0000000000..1e7f03e2a2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "UvvisHybrid_Sweden", + Name = "Uvvis Hybrid [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Uvvis_Hybrid.wms", + Settings = { + Gamma = 0.52, + Multiplier = 0.65 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset new file mode 100644 index 0000000000..95dd87ecf8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "UvvisHybrid_Utah", + Name = "Uvvis Hybrid [Utah]", + FilePath = mapServiceConfigs .. "/Utah/UvvisHybrid.wms", + Settings = { + Gamma = 0.52, + Multiplier = 0.65 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset new file mode 100644 index 0000000000..3ac1e5a080 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "WAC_Sweden", + Name = "WAC [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/WAC.wms", + Settings = { Gamma = 0.84 } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset new file mode 100644 index 0000000000..ae192546cb --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "WAC_Utah", + Name = "WAC [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Wac.wms", + Settings = { Gamma = 0.84 } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset new file mode 100644 index 0000000000..5a28a62054 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset @@ -0,0 +1,31 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/wac_utah").layer, + asset.require(colorLayersPath .. "/wac_sweden").layer, + asset.require(colorLayersPath .. "/clemuvvis_utah").layer, + asset.require(colorLayersPath .. "/clemuvvis_sweden").layer, + asset.require(colorLayersPath .. "/uvvishybrid_utah").layer, + asset.require(colorLayersPath .. "/uvvishybrid_sweden").layer, + asset.require(colorLayersPath .. "/kaguya_utah").layer, + asset.require(colorLayersPath .. "/kaguya_sweden").layer, + asset.require(colorLayersPath .. "/lola_clr_shade_utah").layer, + asset.require(colorLayersPath .. "/lola_clr_shade_sweden").layer, + asset.require(colorLayersPath .. "/lola_shade_utah").layer, + asset.require(colorLayersPath .. "/lola_shade_sweden").layer +} + +local heightLayersPath = "./heightlayers" +local heightLayers = { + asset.require(heightLayersPath .. "/loladem_utah").layer, + asset.require(heightLayersPath .. "/loladem_sweden").layer +} + +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset new file mode 100644 index 0000000000..e3298925b5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset @@ -0,0 +1,11 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "LolaDem_Sweden", + Name = "Lola DEM [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Lola_DEM.wms", + TilePixelSize = 64, + Settings = { Multiplier = 0.5 } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset new file mode 100644 index 0000000000..50f040dcd8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset @@ -0,0 +1,11 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "LolaDem_Utah", + Name = "Lola DEM [Utah]", + FilePath = mapServiceConfigs .. "/Utah/LolaDem.wms", + TilePixelSize = 64, + Settings = { Multiplier = 0.5 } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset new file mode 100644 index 0000000000..c1d6a77a78 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Callisto Textures", + Type = "HttpSynchronization", + Identifier = "callisto_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset new file mode 100644 index 0000000000..12e7d431d9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./callisto') +local globeIdentifier = globeAsset.Callisto.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/callisto_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset new file mode 100644 index 0000000000..2d04dd4f4e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../callisto_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/callisto.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset new file mode 100644 index 0000000000..7ae26c9112 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/callisto_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset new file mode 100644 index 0000000000..a1a548fbca --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./jupiter') +local globeIdentifier = globeAsset.Jupiter.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/jupiter_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset new file mode 100644 index 0000000000..6d3fbe2115 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./europa') +local globeIdentifier = globeAsset.Europa.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/voyager_global_mosaic').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset new file mode 100644 index 0000000000..ebd8095845 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Europa Textures", + Type = "HttpSynchronization", + Identifier = "europa_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset new file mode 100644 index 0000000000..f7a1b0e405 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../europa_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/europa.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset new file mode 100644 index 0000000000..8588352efa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -0,0 +1,10 @@ +local map_service_configs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Voyager_Global_Mosaic", + Name = "Voyager Global Mosaic [Sweden]", + FilePath = map_service_configs .. "/LiU/Voyager_GalileoSSI_global_mosaic_500m.wms", + BlendMode = "Color", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset new file mode 100644 index 0000000000..3019fc9938 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset @@ -0,0 +1,16 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/europa_texture").layer, + asset.require(colorLayersPath .. "/voyager_global_mosaic").layer +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset new file mode 100644 index 0000000000..192d7d119b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./ganymede') +local globeIdentifier = globeAsset.Ganymede.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/ganymede_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset new file mode 100644 index 0000000000..e96a231214 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Ganymede Textures", + Type = "HttpSynchronization", + Identifier = "ganymede_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset new file mode 100644 index 0000000000..7ad7aeab2c --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../ganymede_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/ganymede.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset new file mode 100644 index 0000000000..757bebd1fa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/ganymede_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset new file mode 100644 index 0000000000..7c3e2c7fb9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./io') +local globeIdentifier = globeAsset.Io.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/io_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset new file mode 100644 index 0000000000..e6d7b81991 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Io Textures", + Type = "HttpSynchronization", + Identifier = "io_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset new file mode 100644 index 0000000000..e3bef0c607 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../io_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/io.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset new file mode 100644 index 0000000000..7e7f5a4366 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/io_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset new file mode 100644 index 0000000000..421670579f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Jupiter Textures", + Type = "HttpSynchronization", + Identifier = "jupiter_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset new file mode 100644 index 0000000000..1ecbef043e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../jupiter_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/jupiter.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset new file mode 100644 index 0000000000..0f96d790c5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/jupiter_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset new file mode 100644 index 0000000000..6b638a6777 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -0,0 +1,21 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./mars') +local globeIdentifier = globeAsset.Mars.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorFallbackLayer = asset.require('./layers/colorlayers/mars_texture').layer +colorFallbackLayer.Enabled = true + +local colorLayer = asset.require('./layers/colorlayers/moc_wa_color_utah').layer +local heightLayer = asset.require('./layers/heightlayers/mola_utah').layer + +colorLayer.Enabled = true +colorLayer.Fallback = colorFallbackLayer + +heightLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) 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 new file mode 100644 index 0000000000..36d34e90df --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -0,0 +1,14 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "CTX_blended_01", + Name = "CTX Blended beta01", + FilePath = mapServiceConfigs .. "/ESRI/CTX/CTXblended.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.14, + Multiplier = 1.54 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset new file mode 100644 index 0000000000..6663ea3c82 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_sweden.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "CTX_Mosaic_Sweden", + Name = "CTX Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/CTX.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset new file mode 100644 index 0000000000..862c5bdc7d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_mosaic_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "CTX_Mosaic_Utah", + Name = "CTX Mosaic [Utah]", + FilePath = mapServiceConfigs .. "/Utah/CTX.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..b2ed3af406 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../mars_textures").TexturesPath + +local layer = { + Identifier = "Mars_Texture", + Name = "Mars Texture", + FilePath = texturesPath .. "/mars.jpg", +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..c06516d76c --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MOC_WA_Color_LiU", + Name = "MOC WA Color [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Color.wms", + Settings = { + Gamma = 1.6, + Multiplier = 1.07 + } +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..ad8531e54b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -0,0 +1,15 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local texturesPath = asset.require("./../../mars_textures").TexturesPath + +local layer = { + Identifier = "MOC_WA_Color_Utah", + Name = "MOC WA Color [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms", + Settings = { + Gamma = 1.6, + Multiplier = 1.07 + } +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..3c373f4fc1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MOLA_HRSC_Sweden", + Name = "MOLA HRSC [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..46c06cacfa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MOLA_HRSC_Utah", + Name = "MOLA HRSC [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..684f753349 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MOLA_Pseudo_Color_Sweden", + Name = "MOLA Pseudo Color [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..b0359121fa --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "MOLA_Pseudo_Color_Utah", + Name = "MOLA Pseudo Color [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..e5fa9856cc --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Themis_IR_Day_Sweden", + Name = "Themis IR Day [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Day.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..f8705906b6 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Themis_IR_Day_Utah", + Name = "Themis IR Day [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..20321c5382 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Themis_IR_Night_Sweden", + Name = "Themis IR Night [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Themis_IR_Night.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..f9ccf0f2f7 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Themis_IR_Night_Utah", + Name = "Themis IR Night [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms", + BlendMode = "Color" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..911ef40e8b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Viking_MDIM_Sweden", + Name = "Viking MDIM [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/MDIM.wms" +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..b0f9131d49 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Viking_MDIM_Utah", + Name = "Viking MDIM [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mdim.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset new file mode 100644 index 0000000000..13dba5d2ee --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset @@ -0,0 +1,41 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/moc_wa_color_utah").layer, + asset.require(colorLayersPath .. "/moc_wa_color_liu").layer, + asset.require(colorLayersPath .. "/viking_mdim_utah").layer, + asset.require(colorLayersPath .. "/viking_mdim_sweden").layer, + asset.require(colorLayersPath .. "/mola_pseudo_color_utah").layer, + asset.require(colorLayersPath .. "/mola_pseudo_color_sweden").layer, + asset.require(colorLayersPath .. "/mola_hrsc_utah").layer, + asset.require(colorLayersPath .. "/mola_hrsc_sweden").layer, + asset.require(colorLayersPath .. "/themis_ir_day_utah").layer, + asset.require(colorLayersPath .. "/themis_ir_day_sweden").layer, + asset.require(colorLayersPath .. "/themis_ir_night_utah").layer, + asset.require(colorLayersPath .. "/themis_ir_night_sweden").layer, + asset.require(colorLayersPath .. "/ctx_mosaic_utah").layer, + asset.require(colorLayersPath .. "/ctx_mosaic_sweden").layer, + asset.require(colorLayersPath .. "/ctx_blended_01").layer +} + +local heightLayersPath = "./heightlayers" +local heightLayers = { + asset.require(heightLayersPath .. "/mola").layer, + asset.require(heightLayersPath .. "/mola_europe").layer, + asset.require(heightLayersPath .. "/mola_utah").layer, +} + +local nightLayers = {} + +local overlaysPath = "./overlays" +local overlays = { + asset.require(overlaysPath .. "/indices").layer, + asset.require(overlaysPath .. "/size_reference").layer, +} + +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset new file mode 100644 index 0000000000..bd2bd0b7df --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Mola", + Name = "Mola Elevation", + FilePath = mapServiceConfigs .. "/Mars_MGS_MOLA_DEM.wms", + TilePixelSize = 90 +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset new file mode 100644 index 0000000000..8173417a7e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Mola_Europe", + Name = "Mola Elevation [Europe]", + FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms", + TilePixelSize = 90 +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..e68601a547 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Mola_Utah", + Name = "Mola Elevation [Utah]", + FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms", + TilePixelSize = 90 +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset new file mode 100644 index 0000000000..992916926f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset @@ -0,0 +1,6 @@ +local layer = { + Identifier = "Indices", + Type = "TileIndexTileLayer" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset new file mode 100644 index 0000000000..0b2fbf071f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset @@ -0,0 +1,10 @@ +local marsAsset = asset.require("./../../mars") + +local layer ={ + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = marsAsset.Mars.Renderable.Radii +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/mars_textures.asset b/data/assets/scene/solarsystem/planets/mars/mars_textures.asset new file mode 100644 index 0000000000..946d20314a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/mars_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Mars Textures", + Type = "HttpSynchronization", + Identifier = "mars_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset new file mode 100644 index 0000000000..c5c16d56ab --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./mercury') +local globeIdentifier = globeAsset.Mercury.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/messenger_bdr_utah').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset new file mode 100644 index 0000000000..30ae327b17 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../mercury_textures").TexturesPath + +local layer = { + Identifier = "alsimap_02122015", + FilePath = texturesPath .. "/alsimap_02122015.png", + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset new file mode 100644 index 0000000000..b7a5efe5b9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../mercury_textures").TexturesPath + +local layer = { + Identifier = "casimap_02122015", + FilePath = texturesPath .. "/casimap_02122015.png", + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset new file mode 100644 index 0000000000..2c840f0c33 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../mercury_textures").TexturesPath + +local layer = { + Identifier = "fesimap_02122015", + FilePath = texturesPath .. "/fesimap_02122015.png", + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset new file mode 100644 index 0000000000..9228509d5b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_sweden.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_BDR_Sweden", + Name = "Messenger BDR [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_BDR.wms", + TilePixelSize = 360, +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset new file mode 100644 index 0000000000..d5f385400a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_bdr_utah.asset @@ -0,0 +1,10 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_BDR_Utah", + Name = "Messenger BDR [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerBDR.wms", + TilePixelSize = 360, +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset new file mode 100644 index 0000000000..431f348d0b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_HIE_Sweden", + Name = "Messenger HIE [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_HIE.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset new file mode 100644 index 0000000000..2736325f1b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hie_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_HIE_Utah", + Name = "Messenger HIE [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerHIE.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset new file mode 100644 index 0000000000..1f708c19a5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_HIW_Sweden", + Name = "Messenger HIW [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_HIW.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset new file mode 100644 index 0000000000..ee4ecbefb2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_hiw_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_HIW_Utah", + Name = "Messenger HIW [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerHIW.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset new file mode 100644 index 0000000000..c24b408cb9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_LOI_Sweden", + Name = "Messenger LOI [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_LOI.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset new file mode 100644 index 0000000000..3885121ee8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_loi_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_LOI_Utah", + Name = "Messenger LOI [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerLOI.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset new file mode 100644 index 0000000000..378619ad62 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_MDIS_Sweden", + Name = "Messenger MDIS [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_MDIS.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset new file mode 100644 index 0000000000..dfd9331221 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdis_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_MDIS_Utah", + Name = "Messenger MDIS [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMDIS.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset new file mode 100644 index 0000000000..e16f48f019 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mdr_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_MDR_Utah", + Name = "Messenger MDR [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMDR.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset new file mode 100644 index 0000000000..4362d45eaf --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_Mosaic2_Sweden", + Name = "Messenger Mosaic2 [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic_2.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset new file mode 100644 index 0000000000..e24c75f7d5 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic2_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_Mosaic2_Utah", + Name = "Messenger Mosaic2 [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic2.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset new file mode 100644 index 0000000000..b02bbc4a9d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_sweden.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_Mosaic_Sweden", + Name = "Messenger Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset new file mode 100644 index 0000000000..6947cf1ebc --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mosaic_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_Mosaic_Utah", + Name = "Messenger Mosaic [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic.wms" +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset new file mode 100644 index 0000000000..2274f16cce --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_mp3_utah.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_MP3_Utah", + Name = "Messenger MP3 [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerMP3.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset new file mode 100644 index 0000000000..2e3787f465 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_sweden.asset @@ -0,0 +1,14 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_SHADE_Sweden", + Name = "Messenger SHADE [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/Messenger_SHADE.wms", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset new file mode 100644 index 0000000000..4946d96510 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/messenger_shade_utah.asset @@ -0,0 +1,14 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Messenger_SHADE_Utah", + Name = "Messenger SHADE [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MessengerSHADE.wms", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset new file mode 100644 index 0000000000..29af7bc52d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -0,0 +1,13 @@ +local texturesPath = asset.require("./../../mercury_textures").TexturesPath + +local layer = { + Identifier = "mgsimap_02122015", + FilePath = texturesPath .. "/mgsimap_02122015.png", + Settings = { + Gamma = 1.33, + Multiplier = 1.15 + }, + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset new file mode 100644 index 0000000000..e72608c91b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../mercury_textures").TexturesPath + +local layer = { + Identifier = "ssimap_02122015", + FilePath = texturesPath .. "/ssimap_02122015.png", + BlendMode = "Multiply", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/layers/default_layers.asset new file mode 100644 index 0000000000..6a272985f8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/layers/default_layers.asset @@ -0,0 +1,48 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + --mdis + asset.require(colorLayersPath .. "/messenger_mdis_utah").layer, + asset.require(colorLayersPath .. "/messenger_mdis_sweden").layer, + --mossaic + asset.require(colorLayersPath .. "/messenger_mosaic_utah").layer, + asset.require(colorLayersPath .. "/messenger_mosaic_sweden").layer, + --mosaic2 aka 8 color + asset.require(colorLayersPath .. "/messenger_mosaic2_utah").layer, + asset.require(colorLayersPath .. "/messenger_mosaic2_sweden").layer, + --bdr + asset.require(colorLayersPath .. "/messenger_bdr_utah").layer, + asset.require(colorLayersPath .. "/messenger_bdr_sweden").layer, + --mdr + asset.require(colorLayersPath .. "/messenger_mdr_utah").layer, + --mp3 + asset.require(colorLayersPath .. "/messenger_mp3_utah").layer, + --hie + asset.require(colorLayersPath .. "/messenger_hie_utah").layer, + asset.require(colorLayersPath .. "/messenger_hie_sweden").layer, + --hiw + asset.require(colorLayersPath .. "/messenger_hiw_utah").layer, + asset.require(colorLayersPath .. "/messenger_hiw_sweden").layer, + --loi + asset.require(colorLayersPath .. "/messenger_loi_utah").layer, + asset.require(colorLayersPath .. "/messenger_loi_sweden").layer, + --shade + asset.require(colorLayersPath .. "/messenger_shade_utah").layer, + asset.require(colorLayersPath .. "/messenger_shade_sweden").layer, + --local textures, these are mineral abundance maps + asset.require(colorLayersPath .. "/alsimap_02122015").layer, + asset.require(colorLayersPath .. "/casimap_02122015").layer, + asset.require(colorLayersPath .. "/fesimap_02122015").layer, + asset.require(colorLayersPath .. "/mgsimap_02122015").layer, + asset.require(colorLayersPath .. "/ssimap_02122015").layer +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset b/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset new file mode 100644 index 0000000000..cc275ee677 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mercury/mercury_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Mercury Textures", + Type = "HttpSynchronization", + Identifier = "mercury_abundance_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset new file mode 100644 index 0000000000..73888f0f5d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./neptune') +local globeIdentifier = globeAsset.Neptune.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/neptune_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset new file mode 100644 index 0000000000..c1b26cc630 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../neptune_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/neptune.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/neptune/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/layers/default_layers.asset new file mode 100644 index 0000000000..05b5a24c3d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/neptune_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset b/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset new file mode 100644 index 0000000000..9674b1dde9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/neptune_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Neptune textures", + Type = "HttpSynchronization", + Identifier = "neptune_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset new file mode 100644 index 0000000000..abac03b55a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -0,0 +1,34 @@ +asset.request('./mercury/mercury') + +asset.request('./venus/venus') +asset.request('./venus/atmosphere') + +asset.request('./earth/earth') +asset.request('./earth/atmosphere') +asset.request('./earth/markers') +asset.request('./earth/moon/moon') + +asset.request('./mars/mars') +asset.request('./mars/atmosphere') + +asset.request('./jupiter/jupiter') +asset.request('./jupiter/major_moons') + +asset.request('./saturn/saturn') +asset.request('./saturn/major_moons') + +asset.request('./uranus/uranus') +asset.request('./uranus/major_moons') + +asset.request('./neptune/neptune') +asset.request('./neptune/major_moons') + + +asset.meta = { + Name = "Planets", + Version = "1.0", + Description = [[ Collection of planets in the solar system ]], + Author = "OpenSpace Team", + URL = "http://openspaceproject.com", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset new file mode 100644 index 0000000000..8c4825f46b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./saturn') +local globeIdentifier = globeAsset.Saturn.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/saturn_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset new file mode 100644 index 0000000000..493ddb6abd --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./dione') +local globeIdentifier = globeAsset.Dione.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/dione_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione_textures.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione_textures.asset new file mode 100644 index 0000000000..d104446236 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Dione textures", + Type = "HttpSynchronization", + Identifier = "dione_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset new file mode 100644 index 0000000000..d78b99e7d8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../dione_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/dione.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/default_layers.asset new file mode 100644 index 0000000000..6986fc0ef8 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/dione_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset new file mode 100644 index 0000000000..92787efed3 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./enceladus') +local globeIdentifier = globeAsset.Enceladus.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/global_mosaic_100m_hpf').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset new file mode 100644 index 0000000000..bec59acc1e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Enceladus textures", + Type = "HttpSynchronization", + Identifier = "enceladus_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset new file mode 100644 index 0000000000..af65066152 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../enceladus_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/enceladus.jpg", +} + +asset.export("layer", layer) 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 new file mode 100644 index 0000000000..2fd6950a08 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Global_Mosaic_100m_HPF", + Name = "Cassini Global Mosaic 100m HPF", + FilePath = mapServiceConfigs .. "/Cassini_ISS_Global_Mosaic_100m_HPF.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/default_layers.asset new file mode 100644 index 0000000000..eb72c8ae92 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/default_layers.asset @@ -0,0 +1,16 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/enceladus_texture").layer, + asset.require(colorLayersPath .. "/global_mosaic_100m_hpf").layer +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/default_layers.asset new file mode 100644 index 0000000000..5efddbf4e2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/default_layers.asset @@ -0,0 +1,12 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./hyperion') +local globeIdentifier = globeAsset.Hyperion.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +-- @TODO: when we have a working texture, set it to enabled here + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/layers/default_layers.asset new file mode 100644 index 0000000000..1351a03d9f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/layers/default_layers.asset @@ -0,0 +1,11 @@ +local colorLayers = {} +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset new file mode 100644 index 0000000000..b442574563 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./iapetus') +local globeIdentifier = globeAsset.Iapetus.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/iapetus_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset new file mode 100644 index 0000000000..da00c7b4c7 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Iapetus textures", + Type = "HttpSynchronization", + Identifier = "iapetus_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset new file mode 100644 index 0000000000..755ef8ea4f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../iapetus_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/iapetus.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/default_layers.asset new file mode 100644 index 0000000000..5b79b35739 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/iapetus_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset new file mode 100644 index 0000000000..adbd907eec --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../saturn_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/saturn.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/layers/default_layers.asset new file mode 100644 index 0000000000..c981abc34d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/saturn_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset new file mode 100644 index 0000000000..5c2545c96e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./mimas') +local globeIdentifier = globeAsset.Mimas.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/mimas_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset new file mode 100644 index 0000000000..cf574d1665 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../mimas_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/mimas.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/default_layers.asset new file mode 100644 index 0000000000..43f8f772b7 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/mimas_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset new file mode 100644 index 0000000000..d77e912051 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Mimas textures", + Type = "HttpSynchronization", + Identifier = "mimas_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset new file mode 100644 index 0000000000..ed174452bb --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./rhea') +local globeIdentifier = globeAsset.Rhea.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/rhea_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset new file mode 100644 index 0000000000..208f091020 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../rhea_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/rhea.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/default_layers.asset new file mode 100644 index 0000000000..37e222486c --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/rhea_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset new file mode 100644 index 0000000000..e6b1e10677 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Rhea textures", + Type = "HttpSynchronization", + Identifier = "rhea_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset b/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset new file mode 100644 index 0000000000..188f3d61fd --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/saturn_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Type = "HttpSynchronization", + Name = "Saturn textures", + Identifier = "saturn_textures", + Version = 3 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset new file mode 100644 index 0000000000..e1aa178b97 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./tethys') +local globeIdentifier = globeAsset.Tethys.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/tethys_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset new file mode 100644 index 0000000000..e7fc7e3bd6 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../tethys_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/tethys.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/default_layers.asset new file mode 100644 index 0000000000..d5c7bac2e4 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/tethys_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset new file mode 100644 index 0000000000..ac80cf268d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Tethys textures", + Type = "HttpSynchronization", + Identifier = "tethys_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset new file mode 100644 index 0000000000..ae8586f604 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -0,0 +1,16 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./titan') +local globeIdentifier = globeAsset.Titan.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require( + './layers/colorlayers/cassini_iss_global_mosaic_4km_liu' +).layer + +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) 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 new file mode 100644 index 0000000000..fa9495110b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -0,0 +1,9 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", + Name = "Cassini ISS Global Mosaic [Sweden]", + FilePath = mapServiceConfigs .. "/LiU/ISS_P19658_Mosaic_Global_4km.wms", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset new file mode 100644 index 0000000000..31cdf46534 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../titan_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/titan.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/default_layers.asset new file mode 100644 index 0000000000..e64ed8020e --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/default_layers.asset @@ -0,0 +1,16 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/titan_texture").layer, + asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_liu").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset new file mode 100644 index 0000000000..e4c0742701 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Type = "HttpSynchronization", + Name = "Titan textures", + Identifier = "titan_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset new file mode 100644 index 0000000000..681f625251 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./uranus') +local globeIdentifier = globeAsset.Uranus.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/uranus_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset new file mode 100644 index 0000000000..cdff4a7cdc --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../uranus_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/uranus.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/uranus/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/layers/default_layers.asset new file mode 100644 index 0000000000..d385faf202 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/uranus_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset b/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset new file mode 100644 index 0000000000..ea47aa39a9 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/uranus_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Uranus Textures", + Type = "HttpSynchronization", + Identifier = "uranus_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/planets/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset new file mode 100644 index 0000000000..947f0b00ba --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -0,0 +1,16 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./venus') +local globeIdentifier = globeAsset.Venus.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/magellan_mosaic_utah').layer +local heightLayer = asset.require('./layers/heightlayers/magellan').layer + +colorLayer.Enabled = true +heightLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) 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 new file mode 100644 index 0000000000..5a3f60094a --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -0,0 +1,13 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Magellan_Mosaic_Utah", + Name = "Magellan Mosaic [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.0 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset new file mode 100644 index 0000000000..3af2f21bc7 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset @@ -0,0 +1,12 @@ +local texturesPath = asset.require("./../../venus_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/venus.jpg", + Settings = { + Opacity = 0.48, + Gamma = 0.48 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/layers/default_layers.asset new file mode 100644 index 0000000000..23c322cc8b --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/layers/default_layers.asset @@ -0,0 +1,20 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/venus_texture").layer, + asset.require(colorLayersPath .. "/magellan_mosaic_utah").layer +} + +local heightLayersPath = "./heightlayers" +local heightLayers = { + asset.require(heightLayersPath .. "/magellan").layer, +} + +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset new file mode 100644 index 0000000000..80d934e6c2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -0,0 +1,14 @@ +local mapServiceConfigs = asset.localResource("./../../map_service_configs") + +local layer = { + Identifier = "Magellan", + Name = "Magellan Elevation [Utah]", + FilePath = mapServiceConfigs .. "/Utah/MagellanDEM.wms", + TilePixelSize = 64, + Settings = { + Gamma = 1.72, + Multiplier = 1.1 + } +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/venus/venus_textures.asset b/data/assets/scene/solarsystem/planets/venus/venus_textures.asset new file mode 100644 index 0000000000..a9e47905d1 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/venus/venus_textures.asset @@ -0,0 +1,7 @@ +local TexturesPath = asset.syncedResource({ + Name = "Venus Textures", + Type = "HttpSynchronization", + Identifier = "venus_textures", + Version = 1 +}) +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset new file mode 100644 index 0000000000..749b68c720 --- /dev/null +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -0,0 +1,13 @@ +local layerHelper = asset.require('util/layer_helper') +local globeAsset = asset.require('./sun') +local globeIdentifier = globeAsset.Sun.Identifier + +-- set enabled and fallback layers +local defaultLayers = asset.require('./layers/default_layers') + +local colorLayer = asset.require('./layers/colorlayers/sun_texture').layer +colorLayer.Enabled = true + +asset.onInitialize(function () + layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +end) diff --git a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset new file mode 100644 index 0000000000..24ab11d9ae --- /dev/null +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -0,0 +1,8 @@ +local texturesPath = asset.require("./../../sun_textures").TexturesPath + +local layer = { + Identifier = "Texture", + FilePath = texturesPath .. "/sun.jpg", +} + +asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/sun/layers/default_layers.asset b/data/assets/scene/solarsystem/sun/layers/default_layers.asset new file mode 100644 index 0000000000..8e136c5be4 --- /dev/null +++ b/data/assets/scene/solarsystem/sun/layers/default_layers.asset @@ -0,0 +1,15 @@ +local colorLayersPath = "./colorlayers" +local colorLayers = { + asset.require(colorLayersPath .. "/sun_texture").layer, +} + +local heightLayers = {} +local nightLayers = {} +local overlays = {} +local waterMasks = {} + +asset.export("colorLayers", colorLayers) +asset.export("heightLayers", heightLayers) +asset.export("nightLayers", nightLayers) +asset.export("overlays", overlays) +asset.export("waterMasks", waterMasks) diff --git a/data/assets/util/layer_helper.asset b/data/assets/util/layer_helper.asset new file mode 100644 index 0000000000..cb5becc4de --- /dev/null +++ b/data/assets/util/layer_helper.asset @@ -0,0 +1,18 @@ +local addLayersToGlobeByGroup = function(globeIdentifier, group, layers) + for _, layer in ipairs(layers) do + openspace.globebrowsing.addLayer(globeIdentifier, group, layer) + end +end + +-- Assumes a table containing tables with the following names as input: +-- 'colorLayers', 'heightLayers', 'nightLayers', 'overlays', 'waterMasks' +local addLayersToGlobe = function(globeIdentifier, layers) + addLayersToGlobeByGroup(globeIdentifier, 'ColorLayers', layers.colorLayers) + addLayersToGlobeByGroup(globeIdentifier, 'HeightLayers', layers.heightLayers) + addLayersToGlobeByGroup(globeIdentifier, 'NightLayers', layers.nightLayers) + addLayersToGlobeByGroup(globeIdentifier, 'Overlays', layers.overlays) + addLayersToGlobeByGroup(globeIdentifier, 'WaterMasks', layers.waterMasks) +end + +asset.export("addLayersToGlobeByGroup", addLayersToGlobeByGroup) +asset.export("addLayersToGlobe", addLayersToGlobe) diff --git a/data/profiles/asteroids.profile b/data/profiles/asteroids.profile index 9e0495975f..51d49e7866 100644 --- a/data/profiles/asteroids.profile +++ b/data/profiles/asteroids.profile @@ -14,7 +14,7 @@ scene/solarsystem/sssb/encke-type_comet scene/solarsystem/sssb/halley-type_comet scene/solarsystem/sssb/inner_main_belt_asteroid scene/solarsystem/sssb/jupiter_trojan_asteroid -scene/solarsystem/sssb/jupiter-family_comet +scene/solarsystem/sssb/jupiter-family_comet scene/solarsystem/sssb/main_belt_asteroid scene/solarsystem/sssb/mars-crossing_asteroid scene/solarsystem/sssb/outer_main_belt_asteroid diff --git a/include/openspace/util/memorymanager.h b/include/openspace/util/memorymanager.h new file mode 100644 index 0000000000..b1be10738d --- /dev/null +++ b/include/openspace/util/memorymanager.h @@ -0,0 +1,40 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2020 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_CORE___MEMORYMANAGER___H__ +#define __OPENSPACE_CORE___MEMORYMANAGER___H__ + +#include + +namespace openspace { + +class MemoryManager { +public: + ghoul::MemoryPool<8 * 1024 * 1024, false> PersistentMemory; + ghoul::MemoryPool<10 * 1024, false> TemporaryMemory; +}; + +} // namespace openspace + +#endif // __OPENSPACE_CORE___MEMORYMANAGER___H__ diff --git a/modules/imgui/include/guimemorycomponent.h b/modules/imgui/include/guimemorycomponent.h new file mode 100644 index 0000000000..8f08bec8db --- /dev/null +++ b/modules/imgui/include/guimemorycomponent.h @@ -0,0 +1,41 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2020 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#ifndef __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__ +#define __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__ + +#include + +namespace openspace::gui { + +class GuiMemoryComponent : public GuiComponent { +public: + GuiMemoryComponent(); + + void render() override; +}; + +} // namespace openspace::gui + +#endif // __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__ diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp new file mode 100644 index 0000000000..7c7b27874e --- /dev/null +++ b/modules/imgui/src/guimemorycomponent.cpp @@ -0,0 +1,74 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2020 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#include + +#include +#include +#include + +namespace { + const ImVec2 Size = ImVec2(350, 500); + + template + void renderMemoryPoolInformation(const MemoryPool& p) { + //ImGui::Text("Bucket Size: %i", p.BucketSize); + ImGui::Text("Number of Buckets: %i", p.nBuckets()); + const std::vector& occupancies = p.occupancies(); + for (size_t i = 0; i < occupancies.size(); ++i) { + ImGui::Text( + " %i: %i/%i (%.2f/%.2f kiB)", + i, + occupancies[i], + p._bucketSize, + occupancies[i] / 1024.f, + p._bucketSize / 1024.f + ); + } + } +} // namespace + +namespace openspace::gui { + +GuiMemoryComponent::GuiMemoryComponent() + : GuiComponent("memory_information", "Memory Information") +{} + +void GuiMemoryComponent::render() { + ImGui::SetNextWindowCollapsed(_isCollapsed); + + bool v = _isEnabled; + ImGui::Begin("Memory Information", &v, Size, 0.5f); + _isEnabled = v; + _isCollapsed = ImGui::IsWindowCollapsed(); + + ImGui::Text("%s", "Persistent Memory Pool"); + renderMemoryPoolInformation(global::memoryManager.PersistentMemory); + + ImGui::Text("%s", "Temporary Memory Pool"); + renderMemoryPoolInformation(global::memoryManager.TemporaryMemory); + ImGui::End(); +} + +} // namespace openspace::gui diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp index 8c9e908ed8..b3ac941974 100644 --- a/src/scene/profile.cpp +++ b/src/scene/profile.cpp @@ -985,7 +985,7 @@ std::string Profile::convertToScene() const { { std::string nodes; for (const std::string& n : markNodes) { - nodes += fmt::format("[[ {} ]],", n); + nodes += fmt::format("[[{}]],", n); } output += fmt::format("openspace.markInterestingNodes({{ {} }});\n", nodes); }