Clean up globe browsing module files.

data/scene/globebrowsing.scene

@@ -48,7 +48,9 @@ return {
 
     Modules = {
         "lodearth",
+        "lodmoon",
         "lodmars",
+        "lodmercury",
         "sun",
         "stars",
         "milkyway",    

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"
     },
 }

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"
     }

data/scene/lodmars/map_service_configs/CTX_Mosaic.xml

@@ -12,9 +12,4 @@
     <BlockSizeX>256</BlockSizeX>
     <BlockSizeY>256</BlockSizeY>
   </DataWindow>
-   <Cache>
-        <Path>./ctx_wms_cache</Path>
-        <Depth>2</Depth>
-        <Extension>.jpg</Extension>
-    </Cache>
 </GDAL_WMS>

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"
     }

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"
     }

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",