mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 08:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-11-28 17:40:55 +01:00
parent 14f9126df2 328f57fb20
commit fa1407f2ac
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/scene/lodglobes/lodmars/lodmars.mod
View File

@@ -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,

8
data/scene/lodglobes/lodmars/map_service_configs/CTX_Mosaic.xml
View File

@@ -1,6 +1,6 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://192.168.1.167/OnMars/wms.cgi?</ServerUrl>
<ServerUrl>http://wms.itn.liu.se/OnMars/wms.cgi?</ServerUrl>
<TiledGroupName>CTX Mosaic</TiledGroupName>
<Transparent>TRUE</Transparent>
</Service>
@@ -12,10 +12,10 @@
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
</DataWindow>
<Cache>
<!-- <Cache>
<Path>./GDAL_CTX_cache</Path>
<Depth>10</Depth>
<Extension>.png</Extension>
</Cache>
<OfflineMode>true</OfflineMode>
</GDAL_WMS>
<OfflineMode>false</OfflineMode>
--></GDAL_WMS>

2
data/scene/lodglobes/lodmars/map_service_configs/Mola_Elevation.xml
View File

@@ -1,6 +1,6 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://192.168.1.167/OnMars/wms.cgi?</ServerUrl>
<ServerUrl>http://wms.itn.liu.se/OnMars/wms.cgi?</ServerUrl>
<TiledGroupName>Mola Elevation</TiledGroupName>
</Service>
<DataWindow>

4
modules/globebrowsing/shaders/texturetilemapping.hglsl
View File

@@ -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}
{