diff --git a/data/scene/globebrowsing.scene b/data/scene/globebrowsing.scene
index 6161b2f05f..df55b5969a 100644
--- a/data/scene/globebrowsing.scene
+++ b/data/scene/globebrowsing.scene
@@ -19,7 +19,7 @@ end
function postInitialization()
openspace.printInfo("Setting default values")
- openspace.setInteractionMode('GlobeBrowsingInteractionMode')
+ openspace.setInteractionMode('GlobeBrowsing')
--openspace.restoreCameraStateFromFile("camera_lookat_planet.lua")
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
@@ -41,17 +41,17 @@ return {
ScenePath = ".",
CommonFolder = "common",
Camera = {
- Focus = "DebugGlobe",
+ Focus = "LodMars",
Position = {138530625167.228241, 42217005217.825005, -46336405755.934372},
Rotation = {0.633883, 0.492158, -0.123913, -0.583625},
},
Modules = {
- "debugglobe",
+ "lodearth",
+ "lodmars",
"sun",
"stars",
- "milkyway",
-
+ "milkyway",
}
}
diff --git a/data/scene/lodearth/lodearth.mod b/data/scene/lodearth/lodearth.mod
new file mode 100644
index 0000000000..068fef2acd
--- /dev/null
+++ b/data/scene/lodearth/lodearth.mod
@@ -0,0 +1,104 @@
+return {
+ -- Earth barycenter module
+ {
+ Name = "EarthBarycenter",
+ Parent = "SolarSystemBarycenter",
+ Static = true,
+ Ephemeris = {
+ Type = "Spice",
+ Body = "EARTH BARYCENTER",
+ Reference = "ECLIPJ2000",
+ Observer = "SUN",
+ Kernels = {
+ "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+ }
+ },
+ },
+ -- RenderableGlobe module
+ {
+ Name = "LodEarth",
+ Parent = "EarthBarycenter",
+ Renderable = {
+ Type = "RenderableGlobe",
+ Frame = "IAU_EARTH",
+ Body = "EARTH",
+ Radii = {6378137.0, 6378137.0, 6356752.314245}, -- Earth's radii
+ CameraMinHeight = 300,
+ InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values
+ SegmentsPerPatch = 64,
+ TextureInitData = {
+ ColorTextureMinimumSize = 512,--512,
+ OverlayMinimumSize = 512,
+ HeightMapMinimumSize = 64,
+ },
+ Textures = {
+ ColorTextures = {
+ {
+ Type = "Temporal",
+ Name = "Temporal VIIRS SNPP",
+ FilePath = "map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml",
+ },
+ {
+ Type = "SingleImage",
+ Name = "Debug Tiles",
+ FilePath = "textures/test_tile.png",
+ },
+ {
+ Type = "Temporal",
+ Name = "Temporal MODIS Aqua CorrectedRecflectance TrueColor",
+ FilePath = "map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml",
+ },
+ {
+ Name = "MODIS_Terra_CorrectedReflectance_TrueColor",
+ FilePath = "map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
+ },
+ {
+ Name = "ESRI Imagery World 2D",
+ FilePath = "map_service_configs/earth/ESRI_Imagery_World_2D.wms",
+ Enabled = true,
+ }
+ },
+ GrayScaleOverlays = {
+
+ },
+ NightTextures = {
+ {
+ Name = "Earth at Night 2012",
+ FilePath = "map_service_configs/earth/VIIRS_CityLights_2012.xml",
+ },
+ },
+ WaterMasks = {
+ {
+ Name = "MODIS_Water_Mask",
+ FilePath = "map_service_configs/earth/MODIS_Water_Mask.xml",
+ },
+ },
+ Overlays = {
+ {
+ Name = "Coastlines",
+ FilePath = "map_service_configs/earth/Coastlines.xml",
+ },
+ {
+ Name = "Reference_Features",
+ FilePath = "map_service_configs/earth/Reference_Features.xml",
+ },
+ {
+ Name = "Reference_Labels",
+ FilePath = "map_service_configs/earth/Reference_Labels.xml",
+ },
+ },
+ HeightMaps = {
+ {
+ Name = "Terrain tileset",
+ FilePath = "map_service_configs/earth/TERRAIN.wms",
+ Enabled = true,
+ },
+ },
+ HeightMapOverlays = {
+
+ },
+ },
+ },
+ GuiName = "/Solar/Planets/LodEarth"
+ },
+}
diff --git a/data/scene/lodearth/map_service_configs/earth/ASTER_GDEM_Greyscale_Shaded_Relief.xml b/data/scene/lodearth/map_service_configs/earth/ASTER_GDEM_Greyscale_Shaded_Relief.xml
new file mode 100644
index 0000000000..8666bd37cc
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/ASTER_GDEM_Greyscale_Shaded_Relief.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/ASTER_GDEM_Greyscale_Shaded_Relief/default/2016-05-16/EPSG4326_31m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 12
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 1
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/Coastlines.xml b/data/scene/lodearth/map_service_configs/earth/Coastlines.xml
new file mode 100644
index 0000000000..c9578ad205
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Coastlines.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/Coastlines/default/2013-08-21/EPSG4326_250m/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 9
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/ESRI_Imagery_World_2D.wms b/data/scene/lodearth/map_service_configs/earth/ESRI_Imagery_World_2D.wms
new file mode 100644
index 0000000000..ef90f48509
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/ESRI_Imagery_World_2D.wms
@@ -0,0 +1,24 @@
+
+
+ http://services.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/${z}/${y}/${x}
+
+
+ 15
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+ 5
+
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/GIBS_Aqua_MODIS_true.xml b/data/scene/lodearth/map_service_configs/earth/GIBS_Aqua_MODIS_true.xml
new file mode 100644
index 0000000000..8d3196deff
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/GIBS_Aqua_MODIS_true.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Aqua_CorrectedReflectance_TrueColor/default/2013-08-21/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml b/data/scene/lodearth/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml
new file mode 100644
index 0000000000..3dcf166656
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml
@@ -0,0 +1,10 @@
+
+
+ https://gibs.earthdata.nasa.gov/wmts/epsg4326/std/wmts.cgi?
+ MODIS TERRA tileset
+ ${t}
+ Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD
+ image/jpeg
+
+ 20
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/MLS_O3_46hPa_Day.xml b/data/scene/lodearth/map_service_configs/earth/MLS_O3_46hPa_Day.xml
new file mode 100644
index 0000000000..e0dd1d4b7e
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/MLS_O3_46hPa_Day.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MLS_O3_46hPa_Day/default/2013-08-21/EPSG4326_2km/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 5
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_Brightness_Temp_Band31_Day.xml b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_Brightness_Temp_Band31_Day.xml
new file mode 100644
index 0000000000..c63f815618
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_Brightness_Temp_Band31_Day.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Terra_Brightness_Temp_Band31_Day/default/2013-08-21/EPSG4326_1km/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml
new file mode 100644
index 0000000000..faf07ccced
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Terra_CorrectedReflectance_TrueColor/default/2016-05-16/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml
new file mode 100644
index 0000000000..36013e4a3a
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor_temporal.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Terra_CorrectedReflectance_TrueColor/default/${t}/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/MODIS_Water_Mask.xml b/data/scene/lodearth/map_service_configs/earth/MODIS_Water_Mask.xml
new file mode 100644
index 0000000000..0f9c24b540
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/MODIS_Water_Mask.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Water_Mask/default/2013-08-21/EPSG4326_250m/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 7
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/OpenStreetMap.xml b/data/scene/lodearth/map_service_configs/earth/OpenStreetMap.xml
new file mode 100644
index 0000000000..450aab0cd6
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/OpenStreetMap.xml
@@ -0,0 +1,20 @@
+
+
+http://tile.openstreetmap.org/${z}/${x}/${y}.png
+
+
+-180
+90
+180
+-90
+18
+1
+1
+top
+
+EPSG:4326
+256
+256
+3
+
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/Reference_Features.xml b/data/scene/lodearth/map_service_configs/earth/Reference_Features.xml
new file mode 100644
index 0000000000..6cc0348f36
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Reference_Features.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/Reference_Features/default/2013-08-21/EPSG4326_250m/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 9
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/Reference_Labels.xml b/data/scene/lodearth/map_service_configs/earth/Reference_Labels.xml
new file mode 100644
index 0000000000..0a13e11f23
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Reference_Labels.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/Reference_Labels/default/2013-08-21/EPSG4326_250m/${z}/${y}/${x}.png
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 9
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/TERRAIN.wms b/data/scene/lodearth/map_service_configs/earth/TERRAIN.wms
new file mode 100644
index 0000000000..6782144c50
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/TERRAIN.wms
@@ -0,0 +1,13 @@
+
+
+ http://198.102.45.23/arcgis/rest/services/worldelevation3d/terrain3d?
+ GCS_Elevation
+
+
+ -180.0
+ 90.0
+ 180.0
+ -90.0
+ bottom
+
+
diff --git a/data/scene/lodearth/map_service_configs/earth/TERRA_CR_B143_2016-04-12.wms b/data/scene/lodearth/map_service_configs/earth/TERRA_CR_B143_2016-04-12.wms
new file mode 100644
index 0000000000..974c7da85f
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/TERRA_CR_B143_2016-04-12.wms
@@ -0,0 +1,8 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/twms-geo/twms.cgi?
+ MODIS TERRA tileset
+ 2016-04-12
+
+ 20
+
diff --git a/data/scene/lodearth/map_service_configs/earth/Temporal_Aqua_Orbit_Asc.xml b/data/scene/lodearth/map_service_configs/earth/Temporal_Aqua_Orbit_Asc.xml
new file mode 100644
index 0000000000..e2253fabc9
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Temporal_Aqua_Orbit_Asc.xml
@@ -0,0 +1,36 @@
+
+ 2012-05-08
+
+ 1d
+ YYYY-MM-DD
+
+
+ 1.1.1
+ http://map2.vis.earthdata.nasa.gov/wms/wms.php?TIME=${OpenSpaceTimeId}
+ EPSG:4326
+ image/png
+ TRUE
+ Aqua_Orbit_Asc
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
+
+
diff --git a/data/scene/lodearth/map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml
new file mode 100644
index 0000000000..d09c0e9615
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml
@@ -0,0 +1,25 @@
+
+ 2012-05-08
+
+ 1d
+ YYYY-MM-DD
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/MODIS_Aqua_CorrectedReflectance_TrueColor/default/${OpenSpaceTimeId}/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml
new file mode 100644
index 0000000000..311f2ec097
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml
@@ -0,0 +1,25 @@
+
+ 2015-11-24
+
+ 1d
+ YYYY-MM-DD
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/VIIRS_SNPP_CorrectedReflectance_TrueColor/default/${OpenSpaceTimeId}/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/VIIRS_CityLights_2012.xml b/data/scene/lodearth/map_service_configs/earth/VIIRS_CityLights_2012.xml
new file mode 100644
index 0000000000..cf0c6a1866
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/VIIRS_CityLights_2012.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/VIIRS_CityLights_2012/default/2012-01-01/EPSG4326_500m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 4
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/lodearth/map_service_configs/earth/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml
new file mode 100644
index 0000000000..881dce3e58
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml
@@ -0,0 +1,19 @@
+
+
+ http://map1.vis.earthdata.nasa.gov/wmts-geo/VIIRS_SNPP_CorrectedReflectance_TrueColor/default/2016-05-16/EPSG4326_250m/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 396.0
+ -198
+ 8
+ 2
+ 1
+ top
+
+ EPSG:4326
+ 512
+ 512
+ 3
+
\ No newline at end of file
diff --git a/data/scene/lodearth/map_service_configs/earth/frmt_wms_virtualearth.xml b/data/scene/lodearth/map_service_configs/earth/frmt_wms_virtualearth.xml
new file mode 100644
index 0000000000..3b628e9a89
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/earth/frmt_wms_virtualearth.xml
@@ -0,0 +1,7 @@
+
+
+ http://a${server_num}.ortho.tiles.virtualearth.net/tiles/a${quadkey}.jpeg?g=90
+
+ 4
+
+
diff --git a/data/scene/lodearth/map_service_configs/test.wms b/data/scene/lodearth/map_service_configs/test.wms
new file mode 100644
index 0000000000..7ee62a7fc7
--- /dev/null
+++ b/data/scene/lodearth/map_service_configs/test.wms
@@ -0,0 +1,79 @@
+
+
+ http://192.168.1.167/OnMars/wms.cgi?
+ CTX Mosaic
+
+
+ -180.0
+ 90.0
+ 180.0
+ -90.0
+ bottom
+
+ 1
+
+
+
+
+
\ No newline at end of file
diff --git a/data/scene/lodearth/textures/ToastMapOfEarth.jpg b/data/scene/lodearth/textures/ToastMapOfEarth.jpg
new file mode 100644
index 0000000000..9064235622
Binary files /dev/null and b/data/scene/lodearth/textures/ToastMapOfEarth.jpg differ
diff --git a/data/scene/lodearth/textures/earth_bluemarble.jpg b/data/scene/lodearth/textures/earth_bluemarble.jpg
new file mode 100644
index 0000000000..55b715d061
Binary files /dev/null and b/data/scene/lodearth/textures/earth_bluemarble.jpg differ
diff --git a/data/scene/lodearth/textures/earth_bluemarble_height.jpg b/data/scene/lodearth/textures/earth_bluemarble_height.jpg
new file mode 100644
index 0000000000..6658823163
Binary files /dev/null and b/data/scene/lodearth/textures/earth_bluemarble_height.jpg differ
diff --git a/data/scene/lodearth/textures/earth_night.jpg b/data/scene/lodearth/textures/earth_night.jpg
new file mode 100644
index 0000000000..bf1a1a483c
Binary files /dev/null and b/data/scene/lodearth/textures/earth_night.jpg differ
diff --git a/data/scene/lodearth/textures/marker.png b/data/scene/lodearth/textures/marker.png
new file mode 100644
index 0000000000..fc42c047b8
Binary files /dev/null and b/data/scene/lodearth/textures/marker.png differ
diff --git a/data/scene/lodearth/textures/test_tile.png b/data/scene/lodearth/textures/test_tile.png
new file mode 100644
index 0000000000..cb16c0952f
Binary files /dev/null and b/data/scene/lodearth/textures/test_tile.png differ
diff --git a/data/scene/lodearth/textures/test_tile511x511.png b/data/scene/lodearth/textures/test_tile511x511.png
new file mode 100644
index 0000000000..07e5d7888d
Binary files /dev/null and b/data/scene/lodearth/textures/test_tile511x511.png differ
diff --git a/data/scene/lodearth/textures/test_tile512x511.png b/data/scene/lodearth/textures/test_tile512x511.png
new file mode 100644
index 0000000000..b3e775581e
Binary files /dev/null and b/data/scene/lodearth/textures/test_tile512x511.png differ
diff --git a/data/scene/lodearth/textures/test_tile727x728.png b/data/scene/lodearth/textures/test_tile727x728.png
new file mode 100644
index 0000000000..20a517915f
Binary files /dev/null and b/data/scene/lodearth/textures/test_tile727x728.png differ
diff --git a/data/scene/lodearth/textures/test_tile728x727.png b/data/scene/lodearth/textures/test_tile728x727.png
new file mode 100644
index 0000000000..ca02a942f1
Binary files /dev/null and b/data/scene/lodearth/textures/test_tile728x727.png differ
diff --git a/data/scene/lodmars/lodmars.mod b/data/scene/lodmars/lodmars.mod
new file mode 100644
index 0000000000..dbb0c95fb3
--- /dev/null
+++ b/data/scene/lodmars/lodmars.mod
@@ -0,0 +1,131 @@
+return {
+ -- Mars barycenter module
+ {
+ Name = "MarsBarycenter",
+ Parent = "SolarSystemBarycenter",
+ Ephemeris = {
+ Type = "Static"
+ }
+ },
+ -- RenderableGlobe module
+ {
+ Name = "LodMars",
+ Parent = "MarsBarycenter",
+ Ephemeris = {
+ Type = "Spice",
+ Body = "MARS BARYCENTER",
+ Reference = "ECLIPJ2000",
+ Observer = "SUN",
+ Kernels = {
+ "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+ }
+ },
+ Rotation = {
+ Type = "Spice",
+ Frame = "IAU_MARS",
+ Reference = "ECLIPJ2000"
+ },
+ Renderable = {
+ Type = "RenderableGlobe",
+ Frame = "IAU_MARS",
+ Body = "MARS BARYCENTER",
+ Radii = {3396190.0, 3396190.0, 3376200.0}, -- Mars' radii
+ CameraMinHeight = 1000,
+ InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values
+ SegmentsPerPatch = 90,
+ TextureInitData = {
+ ColorTextureMinimumSize = 512,
+ OverlayMinimumSize = 512,
+ HeightMapMinimumSize = 90,
+ },
+ Textures = {
+ ColorTextures = {
+ {
+ Type = "SingleImage",
+ Name = "Debug Tiles",
+ FilePath = "textures/test_tile.png",
+ },
+ {
+ Name = "MARS_Viking_MDIM21",
+ FilePath = "map_service_configs/MARS_Viking_MDIM21.xml",
+ Enabled = true,
+ },
+ {
+ Name = "Mars Viking Clr",
+ FilePath = "map_datasets/Mars_Viking_ClrMosaic_global_925m_longlat_full.vrt",
+ Enabled = true,
+ },
+ },
+ GrayScaleOverlays = {
+ {
+ Name = "CTX Mosaic",
+ FilePath = "map_service_configs/CTX_Mosaic.xml",
+ Enabled = true,
+ },
+ {
+ Name = "West_Candor_Chasma_longlat_global",
+ FilePath = "map_datasets/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",
+ },
+ },
+ NightTextures = {
+
+ },
+ WaterMasks = {
+
+ },
+ Overlays = {
+ {
+ Type = "ChunkIndex",
+ Name = "Indices",
+ },
+ },
+ HeightMaps = {
+ {
+ Name = "Mola Elevation",
+ FilePath = "map_service_configs/Mola_Elevation.xml",
+ Enabled = true,
+ },
+ {
+ Name = "West_Candor_Chasma_DEM_longlat_global",
+ FilePath = "map_datasets/West_Candor_Chasma_DEM_longlat_global.vrt",
+ --Enabled = true,
+ },
+ {
+ Name = "Layered Rock Outcrops in Southwest Candor Chasma",
+ FilePath = "map_datasets/Layered_Rock_Outcrops_in_Southwest_Candor_Chasma_DEM.vrt",
+ },
+ },
+ HeightMapOverlays = {
+ },
+ },
+ },
+
+ GuiName = "/Solar/Planets/LodMars"
+ },
+ -- MarsTrail module
+ {
+ Name = "MarsTrail",
+ Parent = "MarsBarycenter",
+ Renderable = {
+ Type = "RenderableTrail",
+ Body = "MARS BARYCENTER",
+ Frame = "GALACTIC",
+ Observer = "SUN",
+ RGB = { 1, 0.8, 0.5 },
+ 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
new file mode 100644
index 0000000000..0e7b835a0f
--- /dev/null
+++ b/data/scene/lodmars/map_service_configs/CTX_Mosaic.xml
@@ -0,0 +1,20 @@
+
+
+ http://192.168.1.167/OnMars/wms.cgi?
+ CTX Mosaic
+ TRUE
+
+
+ -180.0
+ 90.0
+ 180.0
+ -90.0
+ 256
+ 256
+
+
+ ./ctx_wms_cache
+ 2
+ .jpg
+
+
\ No newline at end of file
diff --git a/data/scene/lodmars/map_service_configs/MARS_Viking_MDIM21.xml b/data/scene/lodmars/map_service_configs/MARS_Viking_MDIM21.xml
new file mode 100644
index 0000000000..f4952b7ed1
--- /dev/null
+++ b/data/scene/lodmars/map_service_configs/MARS_Viking_MDIM21.xml
@@ -0,0 +1,18 @@
+
+
+ http://dzw9r5p966egh.cloudfront.net/catalog/Mars_Viking_MDIM21_ClrMosaic_global_232m/1.0.0//default/default028mm/${z}/${y}/${x}.jpg
+
+
+ -180.0
+ 90
+ 180.0
+ -90
+ 8
+ 2
+ 1
+ top
+
+ 256
+ 256
+ 3
+
\ No newline at end of file
diff --git a/data/scene/lodmars/map_service_configs/Mola_Elevation.xml b/data/scene/lodmars/map_service_configs/Mola_Elevation.xml
new file mode 100644
index 0000000000..b79223c4af
--- /dev/null
+++ b/data/scene/lodmars/map_service_configs/Mola_Elevation.xml
@@ -0,0 +1,13 @@
+
+
+ http://192.168.1.167/OnMars/wms.cgi?
+ Mola Elevation
+
+
+ -180.0
+ 90.0
+ 180.0
+ -90.0
+ bottom
+
+
\ No newline at end of file
diff --git a/data/scene/lodmars/textures/ToastMapOfEarth.jpg b/data/scene/lodmars/textures/ToastMapOfEarth.jpg
new file mode 100644
index 0000000000..9064235622
Binary files /dev/null and b/data/scene/lodmars/textures/ToastMapOfEarth.jpg differ
diff --git a/data/scene/lodmars/textures/earth_bluemarble.jpg b/data/scene/lodmars/textures/earth_bluemarble.jpg
new file mode 100644
index 0000000000..55b715d061
Binary files /dev/null and b/data/scene/lodmars/textures/earth_bluemarble.jpg differ
diff --git a/data/scene/lodmars/textures/earth_bluemarble_height.jpg b/data/scene/lodmars/textures/earth_bluemarble_height.jpg
new file mode 100644
index 0000000000..6658823163
Binary files /dev/null and b/data/scene/lodmars/textures/earth_bluemarble_height.jpg differ
diff --git a/data/scene/lodmars/textures/earth_night.jpg b/data/scene/lodmars/textures/earth_night.jpg
new file mode 100644
index 0000000000..bf1a1a483c
Binary files /dev/null and b/data/scene/lodmars/textures/earth_night.jpg differ
diff --git a/data/scene/lodmars/textures/marker.png b/data/scene/lodmars/textures/marker.png
new file mode 100644
index 0000000000..fc42c047b8
Binary files /dev/null and b/data/scene/lodmars/textures/marker.png differ
diff --git a/data/scene/lodmars/textures/test_tile.png b/data/scene/lodmars/textures/test_tile.png
new file mode 100644
index 0000000000..cb16c0952f
Binary files /dev/null and b/data/scene/lodmars/textures/test_tile.png differ
diff --git a/data/scene/lodmars/textures/test_tile511x511.png b/data/scene/lodmars/textures/test_tile511x511.png
new file mode 100644
index 0000000000..07e5d7888d
Binary files /dev/null and b/data/scene/lodmars/textures/test_tile511x511.png differ
diff --git a/data/scene/lodmars/textures/test_tile512x511.png b/data/scene/lodmars/textures/test_tile512x511.png
new file mode 100644
index 0000000000..b3e775581e
Binary files /dev/null and b/data/scene/lodmars/textures/test_tile512x511.png differ
diff --git a/data/scene/lodmars/textures/test_tile727x728.png b/data/scene/lodmars/textures/test_tile727x728.png
new file mode 100644
index 0000000000..20a517915f
Binary files /dev/null and b/data/scene/lodmars/textures/test_tile727x728.png differ
diff --git a/data/scene/lodmars/textures/test_tile728x727.png b/data/scene/lodmars/textures/test_tile728x727.png
new file mode 100644
index 0000000000..ca02a942f1
Binary files /dev/null and b/data/scene/lodmars/textures/test_tile728x727.png differ