diff --git a/data/scene/globebrowsing.scene b/data/scene/globebrowsing.scene index b20941da3d..f1d2bc3e15 100644 --- a/data/scene/globebrowsing.scene +++ b/data/scene/globebrowsing.scene @@ -48,7 +48,9 @@ return { Modules = { "lodearth", + "lodmoon", "lodmars", + "lodmercury", "sun", "stars", "milkyway", diff --git a/data/scene/lodearth/lodearth.mod b/data/scene/lodearth/lodearth.mod index b96bc12b05..14b8355677 100644 --- a/data/scene/lodearth/lodearth.mod +++ b/data/scene/lodearth/lodearth.mod @@ -63,25 +63,25 @@ return { { Type = "Temporal", Name = "Temporal VIIRS SNPP", - FilePath = "map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", + FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", }, { Type = "SingleImage", Name = "Debug Tiles", - FilePath = "../debugglobe/textures/test_tile.png", + FilePath = "textures/test_tile.png", }, { Type = "Temporal", Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor", - FilePath = "map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml", + FilePath = "map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml", }, { Name = "MODIS_Terra_CorrectedReflectance_TrueColor", - FilePath = "map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml", + FilePath = "map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml", }, { Name = "ESRI Imagery World 2D", - FilePath = "map_service_configs/ESRI_Imagery_World_2D.wms", + FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms", Enabled = true, } }, @@ -91,27 +91,27 @@ return { NightTextures = { { Name = "Earth at Night 2012", - FilePath = "map_service_configs/VIIRS_CityLights_2012.xml", + FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml", }, }, WaterMasks = { { Name = "MODIS_Water_Mask", - FilePath = "map_service_configs/MODIS_Water_Mask.xml", + FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml", }, }, Overlays = { { Name = "Coastlines", - FilePath = "map_service_configs/Coastlines.xml", + FilePath = "map_service_configs/GIBS/Coastlines.xml", }, { Name = "Reference_Features", - FilePath = "map_service_configs/Reference_Features.xml", + FilePath = "map_service_configs/GIBS/Reference_Features.xml", }, { Name = "Reference_Labels", - FilePath = "map_service_configs/Reference_Labels.xml", + FilePath = "map_service_configs/GIBS/Reference_Labels.xml", }, { Type = "SizeReference", @@ -123,7 +123,7 @@ return { HeightMaps = { { Name = "Terrain tileset", - FilePath = "map_service_configs/TERRAIN.wms", + FilePath = "map_service_configs/ESRI/TERRAIN.wms", Enabled = true, MinimumPixelSize = 90, DoPreProcessing = true, @@ -131,6 +131,6 @@ return { }, }, }, - GuiName = "/Solar/Planets/LodEarth" + GuiName = "/Solar/Planets/Earth" }, } \ No newline at end of file diff --git a/data/scene/lodearth/map_service_configs/ESRI_Imagery_World_2D.wms b/data/scene/lodearth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms similarity index 100% rename from data/scene/lodearth/map_service_configs/ESRI_Imagery_World_2D.wms rename to data/scene/lodearth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms diff --git a/data/scene/lodearth/map_service_configs/TERRAIN.wms b/data/scene/lodearth/map_service_configs/ESRI/TERRAIN.wms similarity index 100% rename from data/scene/lodearth/map_service_configs/TERRAIN.wms rename to data/scene/lodearth/map_service_configs/ESRI/TERRAIN.wms diff --git a/data/scene/lodearth/map_service_configs/Coastlines.xml b/data/scene/lodearth/map_service_configs/GIBS/Coastlines.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Coastlines.xml rename to data/scene/lodearth/map_service_configs/GIBS/Coastlines.xml diff --git a/data/scene/lodearth/map_service_configs/GIBS_Aqua_MODIS_true.xml b/data/scene/lodearth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/GIBS_Aqua_MODIS_true.xml rename to data/scene/lodearth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml diff --git a/data/scene/lodearth/map_service_configs/MODIS_Terra_Brightness_Temp_Band31_Day.xml b/data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/MODIS_Terra_Brightness_Temp_Band31_Day.xml rename to data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml diff --git a/data/scene/lodearth/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor.xml rename to data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodearth/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml b/data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml rename to data/scene/lodearth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml diff --git a/data/scene/lodearth/map_service_configs/MODIS_Water_Mask.xml b/data/scene/lodearth/map_service_configs/GIBS/MODIS_Water_Mask.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/MODIS_Water_Mask.xml rename to data/scene/lodearth/map_service_configs/GIBS/MODIS_Water_Mask.xml diff --git a/data/scene/lodearth/map_service_configs/Reference_Features.xml b/data/scene/lodearth/map_service_configs/GIBS/Reference_Features.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Reference_Features.xml rename to data/scene/lodearth/map_service_configs/GIBS/Reference_Features.xml diff --git a/data/scene/lodearth/map_service_configs/Reference_Labels.xml b/data/scene/lodearth/map_service_configs/GIBS/Reference_Labels.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Reference_Labels.xml rename to data/scene/lodearth/map_service_configs/GIBS/Reference_Labels.xml diff --git a/data/scene/lodearth/map_service_configs/TERRA_CR_B143_2016-04-12.wms b/data/scene/lodearth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms similarity index 100% rename from data/scene/lodearth/map_service_configs/TERRA_CR_B143_2016-04-12.wms rename to data/scene/lodearth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms diff --git a/data/scene/lodearth/map_service_configs/Temporal_Aqua_Orbit_Asc.xml b/data/scene/lodearth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Temporal_Aqua_Orbit_Asc.xml rename to data/scene/lodearth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml diff --git a/data/scene/lodearth/map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml rename to data/scene/lodearth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodearth/map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/lodearth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodearth/map_service_configs/VIIRS_CityLights_2012.xml b/data/scene/lodearth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/VIIRS_CityLights_2012.xml rename to data/scene/lodearth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml diff --git a/data/scene/lodearth/map_service_configs/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/lodearth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodearth/map_service_configs/ASTER_GDEM_Greyscale_Shaded_Relief.xml b/data/scene/lodearth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/ASTER_GDEM_Greyscale_Shaded_Relief.xml rename to data/scene/lodearth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml diff --git a/data/scene/lodearth/map_service_configs/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml b/data/scene/lodearth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml rename to data/scene/lodearth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml diff --git a/data/scene/lodearth/map_service_configs/MLS_O3_46hPa_Day.xml b/data/scene/lodearth/map_service_configs/other/MLS_O3_46hPa_Day.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/MLS_O3_46hPa_Day.xml rename to data/scene/lodearth/map_service_configs/other/MLS_O3_46hPa_Day.xml diff --git a/data/scene/lodearth/map_service_configs/OpenStreetMap.xml b/data/scene/lodearth/map_service_configs/other/OpenStreetMap.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/OpenStreetMap.xml rename to data/scene/lodearth/map_service_configs/other/OpenStreetMap.xml diff --git a/data/scene/lodearth/map_service_configs/frmt_wms_virtualearth.xml b/data/scene/lodearth/map_service_configs/other/frmt_wms_virtualearth.xml similarity index 100% rename from data/scene/lodearth/map_service_configs/frmt_wms_virtualearth.xml rename to data/scene/lodearth/map_service_configs/other/frmt_wms_virtualearth.xml diff --git a/data/scene/lodearth/map_service_configs/test.wms b/data/scene/lodearth/map_service_configs/other/test.wms similarity index 100% rename from data/scene/lodearth/map_service_configs/test.wms rename to data/scene/lodearth/map_service_configs/other/test.wms diff --git a/data/scene/lodearth/textures/ToastMapOfEarth.jpg b/data/scene/lodearth/textures/ToastMapOfEarth.jpg deleted file mode 100644 index 9064235622..0000000000 Binary files a/data/scene/lodearth/textures/ToastMapOfEarth.jpg and /dev/null differ diff --git a/data/scene/lodearth/textures/earth_bluemarble.jpg b/data/scene/lodearth/textures/earth_bluemarble.jpg deleted file mode 100644 index 55b715d061..0000000000 Binary files a/data/scene/lodearth/textures/earth_bluemarble.jpg and /dev/null differ diff --git a/data/scene/lodearth/textures/earth_bluemarble_height.jpg b/data/scene/lodearth/textures/earth_bluemarble_height.jpg deleted file mode 100644 index 6658823163..0000000000 Binary files a/data/scene/lodearth/textures/earth_bluemarble_height.jpg and /dev/null differ diff --git a/data/scene/lodearth/textures/earth_night.jpg b/data/scene/lodearth/textures/earth_night.jpg deleted file mode 100644 index bf1a1a483c..0000000000 Binary files a/data/scene/lodearth/textures/earth_night.jpg and /dev/null differ diff --git a/data/scene/lodearth/textures/marker.png b/data/scene/lodearth/textures/marker.png deleted file mode 100644 index fc42c047b8..0000000000 Binary files a/data/scene/lodearth/textures/marker.png and /dev/null differ diff --git a/data/scene/lodmars/lodmars.mod b/data/scene/lodmars/lodmars.mod index f7aea14589..3fb1817f99 100644 --- a/data/scene/lodmars/lodmars.mod +++ b/data/scene/lodmars/lodmars.mod @@ -55,7 +55,7 @@ return { }, { Name = "Mars Viking Clr", - FilePath = "map_datasets/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt", + FilePath = "map_datasets/Viking/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt", Enabled = true, }, }, @@ -66,13 +66,13 @@ return { Enabled = true, }, { - Name = "West_Candor_Chasma_longlat_global", - FilePath = "map_datasets/West_Candor_Chasma_longlat_global.vrt", + Name = "West Candor Chasma", + FilePath = "map_datasets/CTX/West_Candor_Chasma_longlat_global.vrt", --Enabled = true, }, { - Name = "Layered Rock Outcrops in Southwest Candor Chasma", - FilePath = "map_datasets/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_A.vrt", + Name = "Layered Rock Outcrops in Southwest Candor Chasma Texture", + FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Texture.vrt", }, --[[ { @@ -109,15 +109,15 @@ return { DoPreProcessing = true, }, { - Name = "West_Candor_Chasma_DEM_longlat_global", - FilePath = "map_datasets/West_Candor_Chasma_DEM_longlat_global.vrt", + Name = "West Candor Chasma", + FilePath = "map_datasets/CTX/West_Candor_Chasma_DEM_longlat_global.vrt", --Enabled = true, MinimumPixelSize = 90, DoPreProcessing = true, }, { Name = "Layered Rock Outcrops in Southwest Candor Chasma", - FilePath = "map_datasets/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_DEM.vrt", + FilePath = "map_datasets/HiRISE/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_Heightmap.vrt", MinimumPixelSize = 90, DoPreProcessing = true, }, @@ -140,11 +140,6 @@ return { TropicalOrbitPeriod = 686.973, EarthOrbitRatio = 1.881, DayLength = 24.6597, - Textures = { - Type = "simple", - Color = "${COMMON_MODULE}/textures/glare_blue.png", - -- need to add different texture - }, }, GuiName = "/Solar/MarsTrail" } diff --git a/data/scene/lodmars/map_service_configs/CTX_Mosaic.xml b/data/scene/lodmars/map_service_configs/CTX_Mosaic.xml index 0e7b835a0f..9f7a65afb5 100644 --- a/data/scene/lodmars/map_service_configs/CTX_Mosaic.xml +++ b/data/scene/lodmars/map_service_configs/CTX_Mosaic.xml @@ -12,9 +12,4 @@ 256 256 - - ./ctx_wms_cache - 2 - .jpg - \ No newline at end of file diff --git a/data/scene/lodmercury/lodmercury.mod b/data/scene/lodmercury/lodmercury.mod index db85207ead..a46dba8f25 100644 --- a/data/scene/lodmercury/lodmercury.mod +++ b/data/scene/lodmercury/lodmercury.mod @@ -86,11 +86,6 @@ return { TropicalOrbitPeriod = 87.968 , EarthOrbitRatio = 0.241, DayLength = 4222.6, - Textures = { - Type = "simple", - Color = "${COMMON_MODULE}/textures/glare_blue.png", - -- need to add different texture - }, }, GuiName = "/Solar/MercuryTrail" } diff --git a/data/scene/lodmoon/lodmoon.mod b/data/scene/lodmoon/lodmoon.mod index 278ed21aa8..267fff5e5b 100644 --- a/data/scene/lodmoon/lodmoon.mod +++ b/data/scene/lodmoon/lodmoon.mod @@ -75,11 +75,6 @@ return { TropicalOrbitPeriod = 60, EarthOrbitRatio = 0.01, DayLength = 1.0, - Textures = { - Type = "simple", - Color = "${COMMON_MODULE}/textures/glare_blue.png", - -- need to add different texture - }, }, GuiName = "/Solar/MoonTrail" } diff --git a/openspace.cfg b/openspace.cfg index b612a364f0..5a77f84544 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -9,11 +9,11 @@ return { -- of all entities that will be visible during an instance of OpenSpace --Scene = "${SCENE}/default.scene", - -- Scene = "${SCENE}/globebrowsing.scene", + Scene = "${SCENE}/globebrowsing.scene", -- Scene = "${SCENE}/rosetta.scene", -- Scene = "${SCENE}/dawn.scene", -- Scene = "${SCENE}/newhorizons.scene", - Scene = "${SCENE}/osirisrex.scene", + -- Scene = "${SCENE}/osirisrex.scene", Paths = { SGCT = "${BASE_PATH}/config/sgct",