From 475f3c63c2e090ca23df4764d690ca955d3e561e Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 14 Jun 2023 20:04:08 +0200 Subject: [PATCH] Update TilePixelSizes to temporarily address #2472 --- .../solarsystem/missions/apollo/apollo_globebrowsing.asset | 5 +++++ .../planets/earth/layers/heightlayers/terrain_tileset.asset | 2 +- .../planets/mars/layers/heightlayers/hirisels.asset | 2 +- .../planets/mars/layers/heightlayers/mdem200m.asset | 2 +- .../planets/venus/layers/heightlayers/magellan_newyork.asset | 2 +- .../planets/venus/layers/heightlayers/magellan_utah.asset | 2 +- modules/globebrowsing/scripts/layer_support.lua | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset index 80a25772cb..25ff907125 100644 --- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset +++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset @@ -1,4 +1,9 @@ local moon = asset.require("scene/solarsystem/planets/earth/moon/moon") +-- This is technically not necessary, but we need to ensure that the default layers load +-- first before we add the layers from this assets or else the default layers might be +-- initialized later, causing them to appear **after** these layers +asset.require("scene/solarsystem/planets/earth/moon/default_layers") + local heightmaps = asset.syncedResource({ Name = "Apollo Globebrowsing Heightmaps", 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 8892c0cb89..40bb76d119 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 @@ -7,7 +7,7 @@ local Layer = { Name = "Terrain tileset", Enabled = asset.enabled, FilePath = asset.localResource("terrain_tileset.wms"), - TilePixelSize = 512, + TilePixelSize = 129, Description = [[This globe layer presents elevation data at approximately 90m or 1km per pixel resolution for the world. The elevation data includes 90m Shuttle Radar Topography Mission (SRTM) elevation data from NASA and National diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset index 20d4566c0f..af7a51b238 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset @@ -7,7 +7,7 @@ local Layer = { Name = "HiRISE Local Set DEM", Enabled = asset.enabled, FilePath = asset.localResource("hirisels.wms"), - TilePixelSize = 512, + TilePixelSize = 129, Description = [[HiRISE (High Resolution Imaging Science Experiment) is the most powerful camera ever sent to another planet, one of six instruments onboard the Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset index 2a7a58987d..8206a3a70c 100644 --- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset +++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/mdem200m.asset @@ -7,7 +7,7 @@ local Layer = { Name = "HRSC MOLA Blended DEM Global 200m v2", Enabled = asset.enabled, FilePath = asset.localResource("mdem200m.wms"), - TilePixelSize = 513, + TilePixelSize = 129, Description = [[Blend of data derived from the Mars Orbiter Laser Altimeter (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived from the High-Resolution Stereo Camera (HRSC, an instrument aboard the European Space diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset index a2e2534caf..102ea3fcaa 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_newyork.asset @@ -7,7 +7,7 @@ local Layer = { Name = "Magellan Elevation [New York]", Enabled = asset.enabled, FilePath = asset.localResource("magellan_newyork.wms"), - TilePixelSize = 256, + TilePixelSize = 129, Settings = { Gamma = 1.72, Multiplier = 1.1 diff --git a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset index a9d380d3db..83a7c0125a 100644 --- a/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset +++ b/data/assets/scene/solarsystem/planets/venus/layers/heightlayers/magellan_utah.asset @@ -7,7 +7,7 @@ local Layer = { Name = "Magellan Elevation [Utah]", Enabled = asset.enabled, FilePath = asset.localResource("magellan_utah.wms"), - TilePixelSize = 256, + TilePixelSize = 129, Settings = { Gamma = 1.72, Multiplier = 1.1 diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua index d396f5db6a..3622156feb 100644 --- a/modules/globebrowsing/scripts/layer_support.lua +++ b/modules/globebrowsing/scripts/layer_support.lua @@ -245,7 +245,7 @@ openspace.globebrowsing.parseInfoFile = function (file) Name = name, Description = Description or "", FilePath = dir .. '/' .. HeightFile, - TilePixelSize = 512 + TilePixelSize = 65 } end