diff --git a/data/scene/lodglobes/lodmars/lodmars.mod b/data/scene/lodglobes/lodmars/lodmars.mod index af6d90cf05..1dbec6fb7b 100644 --- a/data/scene/lodglobes/lodmars/lodmars.mod +++ b/data/scene/lodglobes/lodmars/lodmars.mod @@ -62,12 +62,12 @@ return { Name = "Layered Rock Outcrops in Southwest Candor Chasma", FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Texture.vrt", }, - --[[ { Name = "CTX Mosaic", FilePath = "map_service_configs/CTX_Mosaic.xml", Enabled = true, }, + --[[ { Name = "West Candor Chasma", FilePath = "map_datasets/CTX/West_Candor_Chasma_longlat_global.vrt", @@ -112,7 +112,7 @@ return { MinimumPixelSize = 64, DoPreProcessing = true, }, - +--]] { Name = "Mola Elevation", FilePath = "map_service_configs/Mola_Elevation.xml", @@ -120,7 +120,7 @@ return { MinimumPixelSize = 90, DoPreProcessing = true, }, - { +--[[ { Name = "West Candor Chasma", FilePath = "map_datasets/CTX/West_Candor_Chasma_DEM_longlat_global.vrt", --Enabled = true, diff --git a/data/scene/lodglobes/lodmars/map_service_configs/CTX_Mosaic.xml b/data/scene/lodglobes/lodmars/map_service_configs/CTX_Mosaic.xml index 423bd07e9d..5f78a14098 100644 --- a/data/scene/lodglobes/lodmars/map_service_configs/CTX_Mosaic.xml +++ b/data/scene/lodglobes/lodmars/map_service_configs/CTX_Mosaic.xml @@ -1,6 +1,6 @@ - http://192.168.1.167/OnMars/wms.cgi? + http://wms.itn.liu.se/OnMars/wms.cgi? CTX Mosaic TRUE @@ -12,10 +12,10 @@ 256 256 - + \ No newline at end of file diff --git a/data/scene/lodglobes/lodmars/map_service_configs/Mola_Elevation.xml b/data/scene/lodglobes/lodmars/map_service_configs/Mola_Elevation.xml index b79223c4af..ca5e83a09d 100644 --- a/data/scene/lodglobes/lodmars/map_service_configs/Mola_Elevation.xml +++ b/data/scene/lodglobes/lodmars/map_service_configs/Mola_Elevation.xml @@ -1,6 +1,6 @@ - http://192.168.1.167/OnMars/wms.cgi? + http://wms.itn.liu.se/OnMars/wms.cgi? Mola Elevation diff --git a/modules/globebrowsing/shaders/texturetilemapping.hglsl b/modules/globebrowsing/shaders/texturetilemapping.hglsl index 0e074fbad0..ffc8e8ebf8 100644 --- a/modules/globebrowsing/shaders/texturetilemapping.hglsl +++ b/modules/globebrowsing/shaders/texturetilemapping.hglsl @@ -75,7 +75,7 @@ float performLayerSettings(float currentValue, const LayerSettings settings) { float newValue = currentValue; - newValue = sign(newValue) * pow(newValue, settings.gamma); + newValue = sign(newValue) * pow(abs(newValue), settings.gamma); newValue = newValue * settings.multiplier; newValue = newValue * settings.opacity; @@ -129,7 +129,7 @@ float calculateHeight( #if !HEIGHTMAP_BLENDING_ENABLED levelWeights = getDefaultLevelWeights(); #endif // HEIGHTMAP_BLENDING_ENABLED - + #for i in 0..#{lastLayerIndexHeightLayers} {