mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 07:49:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use height maps defined in the mod file.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-04 11:22:31 -04:00
parent e6e656f088
commit c73e6a59cd
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -59,17 +59,43 @@ namespace openspace {
dictionary.getValue(keyRadii, radii);
_ellipsoid = Ellipsoid(radii);
ghoul::Dictionary texturesDictionary;
dictionary.getValue(keyTextures, texturesDictionary);
std::shared_ptr<TileProvider> heightMapProvider =
std::shared_ptr<TileProvider>(new TileProvider(
"map_service_configs/TERRAIN.wms", 5000, 512));
ghoul::Dictionary colorTexturesDictionary;
texturesDictionary.getValue(keyColorTextures, colorTexturesDictionary);
std::shared_ptr<TileProvider> colorTextureProvider =
std::shared_ptr<TileProvider>(new TileProvider(
"map_service_configs/TERRAIN.wms", 5000, 512));
// Create TileProviders for all color textures
for (size_t i = 1; i < colorTexturesDictionary.size() + 1; i++)
{
std::string name, path;
ghoul::Dictionary colorTextureDictionary =
colorTexturesDictionary.value<ghoul::Dictionary>(std::to_string(i));
colorTextureDictionary.getValue("Name", name);
colorTextureDictionary.getValue("FilePath", path);
std::shared_ptr<TileProvider> colorTextureProvider =
std::shared_ptr<TileProvider>(new TileProvider(
path, 5000, 512));
_tileProviderManager->addColorTexture(name, colorTextureProvider);
}
_tileProviderManager->addHeightMap("TERRAIN", heightMapProvider);
_tileProviderManager->addColorTexture("COLOR", colorTextureProvider);
ghoul::Dictionary heightMapsDictionary;
texturesDictionary.getValue(keyHeightMaps, heightMapsDictionary);
// Create TileProviders for all height maps
for (size_t i = 1; i < heightMapsDictionary.size() + 1; i++)
{
std::string name, path;
ghoul::Dictionary heightMapDictionary =
heightMapsDictionary.value<ghoul::Dictionary>(std::to_string(i));
heightMapDictionary.getValue("Name", name);
heightMapDictionary.getValue("FilePath", path);
std::shared_ptr<TileProvider> heightMapProvider =
std::shared_ptr<TileProvider>(new TileProvider(
path, 5000, 512));
_tileProviderManager->addHeightMap(name, heightMapProvider);
}
addSwitchValue(std::shared_ptr<ClipMapGlobe>(
new ClipMapGlobe(_ellipsoid, _tileProviderManager)), 1e8);