Issue/1824 (#1983)

* update globebrowsing customiztion to use env_var and added earth; closes #1824

* updated globebrowsing.asset
This commit is contained in:
Micah Acinapura
2022-04-08 12:49:17 -04:00
committed by GitHub
parent 15def75dc3
commit 48b89a08a6
2 changed files with 18 additions and 2 deletions
+16 -1
View File
@@ -4,7 +4,8 @@ local CreateFocusNodes = false
local AddMarsLayers = true
local AddMoonLayers = true
local AddMercuryLayers = true
local DataFolder = openspace.absPath("${BASE}/../OpenSpaceData")
local AddEarthLayers = true
local DataFolder = openspace.absPath("${GLOBEBROWSING}")
----------------------------------------
-- If you add layers for different planets than listed here, be sure to add an
@@ -52,6 +53,15 @@ local vrt_folders = {
-- example: "C:/OpenSpace/GlobeBrowsingData/Mercury"
DataFolder .. "/Mercury",
""
},
Earth = {
-- Add folders here whose contents will be automatically added to the Earth globe
-- If multiple folders are added, the results will be added sequentially, meaning that
-- if areas overlap, images from the lower results will overwrite the images from former
-- results
-- example: "C:/OpenSpace/GlobeBrowsingData/Earth"
DataFolder .. "/Earth",
""
}
}
@@ -72,6 +82,11 @@ if AddMercuryLayers then
else
vrt_folders["Mercury"] = nil
end
if AddEarthLayers then
asset.require("../scene/solarsystem/planets/earth/earth")
else
vrt_folders["Earth"] = nil
end
asset.onInitialize(function ()
-- Add local patches described at the top of this file
+2 -1
View File
@@ -129,7 +129,8 @@ Paths = {
MODULES = "${BASE}/modules",
SCRIPTS = "${BASE}/scripts",
SHADERS = "${BASE}/shaders",
TEMPORARY = "${BASE}/temp"
TEMPORARY = "${BASE}/temp",
GLOBEBROWSING = os.getenv("OPENSPACE_GLOBEBROWSING") or "${BASE}/../OpenSpaceData"
}
ModuleConfigurations = {