From 838f543b6baba31d7b45afcf15cd4c90fa76faac Mon Sep 17 00:00:00 2001 From: Micah Date: Wed, 12 Feb 2020 00:33:01 -0500 Subject: [PATCH] updates to planet texture defaults, from carter --- data/assets/customization/globebrowsing.asset | 1 - .../solarsystem/planets/earth/moon/moon.asset | 30 +++++++++++-------- .../scene/solarsystem/planets/mars/mars.asset | 18 +++++++++++ .../planets/venus/atmosphere.asset | 4 +-- .../solarsystem/planets/venus/venus.asset | 18 +++++++++-- 5 files changed, 53 insertions(+), 18 deletions(-) diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 679f31166d..bc72ae17b3 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -22,7 +22,6 @@ local vrt_folders = { -- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX' -- We recommend using this folder for CTX - openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/CTX'), openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), -- if not and you have a custom path for CTX layers, enter it below '', diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 0b76a74a74..e9f0f49b3a 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -36,33 +36,39 @@ local Moon = { Name = "WAC [Utah]", FilePath = mapServiceConfigs .. "/Utah/Wac.wms", Enabled = true, - Settings = { Multiplier = 2.0 } + Settings = { Gamma = 0.84 } }, { Identifier = "WAC_Sweden", Name = "WAC [Sweden]", FilePath = mapServiceConfigs .. "/LiU/WAC.wms", - Settings = { Multiplier = 2.0 } + Settings = { Gamma = 0.84 } }, { Identifier = "ClemUvvis_Utah", Name = "Clem Uvvis [Utah]", FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms", - Settings = { Multiplier = 2.0 } + Settings = { + Gamma = 0.81, + Multiplier = 1.1 + } }, { Identifier = "ClemUvvis_Sweden", Name = "Clem Uvvis [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Clem_Uvvis.wms", - Settings = { Multiplier = 2.0 } + Settings = { + Gamma = 0.81, + Multiplier = 1.1 + } }, { Identifier = "UvvisHybrid_Utah", Name = "Uvvis Hybrid [Utah]", FilePath = mapServiceConfigs .. "/Utah/UvvisHybrid.wms", Settings = { - Gamma = 0.75, - Multiplier = 1.5 + Gamma = 0.52, + Multiplier = 0.65 } }, { @@ -70,8 +76,8 @@ local Moon = { Name = "Uvvis Hybrid [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Uvvis_Hybrid.wms", Settings = { - Gamma = 0.75, - Multiplier = 1.5 + Gamma = 0.52, + Multiplier = 0.65 } }, { @@ -79,8 +85,8 @@ local Moon = { Name = "Kaguya [Utah]", FilePath = mapServiceConfigs .. "/Utah/Kaguya.wms", Settings = { - Gamma = 1.12, - Multiplier = 2.7 + Gamma = 1.0, + Multiplier = 1.23 } }, { @@ -88,8 +94,8 @@ local Moon = { Name = "Kaguya [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Kaguya.wms", Settings = { - Gamma = 1.12, - Multiplier = 2.7 + Gamma = 1.0, + Multiplier = 1.23 } }, { diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index ee4da17e7d..bd330c8c01 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -29,6 +29,10 @@ local color_layers = { Name = "Mars Texture", FilePath = textures .. "/mars.jpg", Enabled = true + }, + Settings = { + Gamma = 1.6, + Multiplier = 1.07 } }, { @@ -40,6 +44,10 @@ local color_layers = { Name = "Mars Texture", FilePath = textures .. "/mars.jpg", Enabled = true + }, + Settings = { + Gamma = 1.6, + Multiplier = 1.07 } }, { @@ -107,6 +115,16 @@ local color_layers = { Name = "CTX Mosaic [Sweden]", FilePath = mapServiceConfigs .. "/LiU/CTX.wms", BlendMode = "Color" + }, + { + Identifier = "CTX_belended_01", + Name = "CTX Belended beta01", + FilePath = mapServiceConfigs .. "/ESRI/CTX/CTXblended.vrt", + BlendMode = "Color", + Settings = { + Gamma = 2.14, + Multiplier = 1.54 + } } } diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset index 40a95cdc54..a89828ffbc 100644 --- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset @@ -26,7 +26,7 @@ local Atmosphere = { -- absorption and scattering are the same. }, -- Thichkness of atmosphere if its density were uniform, in Km - H_R = 6.7 + H_R = 3.53 }, -- Default Mie = { @@ -37,7 +37,7 @@ local Atmosphere = { Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 } }, -- Mie Height scale (atmosphere thickness for constant density) in Km - H_M = 9.8, + H_M = 5.42, -- Mie Phase Function Value (G e [-1.0, 1.0]. -- If G = 1.0, Mie phase function = Rayleigh Phase Function) G = 0.85 diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index c6b3bc516d..797ed5b949 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -17,12 +17,20 @@ local color_layers = { { Identifier = "Texture", FilePath = textures .. "/venus.jpg", - Enabled = true + Enabled = true, + Settings = { + Opacity = 0.48, + Gamma = 0.48 + } }, { Identifier = "Magellan_Mosaic_Utah", Name = "Magellan Mosaic [Utah]", - FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.wms" + FilePath = mapServiceConfigs .. "/Utah/MagellanMosaic.wms", + BlendMode = "Color", + Settings = { + Gamma = 2.0 + } } } @@ -31,7 +39,11 @@ local height_layers = { Identifier = "Magellan", Name = "Magellan Elevation [Utah]", FilePath = mapServiceConfigs .. "/Utah/MagellanDEM.wms", - TilePixelSize = 64 + TilePixelSize = 64, + Settings = { + Gamma = 1.72, + Multiplier = 1.1 + } } }