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

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

Browse Source
This commit is contained in:
Erik Broberg
2016-06-14 23:19:45 -04:00
parent abbede263f 69c0d7f464
commit bfd2441eaa
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/scene/debugglobe/debugglobe.mod
View File

@@ -32,58 +32,68 @@ return {
SegmentsPerPatch = 64,
TextureInitData = {
ColorTextureMinimumSize = 1024,
OverlayMinimumSize = 4096,
OverlayMinimumSize = 2048,
HeightMapMinimumSize = 64,
},
Textures = {
ColorTextures = {
{
Name = "Temporal VIIRS SNPP",
FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml"
FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
Enabled = false,
},
{
Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor",
FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml"
FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
Enabled = false,
},
{
Name = "MODIS_Terra_CorrectedReflectance_TrueColor",
FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml"
FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
Enabled = false,
},
{
Name = "ESRI Imagery World 2D",
FilePath = "map_service_configs/ESRI_Imagery_World_2D.wms",
Enabled = true,
},
},
NightTextures = {
{
Name = "Earth at Night 2012",
Name = "Earth at Night 2012",
FilePath = "map_service_configs/VIIRS_CityLights_2012.xml",
Enabled = false,
},
},
HeightMaps = {
{
Name = "Terrain tileset",
FilePath = "map_service_configs/TERRAIN.wms",
Enabled = true,
},
},
WaterMasks = {
{
Name = "MODIS_Water_Mask",
FilePath = "map_service_configs/MODIS_Water_Mask.xml"
FilePath = "map_service_configs/MODIS_Water_Mask.xml",
Enabled = false,
},
},
Overlays = {
{
Name = "Coastlines",
FilePath = "map_service_configs/Coastlines.xml",
Enabled = false,
},
{
Name = "Reference_Features",
FilePath = "map_service_configs/Reference_Features.xml",
Enabled = false,
},
{
Name = "Reference_Labels",
FilePath = "map_service_configs/Reference_Labels.xml",
Enabled = false,
},
},
},

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

@@ -149,7 +149,7 @@ namespace openspace {
std::vector<properties::BoolProperty>& dest)
{
for (size_t i = 0; i < tileProviders.size(); i++) {
bool enabled = i == 0; // Only enable first layer
bool enabled = tileProviders[i].isActive;
std::string name = tileProviders[i].name;
dest.push_back(properties::BoolProperty(name, name, enabled));
}

6
modules/globebrowsing/tile/TileProviderManager.cpp
View File

@@ -90,15 +90,17 @@ namespace openspace {
// Create TileProviders for all textures within this category
for (size_t i = 0; i < texturesDict.size(); i++) {
std::string name, path;
// Default to enabled = true on case it's not defined in the dictionary
bool enabled = true;
std::string dictKey = std::to_string(i + 1);
ghoul::Dictionary texDict = texturesDict.value<ghoul::Dictionary>(dictKey);
texDict.getValue("Name", name);
texDict.getValue("FilePath", path);
texDict.getValue("Enabled", enabled);
std::shared_ptr<TileProvider> tileProvider = initProvider(path, initData);
bool enabled = dest.size() == 0; // Only enable first layer
//bool enabled = dest.size() == 0; // Only enable first layer
dest.push_back({ name, tileProvider, enabled });
}
}