mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 16:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add moon height and color WMS

Browse Source
This commit is contained in:
Erik Broberg
2016-07-05 21:42:19 -04:00
parent ec3d5ff073
commit 3e2166e145
4 changed files with 105 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/scene/debugglobe/debugglobe.mod
View File

@@ -23,8 +23,9 @@ return {
Frame = "IAU_EARTH",
Body = "EARTH",
--Radii = {6378137.0, 6378137.0, 6356752.314245}, -- Earth's radii
Radii = {1738100, 1738100, 1736000}, -- Moon's radii
--Radii = {3396190.0, 3396190.0, 3376200.0}, -- Mars' radii
Radii = {2439700.0, 2439700.0, 2439700.0},
--Radii = {2439700.0, 2439700.0, 2439700.0},
CameraMinHeight = 1000,
InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values
SegmentsPerPatch = 90,
@@ -69,6 +70,7 @@ return {
FilePath = "textures/Mars_Viking_ClrMosaic_global_925m_longlat.cub",
--Enabled = true,
},
--[[
{
Name = "On Mercury Color",
FilePath = "map_service_configs/mercury/OnMercuryColor.xml",
@@ -77,12 +79,18 @@ return {
Name = "On Mercury Image",
FilePath = "map_service_configs/mercury/OnMercuryImage.xml",
},
]]
},
GrayScaleOverlays = {
{
Name = "CTX Mosaic",
FilePath = "map_service_configs/mars/CTX_Mosaic.xml",
},
{
Name = "On Moon Color",
FilePath = "map_service_configs/moon/OnMoonColor.xml",
Enabled = true,
},
},
NightTextures = {
{
@@ -99,11 +107,16 @@ return {
{
Name = "Mola Elevation",
FilePath = "map_service_configs/mars/Mola_Elevation.xml",
--Enabled = true,
},
{
Name = "On Moon Height",
FilePath = "map_service_configs/moon/OnMoonHeight.xml",
Enabled = true,
},
{
Name = "On Mercury Height",
FilePath = "map_service_configs/mercury/OnMercuryElevationGaskell.xml",
Enabled = true,
}
},
WaterMasks = {

65
data/scene/debugglobe/map_service_configs/moon/OnMoonColor.xml Normal file
View File

@@ -0,0 +1,65 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://onmoon.lmmp.nasa.gov/wms.cgi?</ServerUrl>
<TiledGroupName>LRO WAC Mosaic, LMMP</TiledGroupName>
<!--
Clementine LO Hybrid, LMMP
Clementine Mosaic, LMMP
LRO WAC Mosaic, LMMP
LOLA v2, LMMP
LOLA Shade v2, LMMP
LOLA ClrShade v2, LMMP
LOLA v4, LMMP
LOLA v4 Coverage, LMMP
LOLA v4 NoData Mask, LMMP
LOLA Shade v4, LMMP
LOLA ClrShade v4, LMMP
Apollo 15, LMMP
Apollo 15 DEM Grayscale, LMMP
Apollo 15 HillShade, LMMP
Apollo 15 Colorized HillShade, LMMP
Apollo 15 Colorized Confidence, LMMP
Apollo 16 image, LMMP
Apollo 16 DEM Grayscale, LMMP
Apollo 16 HillShade, LMMP
Apollo 16 Colorized HillShade, LMMP
Apollo 16 Colorized Confidence, LMMP
Apollo 17 image Old, LMMP
Apollo 17 image, LMMP
Apollo 17 DEM Grayscale, LMMP
Apollo 17 HillShade, LMMP
Apollo 17 Colorized HillShade, LMMP
Apollo 17 Colorized Confidence, LMMP
Apollo Zone image, LMMP
Apollo Zone image 3033, LMMP
Apollo Zone DEM Grayscale, LMMP
Apollo Zone HillShade, LMMP
Apollo Zone Colorized HillShade, LMMP
Apollo Zone Colorized Confidence, LMMP
LRO Diviner CF Filled, LMMP
LRO Diviner CF, LMMP
Clementine Color Ratio, LMMP
Clementine Optical Maturity, LMMP
Clementine FeO abundance, LMMP
Clementine TiO2 abundance, LMMP
LP Fe Abundance, colorized, LMMP
LP K Abundance, colorized, LMMP
LP Th Abundance, colorized, LMMP
LP H Abundance, colorized, LMMP
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>20</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

21
data/scene/debugglobe/map_service_configs/moon/OnMoonHeight.xml Normal file
View File

@@ -0,0 +1,21 @@
<GDAL_WMS>
<Service name="TiledWMS">
<ServerUrl>http://onmoon.lmmp.nasa.gov/raw/wms.cgi?</ServerUrl>
<TiledGroupName>Lunar Elevation v2, half meters</TiledGroupName>
<!--
Lunar Elevation v2
-->
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90</LowerRightY>
<TileLevel>24</TileLevel>
<TileCountX>2</TileCountX>
<TileCountY>1</TileCountY>
<YOrigin>top</YOrigin>
</DataWindow>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
</GDAL_WMS>

8
modules/globebrowsing/shaders/texturetilemapping.hglsl
View File

@@ -216,9 +216,9 @@ vec4 calculateGrayScaleOverlay(
const vec4 currentColor,
const vec2 uv,
LevelWeights levelWeights,
const Tile grayscaleOverlayTiles[NUMLAYERS_OVERLAY],
const Tile grayscaleOverlayTilesParent1[NUMLAYERS_OVERLAY],
const Tile grayscaleOverlayTilesParent2[NUMLAYERS_OVERLAY]) {
const Tile grayscaleOverlayTiles[NUMLAYERS_GRAYSCALE_OVERLAY],
const Tile grayscaleOverlayTilesParent1[NUMLAYERS_GRAYSCALE_OVERLAY],
const Tile grayscaleOverlayTilesParent2[NUMLAYERS_GRAYSCALE_OVERLAY]) {
vec4 colorGrayScale = vec4(0);
@@ -235,7 +235,7 @@ vec4 calculateGrayScaleOverlay(
levelWeights.w2 * getTexVal(grayscaleOverlayTilesParent1[#{i}], uv) +
levelWeights.w3 * getTexVal(grayscaleOverlayTilesParent2[#{i}], uv);
colorSample = vec4(colorSample.r, colorSample.r, colorSample.r, colorSample.g);
colorSample = vec4(colorSample.r, colorSample.r, colorSample.r, 1);
colorGrayScale = blendOver(colorGrayScale, colorSample);
}
#endfor