From 2d33a0f55499db93af2eaf126e486a29abf146db Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Mon, 17 Aug 2020 14:01:30 +0200 Subject: [PATCH] Add layers to globe on layer asset initialization --- .../pluto/charon/default_layers.asset | 16 ++--- .../layers/colorlayers/greyscale_usgs.asset | 6 ++ .../pluto/charon/layers/default_layers.asset | 15 ----- .../dwarf_planets/pluto/default_layers.asset | 16 ++--- .../layers/colorlayers/greyscale_usgs.asset | 6 ++ .../pluto/layers/default_layers.asset | 15 ----- .../planets/earth/default_layers.asset | 66 +++++++++++-------- ...om_w1_sea_ice_concentration_temporal.asset | 6 ++ .../colorlayers/aqua_modis_temporal.asset | 6 ++ .../layers/colorlayers/bmng_sweden.asset | 5 ++ .../earth/layers/colorlayers/bmng_utah.asset | 5 ++ .../colorlayers/esri_imagery_world_2D.asset | 5 ++ .../layers/colorlayers/esri_viirs_combo.asset | 8 +++ .../colorlayers/esri_world_imagery.asset | 5 ++ .../blue_marble.asset} | 3 +- ...sst_sea_surface_temperature_temporal.asset | 6 ++ ...mur_sea_surface_temperature_temporal.asset | 6 ++ .../modis_terra_chlorophyll_a_temporal.asset | 6 ++ .../colorlayers/terra_modis_temporal.asset | 6 ++ .../colorlayers/viirs_snpp_temporal.asset | 6 ++ .../planets/earth/layers/default_layers.asset | 48 -------------- .../blue_marble_height.asset} | 2 +- .../layers/heightlayers/terrain_tileset.asset | 8 +++ .../nightlayers/earth_at_night_2012.asset | 8 +++ .../nightlayers/earth_at_night_temporal.asset | 6 ++ .../nightlayers/earth_night_texture.asset | 9 --- .../fallbacks/earth_night_texture.asset | 9 +++ .../earth/layers/overlays/coastlines.asset | 5 ++ .../layers/overlays/coastlines_enabled.asset | 10 +++ .../layers/overlays/reference_features.asset | 5 ++ .../layers/overlays/reference_labels.asset | 5 ++ .../layers/overlays/size_reference.asset | 9 ++- .../earth/layers/overlays/tile_indices.asset | 5 ++ .../layers/watermasks/gebco_sweden.asset | 5 ++ .../earth/layers/watermasks/gebco_utah.asset | 5 ++ .../layers/watermasks/modis_water_mask.asset | 5 ++ .../planets/earth/moon/default_layers.asset | 35 ++++++---- .../layers/colorlayers/clemuvvis_sweden.asset | 5 ++ .../layers/colorlayers/clemuvvis_utah.asset | 5 ++ .../layers/colorlayers/kaguya_sweden.asset | 5 ++ .../moon/layers/colorlayers/kaguya_utah.asset | 5 ++ .../colorlayers/lola_clr_shade_sweden.asset | 5 ++ .../colorlayers/lola_clr_shade_utah.asset | 5 ++ .../colorlayers/lola_shade_sweden.asset | 5 ++ .../layers/colorlayers/lola_shade_utah.asset | 5 ++ .../colorlayers/uvvishybrid_sweden.asset | 5 ++ .../layers/colorlayers/uvvishybrid_utah.asset | 5 ++ .../moon/layers/colorlayers/wac_sweden.asset | 5 ++ .../moon/layers/colorlayers/wac_utah.asset | 5 ++ .../earth/moon/layers/default_layers.asset | 31 --------- .../layers/heightlayers/loladem_sweden.asset | 5 ++ .../layers/heightlayers/loladem_utah.asset | 5 ++ .../jupiter/callisto/default_layers.asset | 16 ++--- .../layers/colorlayers/callisto_texture.asset | 5 ++ .../callisto/layers/default_layers.asset | 15 ----- .../planets/jupiter/default_layers.asset | 16 ++--- .../jupiter/europa/default_layers.asset | 17 ++--- .../layers/colorlayers/europa_texture.asset | 5 ++ .../colorlayers/voyager_global_mosaic.asset | 5 ++ .../europa/layers/default_layers.asset | 16 ----- .../jupiter/ganymede/default_layers.asset | 16 ++--- .../layers/colorlayers/ganymede_texture.asset | 5 ++ .../ganymede/layers/default_layers.asset | 15 ----- .../planets/jupiter/io/default_layers.asset | 16 ++--- .../io/layers/colorlayers/io_texture.asset | 5 ++ .../jupiter/io/layers/default_layers.asset | 15 ----- .../layers/colorlayers/jupiter_texture.asset | 5 ++ .../jupiter/layers/default_layers.asset | 15 ----- .../planets/mars/default_layers.asset | 49 +++++++++----- .../layers/colorlayers/ctx_blended_01.asset | 5 ++ .../colorlayers/ctx_mosaic_sweden.asset | 5 ++ .../layers/colorlayers/ctx_mosaic_utah.asset | 5 ++ .../colorlayers/fallbacks/mars_texture.asset | 9 +++ .../layers/colorlayers/mars_texture.asset | 5 ++ .../layers/colorlayers/moc_wa_color_liu.asset | 10 ++- .../colorlayers/moc_wa_color_utah.asset | 10 ++- .../layers/colorlayers/mola_hrsc_sweden.asset | 5 ++ .../layers/colorlayers/mola_hrsc_utah.asset | 5 ++ .../mola_pseudo_color_sweden.asset | 5 ++ .../colorlayers/mola_pseudo_color_utah.asset | 5 ++ .../colorlayers/themis_ir_day_sweden.asset | 5 ++ .../colorlayers/themis_ir_day_utah.asset | 5 ++ .../colorlayers/themis_ir_night_sweden.asset | 5 ++ .../colorlayers/themis_ir_night_utah.asset | 5 ++ .../colorlayers/viking_mdim_sweden.asset | 5 ++ .../layers/colorlayers/viking_mdim_utah.asset | 5 ++ .../planets/mars/layers/default_layers.asset | 41 ------------ .../mars/layers/heightlayers/mola.asset | 5 ++ .../layers/heightlayers/mola_europe.asset | 5 ++ .../mars/layers/heightlayers/mola_utah.asset | 5 ++ .../mars/layers/overlays/indices.asset | 6 ++ .../mars/layers/overlays/size_reference.asset | 9 ++- .../planets/mercury/default_layers.asset | 49 +++++++++++--- .../layers/colorlayers/alsimap_02122015.asset | 5 ++ .../layers/colorlayers/casimap_02122015.asset | 5 ++ .../layers/colorlayers/fesimap_02122015.asset | 5 ++ .../colorlayers/messenger_bdr_sweden.asset | 5 ++ .../colorlayers/messenger_bdr_utah.asset | 5 ++ .../colorlayers/messenger_hie_sweden.asset | 5 ++ .../colorlayers/messenger_hie_utah.asset | 5 ++ .../colorlayers/messenger_hiw_sweden.asset | 5 ++ .../colorlayers/messenger_hiw_utah.asset | 5 ++ .../colorlayers/messenger_loi_sweden.asset | 5 ++ .../colorlayers/messenger_loi_utah.asset | 5 ++ .../colorlayers/messenger_mdis_sweden.asset | 5 ++ .../colorlayers/messenger_mdis_utah.asset | 5 ++ .../colorlayers/messenger_mdr_utah.asset | 5 ++ .../messenger_mosaic2_sweden.asset | 5 ++ .../colorlayers/messenger_mosaic2_utah.asset | 5 ++ .../colorlayers/messenger_mosaic_sweden.asset | 5 ++ .../colorlayers/messenger_mosaic_utah.asset | 5 ++ .../colorlayers/messenger_mp3_utah.asset | 5 ++ .../colorlayers/messenger_shade_sweden.asset | 5 ++ .../colorlayers/messenger_shade_utah.asset | 5 ++ .../layers/colorlayers/mgsimap_02122015.asset | 5 ++ .../layers/colorlayers/ssimap_02122015.asset | 5 ++ .../mercury/layers/default_layers.asset | 48 -------------- .../planets/neptune/default_layers.asset | 16 ++--- .../layers/colorlayers/neptune_texture.asset | 5 ++ .../neptune/layers/default_layers.asset | 15 ----- .../planets/saturn/default_layers.asset | 16 ++--- .../planets/saturn/dione/default_layers.asset | 16 ++--- .../layers/colorlayers/dione_texture.asset | 5 ++ .../saturn/dione/layers/default_layers.asset | 15 ----- .../saturn/enceladus/default_layers.asset | 17 ++--- .../colorlayers/enceladus_texture.asset | 5 ++ .../colorlayers/global_mosaic_100m_hpf.asset | 5 ++ .../enceladus/layers/default_layers.asset | 16 ----- .../saturn/hyperion/default_layers.asset | 13 +--- .../hyperion/layers/default_layers.asset | 11 ---- .../saturn/iapetus/default_layers.asset | 16 ++--- .../layers/colorlayers/iapetus_texture.asset | 5 ++ .../iapetus/layers/default_layers.asset | 15 ----- .../layers/colorlayers/saturn_texture.asset | 5 ++ .../saturn/layers/default_layers.asset | 15 ----- .../planets/saturn/mimas/default_layers.asset | 16 ++--- .../layers/colorlayers/mimas_texture.asset | 5 ++ .../saturn/mimas/layers/default_layers.asset | 15 ----- .../planets/saturn/rhea/default_layers.asset | 16 ++--- .../layers/colorlayers/rhea_texture.asset | 5 ++ .../saturn/rhea/layers/default_layers.asset | 15 ----- .../saturn/tethys/default_layers.asset | 16 ++--- .../layers/colorlayers/tethys_texture.asset | 5 ++ .../saturn/tethys/layers/default_layers.asset | 15 ----- .../planets/saturn/titan/default_layers.asset | 20 ++---- .../cassini_iss_global_mosaic_4km_liu.asset | 5 ++ .../layers/colorlayers/titan_texture.asset | 5 ++ .../saturn/titan/layers/default_layers.asset | 16 ----- .../planets/uranus/default_layers.asset | 16 ++--- .../layers/colorlayers/uranus_texture.asset | 5 ++ .../uranus/layers/default_layers.asset | 15 ----- .../planets/venus/default_layers.asset | 24 +++---- .../colorlayers/magellan_mosaic_utah.asset | 5 ++ .../layers/colorlayers/venus_texture.asset | 5 ++ .../planets/venus/layers/default_layers.asset | 20 ------ .../venus/layers/heightlayers/magellan.asset | 5 ++ .../solarsystem/sun/default_layers.asset | 16 ++--- .../sun/layers/colorlayers/sun_texture.asset | 5 ++ .../sun/layers/default_layers.asset | 15 ----- 159 files changed, 846 insertions(+), 761 deletions(-) delete mode 100644 data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset rename data/assets/scene/solarsystem/planets/earth/layers/colorlayers/{blue_marble_fallback.asset => fallbacks/blue_marble.asset} (51%) delete mode 100644 data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset rename data/assets/scene/solarsystem/planets/earth/layers/heightlayers/{blue_marble_height_fallback.asset => fallbacks/blue_marble_height.asset} (71%) delete mode 100644 data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset create mode 100644 data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset delete mode 100644 data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset create mode 100644 data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset delete mode 100644 data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/mercury/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/neptune/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/dione/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/enceladus/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/hyperion/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/iapetus/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/mimas/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/rhea/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/tethys/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/saturn/titan/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/uranus/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/planets/venus/layers/default_layers.asset delete mode 100644 data/assets/scene/solarsystem/sun/layers/default_layers.asset diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset index f33e3e6c24..dfe4586fcc 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./charon') -local globeIdentifier = globeAsset.Charon.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index f8c906d910..058e4caf91 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset @@ -1,7 +1,13 @@ +local globeIdentifier = asset.require("./../../charon").Charon.Identifier + 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.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 135f5c3541..0000000000 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index 8537adb532..317cd138c4 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./pluto') -local globeIdentifier = globeAsset.Pluto.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs") -local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index d451e59e79..61acdb513c 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset @@ -1,7 +1,13 @@ +local globeIdentifier = asset.require("./../../pluto").Pluto.Identifier + 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.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 135f5c3541..0000000000 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index 96e165923e..d1ad5753a3 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -1,33 +1,47 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./earth') -local globeIdentifier = globeAsset.Earth.Identifier +local colorLayersPath = "./layers/colorlayers" +local heightLayersPath = "./layers/heightlayers" +local nightLayersPath = "./layers/nightlayers" +local overlaysPath = "./layers/overlays" +local waterMasksPath = "./layers/watermasks" --- 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 +-- Color layers +local colorLayer = asset.require(colorLayersPath .. "/esri_viirs_combo") +asset.require(colorLayersPath .. "/esri_world_imagery") +asset.require(colorLayersPath .. "/esri_imagery_world_2d") +asset.require(colorLayersPath .. "/viirs_snpp_temporal") +asset.require(colorLayersPath .. "/aqua_modis_temporal") +asset.require(colorLayersPath .. "/terra_modis_temporal") +asset.require(colorLayersPath .. "/bmng_utah") +asset.require(colorLayersPath .. "/bmng_sweden") +asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal") +asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal") +asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal") +asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal") -colorFallbackLayer.Enabled = true -heightFallbackLayer.Enabled = true -nightFallbackLayer.Enabled = true +-- Height layers +local heightLayer = asset.require(heightLayersPath .. "/terrain_tileset") -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 +-- Night layers +local nightLayer = asset.require(nightLayersPath .. "/earth_at_night_2012") +asset.require(nightLayersPath .. "/earth_at_night_temporal") -colorLayer.Enabled = true -colorLayer.Fallback = colorFallbackLayer +-- Overlays +asset.require(overlaysPath .. "/coastlines") +asset.require(overlaysPath .. "/reference_features") +asset.require(overlaysPath .. "/reference_labels") +asset.require(overlaysPath .. "/tile_indices") +asset.require(overlaysPath .. "/size_reference") -heightLayer.Enabled = true -heightLayer.Fallback = heightFallbackLayer +-- Watermasks +asset.require(waterMasksPath .. "/gebco_sweden") +asset.require(waterMasksPath .. "/gebco_utah") +local watermask = asset.require(waterMasksPath .. "/modis_water_mask") -nightLayer.Enabled = true -nightLayer.Fallback = nightFallbackLayer - -waterMask.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. nightLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. watermask.layer.Identifier .. ".Enabled", true) 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 index 5c6b8ddc33..86acf6cfb8 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal", Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index cfdf9d13f1..7c65fe269f 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/aqua_modis_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "Aqua_Modis_Temporal", Name = "Aqua Modis (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index d9ea551409..7cd8f71b96 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "BMNG_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index a96f4b1250..b3c064e3d9 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/bmng_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "BMNG_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ba24b18cf9..228093d4fe 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "ESRI_Imagery_World_2D", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 1cde8cd46b..a7d8021dca 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo.asset @@ -1,4 +1,7 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + +local fallBackLayer = asset.require("./fallbacks/blue_marble").layer local layer = { Identifier = "ESRI_VIIRS_Combo", @@ -33,6 +36,11 @@ local layer = { }, }, PadTiles = false, + Fallback = fallBackLayer } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 05ac0221c3..110c1067f3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_world_imagery.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "ESRI_World_Imagery", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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/fallbacks/blue_marble.asset similarity index 51% rename from data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset rename to data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset index 942c2f5343..00a84bb426 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset @@ -1,4 +1,5 @@ -local texturesPath = asset.require("./../../earth_textures").TexturesPath +local texturesPath = asset.require("./../../../earth_textures").TexturesPath +local globeIdentifier = asset.require("./../../../earth").Earth.Identifier local layer = { Identifier = "Blue_Marble", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset index 0d8d9070f5..f841f0e7c0 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal", Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index dd648c68c3..b2d60321b3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "Terra_Modis_Temporal", Name = "Terra Modis (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 1bc027c5a3..4cf909831c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/modis_terra_chlorophyll_a_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "MODIS_Terra_Chlorophyll_A_Temporal", Name = "MODIS Terra Chlorophyll A (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index dd648c68c3..b2d60321b3 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "Terra_Modis_Temporal", Name = "Terra Modis (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 634fdd0c2a..19672b3e58 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/viirs_snpp_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "VIIRS_SNPP_Temporal", Name = "VIIRS SNPP (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 03e3dd4b7c..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/layers/default_layers.asset +++ /dev/null @@ -1,48 +0,0 @@ -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/fallbacks/blue_marble_height.asset similarity index 71% rename from data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height_fallback.asset rename to data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset index 0ea5928e43..f9a4a10cc4 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/blue_marble_height_fallback.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/fallbacks/blue_marble_height.asset @@ -1,4 +1,4 @@ -local texturesPath = asset.require("./../../earth_textures").TexturesPath +local texturesPath = asset.require("./../../../earth_textures").TexturesPath local layer = { Name = "Earth Bluemarble Height", diff --git a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset index d943d69ab4..79f374944c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset @@ -1,10 +1,18 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + +local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer local layer = { Identifier = "Terrain_tileset", Name = "Terrain tileset", FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms", TilePixelSize = 64, + Fallback = fallBackLayer } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset index fb3fe68019..277e9acf5a 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset @@ -1,9 +1,17 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + +local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer local layer = { Identifier = "Earth_at_Night_2012", Name = "Earth at Night 2012", FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms", + Fallback = fallBackLayer } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) +end) + 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 index f5ddd9009b..fd3422c73e 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset @@ -1,3 +1,5 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + local layer = { Identifier = "Earth_at_Night_Temporal", Name = "Earth at Night (Temporal)", @@ -12,4 +14,8 @@ local layer = { ) } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer) +end) + 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 deleted file mode 100644 index 4d11cbff30..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_night_texture.asset +++ /dev/null @@ -1,9 +0,0 @@ -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/nightlayers/fallbacks/earth_night_texture.asset b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset new file mode 100644 index 0000000000..7ccea6f59f --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset @@ -0,0 +1,9 @@ +local texturesPath = asset.require("./../../../earth_textures").TexturesPath + +local layer = { + Identifier = "Earth_Night Texture", + Name = "Earth Night Texture", + 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 index e97bc82db2..069cf168d7 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset @@ -1,8 +1,13 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "Coastlines", FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset new file mode 100644 index 0000000000..accb16ac44 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset @@ -0,0 +1,10 @@ +local globeIdentifier = asset.require("./../../earth").Earth.Identifier + +local layer = asset.require("./coastlines").layer +layer.Enabled = true + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + +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 index 10b6d5762f..e1c4d7eae1 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "Reference_Features", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + 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 index 0254f65792..8d14244d4c 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "Reference_Labels", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + 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 index 6c91588e40..5173e8bae0 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset @@ -1,10 +1,15 @@ -local earthAsset = asset.require("./../../earth") +local earthAsset = asset.require("./../../earth").Earth +local globeIdentifier = earthAsset.Identifier local layer ={ Identifier = "Size_Reference", Name = "Size Reference", Type = "SizeReferenceTileLayer", - Radii = earthAsset.Earth.Renderable.Radii + Radii = earthAsset.Renderable.Radii } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + 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 index 5957fd348d..95496a8134 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "Tile_Indices", @@ -6,4 +7,8 @@ local layer = { Type = "TileIndexTileLayer" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + 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 index 99090e404e..1c13cb9555 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Name = "Gebco [Sweden]", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) +end) + 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 index 3b48b71fb2..e7e4c4af35 100644 --- a/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset +++ b/data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Name = "Gebco [Utah]", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) +end) + 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 index 56acd3c123..399ab658f5 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigsPath = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../earth").Earth.Identifier local layer = { Identifier = "MODIS_Water_Mask", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer) +end) + 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 index ca781487ae..a46e934e2b 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset @@ -1,16 +1,27 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./moon') -local globeIdentifier = globeAsset.Moon.Identifier +local colorLayersPath = "./layers/colorlayers" +local heightLayersPath = "./layers/heightlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +-- Color layers +local colorLayer = asset.require(colorLayersPath .. "/wac_utah") +asset.require(colorLayersPath .. "/wac_sweden") +asset.require(colorLayersPath .. "/clemuvvis_utah") +asset.require(colorLayersPath .. "/clemuvvis_sweden") +asset.require(colorLayersPath .. "/uvvishybrid_utah") +asset.require(colorLayersPath .. "/uvvishybrid_sweden") +asset.require(colorLayersPath .. "/kaguya_utah") +asset.require(colorLayersPath .. "/kaguya_sweden") +asset.require(colorLayersPath .. "/lola_clr_shade_utah") +asset.require(colorLayersPath .. "/lola_clr_shade_sweden") +asset.require(colorLayersPath .. "/lola_shade_utah") +asset.require(colorLayersPath .. "/lola_shade_sweden") -local colorLayer = asset.require('./layers/colorlayers/wac_utah').layer -local heightLayer = asset.require('./layers/heightlayers/loladem_utah').layer +-- Height layers +local heightLayer = asset.require(heightLayersPath .. "/loladem_utah") +asset.require(heightLayersPath .. "/loladem_sweden") -colorLayer.Enabled = true -heightLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) 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 index 0a4ebb7b8f..80b291dd11 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "ClemUvvis_Sweden", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ea9a14da82..148cc9872c 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "ClemUvvis_Utah", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 21962f4389..e59fc485d2 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Kaguya_Sweden", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index d2353246aa..1b0cb27c03 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Kaguya_Utah", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ed3d24f7c8..989810f4ab 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Clr_Shade_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index bc96ae1118..c88cdb1077 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Clr_Shade_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 7b2e7e98a2..451ab441a8 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Shade_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index d110a913c9..3ccec433ba 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "Lola_Shade_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 1e7f03e2a2..6d6e74de11 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "UvvisHybrid_Sweden", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 95dd87ecf8..3c7e3c0c66 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "UvvisHybrid_Utah", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 3ac1e5a080..86e35e4cf8 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "WAC_Sweden", @@ -7,4 +8,8 @@ local layer = { Settings = { Gamma = 0.84 } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ae192546cb..7ef4a615fe 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "WAC_Utah", @@ -7,4 +8,8 @@ local layer = { Settings = { Gamma = 0.84 } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 5a28a62054..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/moon/layers/default_layers.asset +++ /dev/null @@ -1,31 +0,0 @@ -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 index e3298925b5..acf8751fc7 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "LolaDem_Sweden", @@ -8,4 +9,8 @@ local layer = { Settings = { Multiplier = 0.5 } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + 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 index 50f040dcd8..79d6ef8180 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../moon").Moon.Identifier local layer = { Identifier = "LolaDem_Utah", @@ -8,4 +9,8 @@ local layer = { Settings = { Multiplier = 0.5 } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset index 12e7d431d9..0ebb18faa8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./callisto') -local globeIdentifier = globeAsset.Callisto.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/callisto_texture") -local colorLayer = asset.require('./layers/colorlayers/callisto_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 2d04dd4f4e..39cd2108e8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../callisto_textures").TexturesPath +local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/callisto.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 7ae26c9112..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index a1a548fbca..e9fa9b0e32 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./jupiter') -local globeIdentifier = globeAsset.Jupiter.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/jupiter_texture") -local colorLayer = asset.require('./layers/colorlayers/jupiter_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Jupiter.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 6d3fbe2115..e817bafb21 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset @@ -1,13 +1,10 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./europa') -local globeIdentifier = globeAsset.Europa.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +asset.require(colorLayersPath .. "/europa_texture") +local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic") -local colorLayer = asset.require('./layers/colorlayers/voyager_global_mosaic').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Europa.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset index f7a1b0e405..dce37ba260 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../europa_textures").TexturesPath +local globeIdentifier = asset.require("./../../europa").Europa.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/europa.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 8588352efa..da00b65927 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset @@ -1,4 +1,5 @@ local map_service_configs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../europa").Europa.Identifier local layer = { Identifier = "Voyager_Global_Mosaic", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 3019fc9938..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/default_layers.asset +++ /dev/null @@ -1,16 +0,0 @@ -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 index 192d7d119b..5bb823b9a8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./ganymede') -local globeIdentifier = globeAsset.Ganymede.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/ganymede_texture") -local colorLayer = asset.require('./layers/colorlayers/ganymede_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Ganymede.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset index 7ad7aeab2c..8da0ba37ea 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/colorlayers/ganymede_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../ganymede_textures").TexturesPath +local globeIdentifier = asset.require("./../../ganymede").Ganymede.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/ganymede.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 757bebd1fa..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index 7c3e2c7fb9..e77dce099f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./io') -local globeIdentifier = globeAsset.Io.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/io_texture") -local colorLayer = asset.require('./layers/colorlayers/io_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Io.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset index e3bef0c607..26afb6b399 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/layers/colorlayers/io_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../io_textures").TexturesPath +local globeIdentifier = asset.require("./../../io").Io.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/io.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 7e7f5a4366..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/io/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset index 1ecbef043e..8273c454c6 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../jupiter_textures").TexturesPath +local globeIdentifier = asset.require("./../../jupiter").Jupiter.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/jupiter.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 0f96d790c5..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index 6b638a6777..02edb1606a 100644 --- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset @@ -1,21 +1,36 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./mars') -local globeIdentifier = globeAsset.Mars.Identifier +local colorLayersPath = "./layers/colorlayers" +local heightLayersPath = "./layers/heightlayers" +local overlaysPath = "./layers/overlays" + +-- Color layer +local colorLayer = asset.require(colorLayersPath .. "/moc_wa_color_utah") -- TODO: fallback +asset.require(colorLayersPath .. "/moc_wa_color_liu") -- TODO: fallback +asset.require(colorLayersPath .. "/viking_mdim_utah") +asset.require(colorLayersPath .. "/viking_mdim_sweden") +asset.require(colorLayersPath .. "/mola_pseudo_color_utah") +asset.require(colorLayersPath .. "/mola_pseudo_color_sweden") +asset.require(colorLayersPath .. "/mola_hrsc_utah") +asset.require(colorLayersPath .. "/mola_hrsc_sweden") +asset.require(colorLayersPath .. "/themis_ir_day_utah") +asset.require(colorLayersPath .. "/themis_ir_day_sweden") +asset.require(colorLayersPath .. "/themis_ir_night_utah") +asset.require(colorLayersPath .. "/themis_ir_night_sweden") +asset.require(colorLayersPath .. "/ctx_mosaic_utah") +asset.require(colorLayersPath .. "/ctx_mosaic_sweden") +asset.require(colorLayersPath .. "/ctx_blended_01") --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +-- Height layers +asset.require(heightLayersPath .. "/mola") +asset.require(heightLayersPath .. "/mola_europe") +local heightLayer = asset.require(heightLayersPath .. "/mola_utah") -local colorFallbackLayer = asset.require('./layers/colorlayers/mars_texture').layer -colorFallbackLayer.Enabled = true +-- Overlays +asset.require(overlaysPath .. "/indices") +asset.require(overlaysPath .. "/size_reference") -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) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) 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 index 36d34e90df..f762b02170 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "CTX_blended_01", @@ -11,4 +12,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 6663ea3c82..f5113c579d 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "CTX_Mosaic_Sweden", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 862c5bdc7d..136eb1107a 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "CTX_Mosaic_Utah", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/mars_texture.asset new file mode 100644 index 0000000000..9138ba0a24 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/fallbacks/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/mars_texture.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset index b2ed3af406..fca27b6889 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mars_texture.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mars_textures").TexturesPath +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Mars_Texture", @@ -6,4 +7,8 @@ local layer = { FilePath = texturesPath .. "/mars.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index c06516d76c..f45d9afdd0 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset @@ -1,4 +1,7 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier + +local fallbackLayer = asset.require("./fallbacks/mars_texture").layer local layer = { Identifier = "MOC_WA_Color_LiU", @@ -7,7 +10,12 @@ local layer = { Settings = { Gamma = 1.6, Multiplier = 1.07 - } + }, + Fallback = fallbackLayer } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ad8531e54b..8763d19f74 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset @@ -1,6 +1,7 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier -local texturesPath = asset.require("./../../mars_textures").TexturesPath +local fallbackLayer = asset.require("./fallbacks/mars_texture").layer local layer = { Identifier = "MOC_WA_Color_Utah", @@ -9,7 +10,12 @@ local layer = { Settings = { Gamma = 1.6, Multiplier = 1.07 - } + }, + Fallback = fallbackLayer } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 3c373f4fc1..2737ce9ecf 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_HRSC_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Mola_HRSC.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 46c06cacfa..66bae74e0c 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_HRSC_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 684f753349..2b8889c87b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_Pseudo_Color_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Mola_PseudoColor.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index b0359121fa..dcb1ac18f4 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "MOLA_Pseudo_Color_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index e5fa9856cc..89faa5565b 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Themis_IR_Day_Sweden", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index f8705906b6..08a6f6a6ce 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Themis_IR_Day_Utah", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 20321c5382..c824296cd3 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Themis_IR_Night_Sweden", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index f9ccf0f2f7..1d0442f7f5 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Themis_IR_Night_Utah", @@ -7,4 +8,8 @@ local layer = { BlendMode = "Color" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 911ef40e8b..68cb2ab512 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Viking_MDIM_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/MDIM.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index b0f9131d49..2c87a9341f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Viking_MDIM_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/Mdim.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 13dba5d2ee..0000000000 --- a/data/assets/scene/solarsystem/planets/mars/layers/default_layers.asset +++ /dev/null @@ -1,41 +0,0 @@ -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 index bd2bd0b7df..bfeed2d2e6 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Mola", @@ -7,4 +8,8 @@ local layer = { TilePixelSize = 90 } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset index 8173417a7e..d9cb1735e7 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_europe.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Mola_Europe", @@ -7,4 +8,8 @@ local layer = { TilePixelSize = 90 } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset index e68601a547..c2cd50d329 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mola_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mars").Mars.Identifier local layer = { Identifier = "Mola_Utah", @@ -7,4 +8,8 @@ local layer = { TilePixelSize = 90 } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset index 992916926f..b74a9c5d2f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/indices.asset @@ -1,6 +1,12 @@ +local globeIdentifier = asset.require("./../../mars").Mars.Identifier + local layer = { Identifier = "Indices", Type = "TileIndexTileLayer" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + 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 index 0b2fbf071f..27dd05460f 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/overlays/size_reference.asset @@ -1,10 +1,15 @@ -local marsAsset = asset.require("./../../mars") +local marsAsset = asset.require("./../../mars").Mars +local globeIdentifier = marsAsset.Identifier local layer ={ Identifier = "Size_Reference", Name = "Size Reference", Type = "SizeReferenceTileLayer", - Radii = marsAsset.Mars.Renderable.Radii + Radii = marsAsset.Renderable.Radii } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset index c5c16d56ab..2d5408e96e 100644 --- a/data/assets/scene/solarsystem/planets/mercury/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/mercury/default_layers.asset @@ -1,13 +1,42 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./mercury') -local globeIdentifier = globeAsset.Mercury.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +--mdis +asset.require(colorLayersPath .. "/messenger_mdis_utah") +asset.require(colorLayersPath .. "/messenger_mdis_sweden") +--mossaic +asset.require(colorLayersPath .. "/messenger_mosaic_utah") +asset.require(colorLayersPath .. "/messenger_mosaic_sweden") +--mosaic2 aka 8 color +asset.require(colorLayersPath .. "/messenger_mosaic2_utah") +asset.require(colorLayersPath .. "/messenger_mosaic2_sweden") +--bdr +local colorLayer = asset.require(colorLayersPath .. "/messenger_bdr_utah") -- TODO enabled +asset.require(colorLayersPath .. "/messenger_bdr_sweden") +--mdr +asset.require(colorLayersPath .. "/messenger_mdr_utah") +--mp3 +asset.require(colorLayersPath .. "/messenger_mp3_utah") +--hie +asset.require(colorLayersPath .. "/messenger_hie_utah") +asset.require(colorLayersPath .. "/messenger_hie_sweden") +--hiw +asset.require(colorLayersPath .. "/messenger_hiw_utah") +asset.require(colorLayersPath .. "/messenger_hiw_sweden") +--loi +asset.require(colorLayersPath .. "/messenger_loi_utah") +asset.require(colorLayersPath .. "/messenger_loi_sweden") +--shade +asset.require(colorLayersPath .. "/messenger_shade_utah") +asset.require(colorLayersPath .. "/messenger_shade_sweden") +--local textures, these are mineral abundance maps +asset.require(colorLayersPath .. "/alsimap_02122015") +asset.require(colorLayersPath .. "/casimap_02122015") +asset.require(colorLayersPath .. "/fesimap_02122015") +asset.require(colorLayersPath .. "/mgsimap_02122015") +asset.require(colorLayersPath .. "/ssimap_02122015") -local colorLayer = asset.require('./layers/colorlayers/messenger_bdr_utah').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Mercury.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 30ae327b17..b0603cdd67 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/alsimap_02122015.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "alsimap_02122015", @@ -6,4 +7,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index b7a5efe5b9..ff4e891428 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/casimap_02122015.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "casimap_02122015", @@ -6,4 +7,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 2c840f0c33..8ae0355ebf 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/fesimap_02122015.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "fesimap_02122015", @@ -6,4 +7,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 9228509d5b..f2e2c76b17 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_BDR_Sweden", @@ -7,4 +8,8 @@ local layer = { TilePixelSize = 360, } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index d5f385400a..5a982326a3 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_BDR_Utah", @@ -7,4 +8,8 @@ local layer = { TilePixelSize = 360, } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 431f348d0b..78c4936ba8 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_HIE_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_HIE.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 2736325f1b..7691c0ce8a 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_HIE_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerHIE.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 1f708c19a5..280ac3eb9e 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_HIW_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_HIW.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index ee4ecbefb2..6f2bc6d5b2 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_HIW_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerHIW.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index c24b408cb9..72bbc5b90e 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_LOI_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_LOI.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 3885121ee8..1a6dbafe0c 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_LOI_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerLOI.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 378619ad62..b9d4e7b2d4 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MDIS_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_MDIS.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index dfd9331221..b70a1a5ee2 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MDIS_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerMDIS.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index e16f48f019..823f41c2e8 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MDR_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerMDR.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 4362d45eaf..19360c6b35 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_Mosaic2_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic_2.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index e24c75f7d5..ffc60b6d2d 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_Mosaic2_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic2.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index b02bbc4a9d..b076345663 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_Mosaic_Sweden", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/Messenger_Mosaic.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 6947cf1ebc..eedb57aa13 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_Mosaic_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic.wms" } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 2274f16cce..2ac4465b94 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_MP3_Utah", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Utah/MessengerMP3.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 2e3787f465..5f6c56aa35 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_SHADE_Sweden", @@ -11,4 +12,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 4946d96510..dba443c440 100644 --- 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 @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "Messenger_SHADE_Utah", @@ -11,4 +12,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 29af7bc52d..6642a8c0a8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/mgsimap_02122015.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "mgsimap_02122015", @@ -10,4 +11,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index e72608c91b..868030a387 100644 --- a/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset +++ b/data/assets/scene/solarsystem/planets/mercury/layers/colorlayers/ssimap_02122015.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../mercury_textures").TexturesPath +local globeIdentifier = asset.require("./../../mercury").Mercury.Identifier local layer = { Identifier = "ssimap_02122015", @@ -6,4 +7,8 @@ local layer = { BlendMode = "Multiply", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 6a272985f8..0000000000 --- a/data/assets/scene/solarsystem/planets/mercury/layers/default_layers.asset +++ /dev/null @@ -1,48 +0,0 @@ -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/neptune/default_layers.asset b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset index 73888f0f5d..024f19fbd2 100644 --- a/data/assets/scene/solarsystem/planets/neptune/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/neptune/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./neptune') -local globeIdentifier = globeAsset.Neptune.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/neptune_texture") -local colorLayer = asset.require('./layers/colorlayers/neptune_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Neptune.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index c1b26cc630..ecd83b0928 100644 --- a/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset +++ b/data/assets/scene/solarsystem/planets/neptune/layers/colorlayers/neptune_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../neptune_textures").TexturesPath +local globeIdentifier = asset.require("./../../neptune").Neptune.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/neptune.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 05b5a24c3d..0000000000 --- a/data/assets/scene/solarsystem/planets/neptune/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/saturn/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset index 8c4825f46b..8bf7dab762 100644 --- a/data/assets/scene/solarsystem/planets/saturn/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./saturn') -local globeIdentifier = globeAsset.Saturn.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/saturn_texture") -local colorLayer = asset.require('./layers/colorlayers/saturn_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Saturn.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 493ddb6abd..a049613a10 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./dione') -local globeIdentifier = globeAsset.Dione.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/dione_texture") -local colorLayer = asset.require('./layers/colorlayers/dione_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Dione.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset index d78b99e7d8..764a01c156 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/layers/colorlayers/dione_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../dione_textures").TexturesPath +local globeIdentifier = asset.require("./../../dione").Dione.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/dione.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 6986fc0ef8..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/dione/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index 92787efed3..1060a27b25 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/default_layers.asset @@ -1,13 +1,10 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./enceladus') -local globeIdentifier = globeAsset.Enceladus.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +asset.require(colorLayersPath .. "/enceladus_texture") +local colorLayer = asset.require(colorLayersPath .. "/global_mosaic_100m_hpf") -local colorLayer = asset.require('./layers/colorlayers/global_mosaic_100m_hpf').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Enceladus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset index af65066152..b96eca1654 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/enceladus_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../enceladus_textures").TexturesPath +local globeIdentifier = asset.require("./../../enceladus").Enceladus.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/enceladus.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 2fd6950a08..3db67ee35e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/colorlayers/global_mosaic_100m_hpf.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../enceladus").Enceladus.Identifier local layer = { Identifier = "Global_Mosaic_100m_HPF", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/Cassini_ISS_Global_Mosaic_100m_HPF.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index eb72c8ae92..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/layers/default_layers.asset +++ /dev/null @@ -1,16 +0,0 @@ -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 index 5efddbf4e2..ad25754fce 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/default_layers.asset @@ -1,12 +1,3 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./hyperion') -local globeIdentifier = globeAsset.Hyperion.Identifier +local colorLayersPath = "./layers/colorlayers" --- 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) +-- @TODO: when we have a working texture, add it here 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 deleted file mode 100644 index 1351a03d9f..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/layers/default_layers.asset +++ /dev/null @@ -1,11 +0,0 @@ -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 index b442574563..9e0f191bcd 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./iapetus') -local globeIdentifier = globeAsset.Iapetus.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/iapetus_texture") -local colorLayer = asset.require('./layers/colorlayers/iapetus_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Iapetus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset index 755ef8ea4f..849919ac22 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/colorlayers/iapetus_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../iapetus_textures").TexturesPath +local globeIdentifier = asset.require("./../../iapetus").Iapetus.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/iapetus.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 5b79b35739..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index adbd907eec..53db561179 100644 --- a/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/layers/colorlayers/saturn_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../saturn_textures").TexturesPath +local globeIdentifier = asset.require("./../../saturn").Saturn.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/saturn.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index c981abc34d..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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 index 5c2545c96e..b568501559 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./mimas') -local globeIdentifier = globeAsset.Mimas.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/mimas_texture") -local colorLayer = asset.require('./layers/colorlayers/mimas_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Mimas.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index cf574d1665..355efd6b70 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/layers/colorlayers/mimas_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../mimas_textures").TexturesPath +local globeIdentifier = asset.require("./../../mimas").Mimas.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/mimas.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 43f8f772b7..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/rhea/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset index ed174452bb..58e4daaa91 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./rhea') -local globeIdentifier = globeAsset.Rhea.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/rhea_texture") -local colorLayer = asset.require('./layers/colorlayers/rhea_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Rhea.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 208f091020..061aa17e62 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/layers/colorlayers/rhea_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../rhea_textures").TexturesPath +local globeIdentifier = asset.require("./../../rhea").Rhea.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/rhea.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 37e222486c..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/tethys/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset index e1aa178b97..197eeb9a67 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./tethys') -local globeIdentifier = globeAsset.Tethys.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/tethys_texture") -local colorLayer = asset.require('./layers/colorlayers/tethys_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Tethys.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index e7fc7e3bd6..ab55a8b84e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/layers/colorlayers/tethys_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../tethys_textures").TexturesPath +local globeIdentifier = asset.require("./../../tethys").Tethys.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/tethys.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index d5c7bac2e4..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset index ae8586f604..aacadba44c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset @@ -1,16 +1,10 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./titan') -local globeIdentifier = globeAsset.Titan.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +colorLayer = asset.require(colorLayersPath .. "/titan_texture") +local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_liu") -local colorLayer = asset.require( - './layers/colorlayers/cassini_iss_global_mosaic_4km_liu' -).layer - -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Titan.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index fa9495110b..816639f7c6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_liu.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../titan").Titan.Identifier local layer = { Identifier = "Cassini_ISS_Global_Mosaic_4km_LiU", @@ -6,4 +7,8 @@ local layer = { FilePath = mapServiceConfigs .. "/LiU/ISS_P19658_Mosaic_Global_4km.wms", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 31cdf46534..205ce2b72d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../titan_textures").TexturesPath +local globeIdentifier = asset.require("./../../titan").Titan.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/titan.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index e64ed8020e..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/default_layers.asset +++ /dev/null @@ -1,16 +0,0 @@ -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/uranus/default_layers.asset b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset index 681f625251..996a08aad0 100644 --- a/data/assets/scene/solarsystem/planets/uranus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/uranus/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./uranus') -local globeIdentifier = globeAsset.Uranus.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/uranus_texture") -local colorLayer = asset.require('./layers/colorlayers/uranus_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Uranus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index cdff4a7cdc..9d90211d93 100644 --- a/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset +++ b/data/assets/scene/solarsystem/planets/uranus/layers/colorlayers/uranus_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../uranus_textures").TexturesPath +local globeIdentifier = asset.require("./../../uranus").Uranus.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/uranus.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index d385faf202..0000000000 --- a/data/assets/scene/solarsystem/planets/uranus/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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/venus/default_layers.asset b/data/assets/scene/solarsystem/planets/venus/default_layers.asset index 947f0b00ba..4f3bace335 100644 --- a/data/assets/scene/solarsystem/planets/venus/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/venus/default_layers.asset @@ -1,16 +1,16 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./venus') -local globeIdentifier = globeAsset.Venus.Identifier +local colorLayersPath = "./layers/colorlayers" +local heightLayersPath = "./layers/heightlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +-- Color layers +asset.require(colorLayersPath .. "/venus_texture") +local colorLayer = asset.require(colorLayersPath .. "/magellan_mosaic_utah") -local colorLayer = asset.require('./layers/colorlayers/magellan_mosaic_utah').layer -local heightLayer = asset.require('./layers/heightlayers/magellan').layer +-- Height layers +local heightLayer = asset.require(heightLayersPath .. "/magellan") -colorLayer.Enabled = true -heightLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) + openspace.setPropertyValueSingle("Scene.Venus.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true) 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 index 5a3f60094a..c4987ddc21 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/magellan_mosaic_utah.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { Identifier = "Magellan_Mosaic_Utah", @@ -10,4 +11,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 index 3af2f21bc7..3ef047c4fd 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/colorlayers/venus_texture.asset @@ -1,4 +1,5 @@ local texturesPath = asset.require("./../../venus_textures").TexturesPath +local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { Identifier = "Texture", @@ -9,4 +10,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 23c322cc8b..0000000000 --- a/data/assets/scene/solarsystem/planets/venus/layers/default_layers.asset +++ /dev/null @@ -1,20 +0,0 @@ -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 index 80d934e6c2..7696d2428b 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan.asset @@ -1,4 +1,5 @@ local mapServiceConfigs = asset.localResource("./../../map_service_configs") +local globeIdentifier = asset.require("./../../venus").Venus.Identifier local layer = { Identifier = "Magellan", @@ -11,4 +12,8 @@ local layer = { } } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer) +end) + asset.export("layer", layer) diff --git a/data/assets/scene/solarsystem/sun/default_layers.asset b/data/assets/scene/solarsystem/sun/default_layers.asset index 749b68c720..fba1e4662d 100644 --- a/data/assets/scene/solarsystem/sun/default_layers.asset +++ b/data/assets/scene/solarsystem/sun/default_layers.asset @@ -1,13 +1,9 @@ -local layerHelper = asset.require('util/layer_helper') -local globeAsset = asset.require('./sun') -local globeIdentifier = globeAsset.Sun.Identifier +local colorLayersPath = "./layers/colorlayers" --- set enabled and fallback layers -local defaultLayers = asset.require('./layers/default_layers') +local colorLayer = asset.require(colorLayersPath .. "/sun_texture") -local colorLayer = asset.require('./layers/colorlayers/sun_texture').layer -colorLayer.Enabled = true - -asset.onInitialize(function () - layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers) +-- Set enabled layers (temporary solution) +-- @TODO: do this using a boolean that's passed to the 'asset.require' instead +asset.onInitialize(function () + openspace.setPropertyValueSingle("Scene.Sun.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true) 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 index 24ab11d9ae..88b59357fe 100644 --- a/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset +++ b/data/assets/scene/solarsystem/sun/layers/colorlayers/sun_texture.asset @@ -1,8 +1,13 @@ local texturesPath = asset.require("./../../sun_textures").TexturesPath +local globeIdentifier = asset.require("./../../sun").Sun.Identifier local layer = { Identifier = "Texture", FilePath = texturesPath .. "/sun.jpg", } +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) +end) + 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 deleted file mode 100644 index 8e136c5be4..0000000000 --- a/data/assets/scene/solarsystem/sun/layers/default_layers.asset +++ /dev/null @@ -1,15 +0,0 @@ -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)