Merge branch 'feature/globebrowsing' into feature/osirisrex

This commit is contained in:
Erik Broberg
2016-07-21 18:09:32 -04:00
43 changed files with 40 additions and 31 deletions

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

+11 -11
View File
@@ -59,25 +59,25 @@ return {
{
Type = "Temporal",
Name = "Temporal VIIRS SNPP",
FilePath = "map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
},
{
Type = "SingleImage",
Name = "Debug Tiles",
FilePath = "textures/test_tile.png",
FilePath = "../debugglobe/textures/test_tile.png",
},
{
Type = "Temporal",
Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor",
FilePath = "map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
},
{
Name = "MODIS_Terra_CorrectedReflectance_TrueColor",
FilePath = "map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
},
{
Name = "ESRI Imagery World 2D",
FilePath = "map_service_configs/earth/ESRI_Imagery_World_2D.wms",
FilePath = "map_service_configs/ESRI_Imagery_World_2D.wms",
Enabled = true,
}
},
@@ -87,33 +87,33 @@ return {
NightTextures = {
{
Name = "Earth at Night 2012",
FilePath = "map_service_configs/earth/VIIRS_CityLights_2012.xml",
FilePath = "map_service_configs/VIIRS_CityLights_2012.xml",
},
},
WaterMasks = {
{
Name = "MODIS_Water_Mask",
FilePath = "map_service_configs/earth/MODIS_Water_Mask.xml",
FilePath = "map_service_configs/MODIS_Water_Mask.xml",
},
},
Overlays = {
{
Name = "Coastlines",
FilePath = "map_service_configs/earth/Coastlines.xml",
FilePath = "map_service_configs/Coastlines.xml",
},
{
Name = "Reference_Features",
FilePath = "map_service_configs/earth/Reference_Features.xml",
FilePath = "map_service_configs/Reference_Features.xml",
},
{
Name = "Reference_Labels",
FilePath = "map_service_configs/earth/Reference_Labels.xml",
FilePath = "map_service_configs/Reference_Labels.xml",
},
},
HeightMaps = {
{
Name = "Terrain tileset",
FilePath = "map_service_configs/earth/TERRAIN.wms",
FilePath = "map_service_configs/TERRAIN.wms",
Enabled = true,
},
},
+1 -1
View File
@@ -43,7 +43,7 @@ return {
{
Type = "SingleImage",
Name = "Debug Tiles",
FilePath = "textures/test_tile.png",
FilePath = "../debugglobe/textures/test_tile.png",
},
{
Name = "MARS_Viking_MDIM21",
Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 645 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB