diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset index 21c989419c..7a7ffd934a 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset @@ -5,13 +5,6 @@ asset.request('./trail') -local textures = asset.syncedResource({ - Name = "Charon Textures", - Type = "HttpSynchronization", - Identifier = "charon_textures", - Version = 3 -}) - local Charon = { Identifier = "Charon", Parent = transforms.PlutoBarycenter.Identifier, @@ -39,19 +32,10 @@ local Charon = { Layers = { ColorLayers = { { - Identifier = "Greyscale", - Name = "Black & White", - FilePath = textures .. "/NH_Charon_mosaic.png", - } - }, - HeightLayers = { - { - Identifier = "DTM", - Name = "DTM", - FilePath = textures .. "/NH_Charon_DTM.png", - Enabled = true, - Settings = { Multiplier = 20.0 }, - TilePixelSize = 64 + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90", + Enabled = true } } } diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index 555df9e774..d49fbae85b 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -5,13 +5,6 @@ asset.request('./trail') -local textures = asset.syncedResource({ - Name = "Pluto Textures", - Type = "HttpSynchronization", - Identifier = "pluto_textures", - Version = 5 -}) - local Pluto = { Identifier = "Pluto", Parent = transforms.PlutoBarycenter.Identifier, @@ -39,30 +32,10 @@ local Pluto = { Layers = { ColorLayers = { { - Identifier = "Greyscale", - Name = "Black & White", - FilePath = textures .. "/NH_Pluto_mosaic_16384.png", + Identifier = "Greyscale_USGS", + Name = "Black & White [USGS]", + FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90", Enabled = true - }, - { - Identifier = "Color", - Name = "Color", - FilePath = textures .. "/pmap_cyl_k201.jpg" - }, - { - Identifier = "Hubble", - Name = "Hubble", - FilePath = textures .. "/pluto.png" - } - }, - HeightLayers = { - { - Identifier = "DTM", - Name = "DTM", - FilePath = textures .. "/NH_Pluto_DTM_16384.png", - Enabled = true, - Settings = { Multiplier = 20.0 }, - TilePixelSize = 64 } } } diff --git a/data/globebrowsing_servers.lua b/data/globebrowsing_servers.lua index 254fd9edb8..996ea313e9 100644 --- a/data/globebrowsing_servers.lua +++ b/data/globebrowsing_servers.lua @@ -32,6 +32,18 @@ return { URL = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&service=WMS&request=GetCapabilities" }, }, + Pluto = { + { + Name = "USGS Pluto", + URL = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&service=WMS&request=GetCapabilities" + } + }, + Charon = { + { + Name = "USGS Charon", + URL = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&service=WMS&request=GetCapabilities" + } + } }