mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve backwards compatibility of layer support

Browse Source
This commit is contained in:
Emil Axelsson
2018-11-15 09:20:13 +01:00
parent 52060ab006
commit 35252ec3df
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/globebrowsing/scripts/layer_support.lua
View File

@@ -170,21 +170,23 @@ openspace.globebrowsing.createGibsGdalXml = function (layerName, date, resolutio
end
openspace.globebrowsing.parseInfoFile = function (file)
Name = nil
Identifier = nil
Description = nil
ColorFile = nil
HeightFile = nil
local dir = openspace.directoryForPath(file)
dofile(file)
local name = nil
if Name then
name = Name
end
local identifier = Identifier
local name = Name or Identifier
local identifier = Identifier or Name
local color = nil
if ColorFile then
color = {
Identifier = Identifier,
Name = Name or Identifier,
Identifier = identifier,
Name = name,
Description = Description or "",
FilePath = dir .. '/' .. ColorFile,
BlendMode = "Color"
@@ -194,8 +196,8 @@ openspace.globebrowsing.parseInfoFile = function (file)
local height = nil
if HeightFile then
height = {
Identifier = Identifier,
Name = Name or Identifier,
Identifier = identifier,
Name = name,
Description = Description or "",
FilePath = dir .. '/' .. HeightFile,
TilePixelSize = 90