From 1d9aab6e637a7c87953ef1ff5a4b6a3d2dd108eb Mon Sep 17 00:00:00 2001 From: Kalle Bladin Date: Fri, 15 Jul 2016 18:57:03 -0400 Subject: [PATCH] Remove datasets from debugglobe.mod --- data/scene/debugglobe/debugglobe.mod | 23 ++++++++----------- .../shaders/texturetilemapping.hglsl | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/data/scene/debugglobe/debugglobe.mod b/data/scene/debugglobe/debugglobe.mod index 4ce167fb66..ae21e2f03a 100644 --- a/data/scene/debugglobe/debugglobe.mod +++ b/data/scene/debugglobe/debugglobe.mod @@ -88,18 +88,14 @@ return { FilePath = "map_service_configs/mars/CTX_Mosaic.xml", Enabled = false, }, + --[[ { Name = "On Moon Color", FilePath = "map_service_configs/moon/OnMoonColor.xml", --Enabled = true, - } - { - Name = "West_Candor_Chasma_longlat_global", - FilePath = "map_datasets/West_Candor_Chasma_longlat_global.vrt", - Enabled = true, - }, - ]] + }]] + }, NightTextures = { { @@ -133,17 +129,18 @@ return { }, }, HeightMaps = { - { - Name = "Terrain tileset", - FilePath = "map_service_configs/earth/TERRAIN.wms", - --Enabled = true, - }, + { Name = "Mola Elevation", FilePath = "map_service_configs/mars/Mola_Elevation.xml", Enabled = true, }, - --[[ + --[[ { + Name = "Terrain tileset", + FilePath = "map_service_configs/earth/TERRAIN.wms", + --Enabled = true, + }, + { Name = "On Moon Height", FilePath = "map_service_configs/moon/OnMoonHeight.xml", diff --git a/modules/globebrowsing/shaders/texturetilemapping.hglsl b/modules/globebrowsing/shaders/texturetilemapping.hglsl index 4f7f9b38cc..a7436970fb 100644 --- a/modules/globebrowsing/shaders/texturetilemapping.hglsl +++ b/modules/globebrowsing/shaders/texturetilemapping.hglsl @@ -192,7 +192,7 @@ float calculateHeightOverlay( levelWeights.w3 * getTexVal(heightOverlayTilesParent2[#{i}], uv); float heightSample = getTransformedTexVal(heightOverlayTiles[#{i}].depthTransform, untransformedHeightSample.r); - if (untransformedHeightSample.g > 0.5) + if (heightSample > -100000) height = heightSample; } #endfor