Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
182e344f
Commit
182e344f
authored
7 years ago
by
Emil Axelsson
Committed by
Alexander Bock
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Change Name to Identifier in globe browsing helper code (#567)
parent
0547c143
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/globebrowsing/scripts/layer_support.lua
+4
-4
modules/globebrowsing/scripts/layer_support.lua
with
4 additions
and
4 deletions
+4
-4
modules/globebrowsing/scripts/layer_support.lua
+
4
-
4
View file @
182e344f
...
...
@@ -166,7 +166,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
local
color
=
nil
if
ColorFile
then
color
=
{
Name
=
Name
,
Identifier
=
Identifier
,
Description
=
Description
or
""
,
FilePath
=
dir
..
'/'
..
ColorFile
,
BlendMode
=
"Color"
...
...
@@ -176,7 +176,7 @@ openspace.globebrowsing.parseInfoFile = function (file)
local
height
=
nil
if
HeightFile
then
height
=
{
Name
=
Name
,
Identifier
=
Identifier
,
Description
=
Description
or
""
,
FilePath
=
dir
..
'/'
..
HeightFile
,
TilePixelSize
=
90
...
...
@@ -194,11 +194,11 @@ openspace.globebrowsing.addBlendingLayersFromDirectory = function (dir, node_nam
c
,
h
=
openspace
.
globebrowsing
.
parseInfoFile
(
file
)
if
c
then
openspace
.
printInfo
(
"Adding color layer '"
..
c
[
"
Name
"
]
..
"'"
)
openspace
.
printInfo
(
"Adding color layer '"
..
c
[
"
Identifier
"
]
..
"'"
)
openspace
.
globebrowsing
.
addLayer
(
node_name
,
"ColorLayers"
,
c
)
end
if
h
then
openspace
.
printInfo
(
"Adding height layer '"
..
h
[
"
Name
"
]
..
"'"
)
openspace
.
printInfo
(
"Adding height layer '"
..
h
[
"
Identifier
"
]
..
"'"
)
openspace
.
globebrowsing
.
addLayer
(
node_name
,
"HeightLayers"
,
h
)
end
end
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment