diff --git a/data/scene/globebrowsing.scene b/data/scene/globebrowsing.scene index 23f96cddd3..b956eb6d18 100644 --- a/data/scene/globebrowsing.scene +++ b/data/scene/globebrowsing.scene @@ -29,6 +29,7 @@ function postInitialization() openspace.setPropertyValue("SunGlare.renderable.enabled", false) openspace.setPropertyValue("SunMarker.renderable.enabled", false) + openspace.setPropertyValue("Earth.RenderableGlobe.Atmosphere", true) openspace.resetCameraDirection() openspace.time.setDeltaTime(0) diff --git a/data/scene/lodearth/lodearth.mod b/data/scene/lodearth/lodearth.mod index b8006da306..18967c6a0b 100644 --- a/data/scene/lodearth/lodearth.mod +++ b/data/scene/lodearth/lodearth.mod @@ -56,16 +56,16 @@ return { }, Textures = { ColorTextures = { + { + Name = "ESRI Imagery World 2D", + FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms", + Enabled = true, + }, { Type = "Temporal", Name = "Temporal VIIRS SNPP", FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", }, - { - Type = "SingleImage", - Name = "Debug Tiles", - FilePath = "textures/test_tile.png", - }, { Type = "Temporal", Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor", @@ -76,13 +76,13 @@ return { FilePath = "map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml", }, { - Name = "ESRI Imagery World 2D", - FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms", - Enabled = true, - } + Type = "SingleImage", + Name = "Debug Tiles", + FilePath = "textures/test_tile.png", + }, }, GrayScaleTextures = { - + }, GrayScaleOverlays = { @@ -91,12 +91,14 @@ return { { Name = "Earth at Night 2012", FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml", + Enabled = true, }, }, WaterMasks = { { Name = "MODIS_Water_Mask", FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml", + Enabled = true, }, }, Overlays = { diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp index ff1f9bff6a..a02eada5bb 100644 --- a/modules/globebrowsing/globes/renderableglobe.cpp +++ b/modules/globebrowsing/globes/renderableglobe.cpp @@ -77,7 +77,7 @@ namespace openspace { , debugSelection(ReferencedBoolSelection("Debug", "Debug")) , atmosphereEnabled(properties::BoolProperty("Atmosphere", "Atmosphere", false)) , _performShading( - properties::BoolProperty("performShading", "Perform shading", false)) + properties::BoolProperty("performShading", "Perform shading", true)) { setName("RenderableGlobe");