diff --git a/Environment/environment.xml b/Environment/environment.xml index e3f0426f8..4aa28b2e9 100644 --- a/Environment/environment.xml +++ b/Environment/environment.xml @@ -432,7 +432,9 @@ 0.27 0.3 - 0.0 + 0.0 + 0.6 + 0.0 diff --git a/Environment/metarinterpolator.xml b/Environment/metarinterpolator.xml index dfb4200bf..ee2ff6614 100644 --- a/Environment/metarinterpolator.xml +++ b/Environment/metarinterpolator.xml @@ -534,6 +534,17 @@ /sim/environment/windsock-light + + + MetarController:layer:tide-level + gain + 0.5 + 0.5 + /sim/time/tide-level-norm + /environment/sea/surface/delta-T-tide + 0.0 1.0 diff --git a/Materials/default/global-summer.xml b/Materials/default/global-summer.xml index ee1bb0ae6..cce38c3c1 100644 --- a/Materials/default/global-summer.xml +++ b/Materials/default/global-summer.xml @@ -353,8 +353,8 @@ Littoral Terrain/tidal.png - 2000 - 2000 + 1000 + 1000 1 40000000.0 0.8 diff --git a/Materials/default/global-winter.xml b/Materials/default/global-winter.xml index 1eebfa2ce..7c6216108 100644 --- a/Materials/default/global-winter.xml +++ b/Materials/default/global-winter.xml @@ -316,8 +316,8 @@ Littoral Terrain/tidal.png - 2000 - 2000 + 1000 + 1000 1 40000000.0 0.8 diff --git a/Materials/regions/azores.xml b/Materials/regions/azores.xml index dd6ff9408..611b8aeaf 100755 --- a/Materials/regions/azores.xml +++ b/Materials/regions/azores.xml @@ -267,8 +267,8 @@ Littoral Effects/water Terrain/tidal.png - 2000 - 2000 + 1000 + 1000 1 40000000.0 0.8 diff --git a/Materials/regions/europe.xml b/Materials/regions/europe.xml index 18eda105b..74fdb000a 100644 --- a/Materials/regions/europe.xml +++ b/Materials/regions/europe.xml @@ -244,13 +244,31 @@ Littoral Effects/water - Terrain/tidal.png - 2000 - 2000 - 1 + + Terrain/tidal.png + Terrain/mud.png + Terrain/sand_overlay.png + Terrain/sand6_hires.png + + + /environment/sea/surface/delta-T-tide + 0.4 + 1.0 + 1 + 0.5 + 0 + 60.0 + 1.21 + 0 + 4.0 + + 1000 + 1000 40000000.0 + 1.2 + 1 0.8 - 0.3 + 0.4 0.2 1e30 diff --git a/Materials/regions/global-summer.xml b/Materials/regions/global-summer.xml index 632678d26..be3246715 100644 --- a/Materials/regions/global-summer.xml +++ b/Materials/regions/global-summer.xml @@ -489,8 +489,8 @@ Littoral Terrain/tidal.png - 2000 - 2000 + 1000 + 1000 1 40000000.0 0.8 diff --git a/Textures/Terrain/tidal.png b/Textures/Terrain/tidal.png index 03ebd75ef..cb354f366 100644 Binary files a/Textures/Terrain/tidal.png and b/Textures/Terrain/tidal.png differ diff --git a/Textures/Terrain/water-inland.dds b/Textures/Terrain/water-inland.dds index ccbe99e21..28193c1e8 100644 Binary files a/Textures/Terrain/water-inland.dds and b/Textures/Terrain/water-inland.dds differ diff --git a/Textures/Terrain/water-inland.png b/Textures/Terrain/water-inland.png new file mode 100644 index 000000000..da4fff16f Binary files /dev/null and b/Textures/Terrain/water-inland.png differ diff --git a/Textures/Terrain/water.dds b/Textures/Terrain/water.dds index 22c687ea9..b4525181f 100644 Binary files a/Textures/Terrain/water.dds and b/Textures/Terrain/water.dds differ diff --git a/Textures/Terrain/water.png b/Textures/Terrain/water.png index 74eaba2d8..7e6bb4c0f 100644 Binary files a/Textures/Terrain/water.png and b/Textures/Terrain/water.png differ