Add MOC WA Mars texture as torrent

Organize mars textures correctly
This commit is contained in:
Alexander Bock
2017-08-17 10:15:28 -04:00
parent 7d3b0d7822
commit e056ad561f
4 changed files with 40 additions and 33 deletions

View File

@@ -1,6 +1,11 @@
-- Add folders to this list that contain .info files describing HiRISE patches
local mars_folders = {
-- Add a folder here whose contents will be automatically added to the Mars globe
-- If multiple folders are added, the results will be added sequentially, meaning that
-- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE,
-- CTX will stomp over the HiRISE
--
-- tl;dr: Specify CTX folders first, then HiRISE
}
function preInitialization()
@@ -82,7 +87,7 @@ function postInitialization()
openspace.printInfo("Done setting default values")
-- Add the HiRISE patches described at the top of this file
-- Add the CTX and HiRISE patches described at the top of this file
for _, file in pairs(mars_folders) do
openspace.globebrowsing.addBlendingLayersFromDirectory(file, "Mars")
end

Binary file not shown.

View File

@@ -3,6 +3,7 @@ return {
{ Identifier = "mars_textures", Destination = "textures", Version = 1 }
},
TorrentFiles = {
{ File = "map_datasets.torrent", Destination = "." }
-- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" }
}
}

View File

@@ -31,50 +31,28 @@ return {
SegmentsPerPatch = 90,
Layers = {
ColorLayers = {
{
Name = "MOC WA AMNH Color",
FilePath = "map_datasets/mars_COL_v006_mars2000_rgb.vrt",
Enabled = true
},
{
Name = "Viking MDIM",
FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
Enabled = true,
Fallback = {
Name = "Mars Texture",
FilePath = "textures/mars.jpg",
Enabled = true,
},
},
-- Linköping University based servers
{
Name = "CTX Mosaic [LiU]",
FilePath = "map_service_configs/LiU/CTX.xml",
BlendMode = "Color"
},
-- University of Utah based servers
{
Name = "CTX Mosaic [Utah]",
FilePath = "map_service_configs/Utah/CTX.xml",
BlendMode = "Color"
Enabled = true
}
},
{
Name = "MOLA Pseudo Color",
FilePath = "map_service_configs/Utah/Mola_PseudoColor.xml"
},
{
Name = "Themis IR Day [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
},
{
Name = "Themis IR Night [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
},
{
Name = "Viking MDIM [Utah]",
FilePath = "map_service_configs/Utah/Mdim.xml"
},
-- AWS based servers
{
Name = "CTX Mosaic [AWS]",
FilePath = "map_service_configs/AWS/CTX.wms",
BlendMode = "Color"
},
{
Name = "Viking MDIM [AWS]",
FilePath = "map_service_configs/AWS/Mdim.wms"
@@ -83,6 +61,30 @@ return {
Name = "MOLA Pseudo Color [AWS]",
FilePath = "map_service_configs/AWS/Mola_PseudoColor.wms"
},
{
Name = "CTX Mosaic [LiU]",
FilePath = "map_service_configs/LiU/CTX.xml",
BlendMode = "Color"
},
{
Name = "CTX Mosaic [Utah]",
FilePath = "map_service_configs/Utah/CTX.xml",
BlendMode = "Color"
},
{
Name = "CTX Mosaic [AWS]",
FilePath = "map_service_configs/AWS/CTX.wms",
BlendMode = "Color"
},
{
Name = "Themis IR Day [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
},
{
Name = "Themis IR Night [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
},
{
Name = "Themis IR Day [AWS]",
FilePath = "map_service_configs/AWS/Themis_IR_Day.wms"
@@ -106,14 +108,13 @@ return {
HeightLayers = {
{
Name = "Mola Elevation",
FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml",
Enabled = true,
FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml"
TilePixelSize = 90
},
{
Name = "Mola Elevation [Europe]",
FilePath = "map_service_configs/LiU/Mola_Elevation.xml",
-- Enabled = true,
Enabled = true,
TilePixelSize = 90
},
{