From 97d54bf17ff553bc4b1d651e5b4f8c0a95b1dfd2 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Fri, 8 Apr 2016 22:39:29 +0100 Subject: [PATCH] Make LOD for trees/buildings/objects/STG configurable. Now based on /sim/rendering/static-lod/rough. This commit removes a large number of range settings that should in general be set by the user. --- Materials/base/farm-buildings.xml | 1 - Materials/base/industrial-buildings.xml | 1 - Materials/base/materials-base.xml | 18 +---------- Materials/base/town-buildings.xml | 1 - Materials/base/urban-buildings.xml | 1 - Materials/dds/global-summer.xml | 20 ------------ Materials/dds/global-winter.xml | 17 ---------- Materials/dds/materials.xml | 14 -------- Materials/dds/urban.xml | 2 -- Materials/default/global-summer.xml | 18 ----------- Materials/default/global-winter.xml | 17 ---------- Materials/default/materials.xml | 14 -------- Materials/regions/UAE.xml | 4 --- Materials/regions/africa_desert.xml | 2 -- Materials/regions/africa_kilimanjaro.xml | 1 - Materials/regions/africa_mediterranean.xml | 4 --- Materials/regions/africa_rainforest.xml | 3 -- Materials/regions/africa_savanna.xml | 5 --- Materials/regions/alaska.xml | 4 --- Materials/regions/ascension.xml | 1 - Materials/regions/asia.xml | 1 - Materials/regions/brazil_amazon_forest.xml | 4 --- Materials/regions/brazil_brasilia.xml | 1 - Materials/regions/brazil_caatinga.xml | 7 ---- Materials/regions/brazil_cerrado.xml | 5 --- .../regions/brazil_chapada_diamantina.xml | 2 -- Materials/regions/brazil_manaus.xml | 1 - Materials/regions/brazil_mata_atlantica.xml | 3 -- Materials/regions/brazil_pampas.xml | 5 --- Materials/regions/brazil_pantanal.xml | 2 -- Materials/regions/brazil_southern_cerrado.xml | 5 --- Materials/regions/california.xml | 6 ---- Materials/regions/caribbean-common.xml | 1 - .../regions/caribbean-farm-buildings.xml | 1 - Materials/regions/corse.xml | 2 -- Materials/regions/europe-winter.xml | 2 -- Materials/regions/europe.xml | 7 ---- Materials/regions/florida.xml | 3 -- Materials/regions/global-summer.xml | 17 ---------- Materials/regions/global-winter.xml | 15 --------- Materials/regions/hawaii.xml | 5 --- Materials/regions/iceland.xml | 2 -- Materials/regions/indonesia.xml | 4 --- Materials/regions/ireland.xml | 3 -- Materials/regions/latin_american_cities.xml | 2 -- Materials/regions/madagascar.xml | 4 --- Materials/regions/materials.xml | 14 -------- Materials/regions/mediterranean_cities.xml | 1 - Materials/regions/mexico.xml | 6 ---- Materials/regions/middle_east.xml | 3 -- .../regions/middle_east_large_cities.xml | 1 - Materials/regions/north_atlantic_islands.xml | 2 -- Materials/regions/oahu.xml | 1 - Materials/regions/scandinavia.xml | 5 --- Materials/regions/sierras.xml | 1 - Materials/regions/south_africa.xml | 5 --- Materials/regions/southeast_asia.xml | 4 --- Materials/regions/southern_europe.xml | 6 ---- Materials/regions/tropical_south_america.xml | 4 --- Materials/regions/united_kingdom.xml | 9 ------ Materials/regions/us_southwest.xml | 6 ---- gui/dialogs/static-lod.xml | 32 +++++++++++++++++++ 62 files changed, 33 insertions(+), 325 deletions(-) diff --git a/Materials/base/farm-buildings.xml b/Materials/base/farm-buildings.xml index 50dd3f778..010b1d714 100644 --- a/Materials/base/farm-buildings.xml +++ b/Materials/base/farm-buildings.xml @@ -1,7 +1,6 @@ - 5000 Models/Buildings/silo.ac Models/Buildings/red-barn.ac diff --git a/Materials/base/industrial-buildings.xml b/Materials/base/industrial-buildings.xml index caba311f6..1dedf1c2d 100644 --- a/Materials/base/industrial-buildings.xml +++ b/Materials/base/industrial-buildings.xml @@ -1,7 +1,6 @@ - 10000 Models/Industrial/Industrial110x185.xml Models/Industrial/Industrial150x115.xml diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml index 9196bc716..4998460af 100644 --- a/Materials/base/materials-base.xml +++ b/Materials/base/materials-base.xml @@ -11,23 +11,7 @@ - - - - - - 8000 - - - - - 10000 - - - - + lf_sng_solid_yellow diff --git a/Materials/base/town-buildings.xml b/Materials/base/town-buildings.xml index b3ad09b36..6b4a4f219 100644 --- a/Materials/base/town-buildings.xml +++ b/Materials/base/town-buildings.xml @@ -1,7 +1,6 @@ - 10000 Models/Buildings/water-tower.ac Models/Buildings/oil-tanks.ac diff --git a/Materials/base/urban-buildings.xml b/Materials/base/urban-buildings.xml index 3a4c244d9..fe7a64a7e 100644 --- a/Materials/base/urban-buildings.xml +++ b/Materials/base/urban-buildings.xml @@ -1,7 +1,6 @@ - 10000 Models/Buildings/factory.ac 40000000 diff --git a/Materials/dds/global-summer.xml b/Materials/dds/global-summer.xml index 666c7141a..97ba54e58 100644 --- a/Materials/dds/global-summer.xml +++ b/Materials/dds/global-summer.xml @@ -22,7 +22,6 @@ 4000.0 Trees/coniferous.dds 8 - 25.0 15.0 1 @@ -40,7 +39,6 @@ 4000.0 Trees/coniferous.dds 8 - 25.0 18.0 1 @@ -58,7 +56,6 @@ 4000.0 Trees/deciduous.dds 8 - 25.0 15.0 1 @@ -77,7 +74,6 @@ 4000.0 Trees/mixed.dds 8 - 25.0 15.0 1 @@ -95,7 +91,6 @@ 4000.0 Trees/coniferous.dds 8 - 20.0 15.0 1 @@ -112,7 +107,6 @@ 4000.0 Trees/coniferous.dds 8 - 15.0 8.0 1 @@ -164,7 +158,6 @@ 12000.0 Trees/mixed-shrub.dds 8 - 2.0 2.0 0.6 @@ -212,11 +205,9 @@ 30.0 0.6 0.2 - 10000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -253,11 +244,9 @@ 30.0 0.6 0.2 - 25000.0 Trees/mixed.dds 8 - 25.0 15.0 @@ -310,11 +299,9 @@ 0.1 0.0 4 - 5000.0 Trees/mixed.dds 8 - 25.0 15.0 @@ -546,7 +533,6 @@ 2000.0 Trees/mixed.dds 8 - 20.0 12.0 @@ -579,7 +565,6 @@ 2000.0 Trees/mixed.dds 8 - 20.0 12.0 @@ -620,7 +605,6 @@ 2000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -642,7 +626,6 @@ 500000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -682,7 +665,6 @@ 2000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -716,7 +698,6 @@ 5000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -741,7 +722,6 @@ 2000.0 Trees/mixed.dds 8 - 20.0 12.0 diff --git a/Materials/dds/global-winter.xml b/Materials/dds/global-winter.xml index 159c011c8..37d774f40 100644 --- a/Materials/dds/global-winter.xml +++ b/Materials/dds/global-winter.xml @@ -25,7 +25,6 @@ 4000.0 Trees/coniferous.png 8 - 25.0 15.0 1 @@ -44,7 +43,6 @@ 4000.0 Trees/deciduous.png 8 - 25.0 15.0 1 @@ -64,7 +62,6 @@ 4000.0 Trees/mixed.png 8 - 25.0 15.0 1 @@ -81,7 +78,6 @@ 4000.0 Trees/coniferous.png 8 - 20.0 15.0 1 @@ -97,7 +93,6 @@ 4000.0 Trees/coniferous.png 8 - 15.0 8.0 1 @@ -145,7 +140,6 @@ 8000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -186,11 +180,9 @@ 30.0 0.6 0.2 - 250000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -236,11 +228,9 @@ 0.1 0.0 4 - 5000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -451,7 +441,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -481,7 +470,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -510,7 +498,6 @@ 4000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -531,7 +518,6 @@ 150000.0 Trees/deciduous.dds 8 - 20.0 12.0 @@ -567,7 +553,6 @@ 500000.0 Trees/deciduous.png 8 - 20.0 12.0 @@ -600,7 +585,6 @@ 5000.0 Trees/deciduous.png 8 - 20.0 12.0 @@ -621,7 +605,6 @@ 4000.0 Trees/mixed.png 8 - 20.0 12.0 diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml index 473c3764b..2a8a67e19 100644 --- a/Materials/dds/materials.xml +++ b/Materials/dds/materials.xml @@ -3,20 +3,6 @@ - - - - - - 8000 - - - - - 10000 - - - diff --git a/Materials/dds/urban.xml b/Materials/dds/urban.xml index 6df525a79..79b9e4b39 100644 --- a/Materials/dds/urban.xml +++ b/Materials/dds/urban.xml @@ -44,11 +44,9 @@ 30.0 0.6 0.2 - 10000.0 Trees/mixed.png 8 - 25.0 15.0 diff --git a/Materials/default/global-summer.xml b/Materials/default/global-summer.xml index ffad53192..ee1bb0ae6 100644 --- a/Materials/default/global-summer.xml +++ b/Materials/default/global-summer.xml @@ -24,7 +24,6 @@ 4000.0 Trees/coniferous.png 8 - 25.0 15.0 1 @@ -44,7 +43,6 @@ 4000.0 Trees/coniferous.png 8 - 25.0 18.0 1 @@ -66,7 +64,6 @@ 4000.0 Trees/deciduous.png 8 - 25.0 15.0 1 @@ -87,7 +84,6 @@ 4000.0 Trees/mixed.png 8 - 25.0 15.0 1 @@ -105,7 +101,6 @@ 4000.0 Trees/coniferous.png 8 - 20.0 15.0 1 @@ -122,7 +117,6 @@ 4000.0 Trees/coniferous.png 8 - 15.0 8.0 1 @@ -175,7 +169,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -214,11 +207,9 @@ 30.0 0.6 0.2 - 250000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -263,11 +254,9 @@ 0.1 0.0 4 - 5000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -501,7 +490,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -532,7 +520,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -561,7 +548,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -582,7 +568,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -619,7 +604,6 @@ 150000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -652,7 +636,6 @@ 5000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -675,7 +658,6 @@ 4000.0 Trees/mixed.png 8 - 20.0 12.0 diff --git a/Materials/default/global-winter.xml b/Materials/default/global-winter.xml index 708cf71d9..1eebfa2ce 100644 --- a/Materials/default/global-winter.xml +++ b/Materials/default/global-winter.xml @@ -25,7 +25,6 @@ 4000.0 Trees/coniferous.png 8 - 25.0 15.0 1 @@ -46,7 +45,6 @@ 4000.0 Trees/deciduous.png 8 - 25.0 15.0 1 @@ -66,7 +64,6 @@ 4000.0 Trees/mixed.png 8 - 25.0 15.0 1 @@ -83,7 +80,6 @@ 4000.0 Trees/coniferous.png 8 - 20.0 15.0 1 @@ -99,7 +95,6 @@ 4000.0 Trees/coniferous.png 8 - 15.0 8.0 1 @@ -146,7 +141,6 @@ 8000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -185,11 +179,9 @@ 30.0 0.6 0.2 - 250000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -234,11 +226,9 @@ 0.1 0.0 4 - 5000.0 Trees/mixed.png 8 - 25.0 15.0 @@ -459,7 +449,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -489,7 +478,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -517,7 +505,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -538,7 +525,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -574,7 +560,6 @@ 150000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -607,7 +592,6 @@ 5000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -629,7 +613,6 @@ 4000.0 Trees/mixed.png 8 - 20.0 12.0 diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml index 6f54c11c4..e87bb4da3 100644 --- a/Materials/default/materials.xml +++ b/Materials/default/materials.xml @@ -3,20 +3,6 @@ - - - - - - 8000 - - - - - 10000 - - - diff --git a/Materials/regions/UAE.xml b/Materials/regions/UAE.xml index a9f99ed74..2f818c715 100644 --- a/Materials/regions/UAE.xml +++ b/Materials/regions/UAE.xml @@ -44,7 +44,6 @@ 25000.0 Trees/tropical-alt.png 8 - 12.0 7.0 @@ -128,7 +127,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -190,7 +188,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -226,7 +223,6 @@ 120000.0 Trees/deciduous-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/africa_desert.xml b/Materials/regions/africa_desert.xml index 1a74f4112..522debd78 100644 --- a/Materials/regions/africa_desert.xml +++ b/Materials/regions/africa_desert.xml @@ -252,7 +252,6 @@ 30000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -308,7 +307,6 @@ 3500.0 Trees/mixed-shrub.png 8 - 20.0 12.0 diff --git a/Materials/regions/africa_kilimanjaro.xml b/Materials/regions/africa_kilimanjaro.xml index 09241bd1b..000656640 100644 --- a/Materials/regions/africa_kilimanjaro.xml +++ b/Materials/regions/africa_kilimanjaro.xml @@ -52,7 +52,6 @@ 80000.0 Trees/savanna-trees.png 4 - 50.0 55.0 0.4 diff --git a/Materials/regions/africa_mediterranean.xml b/Materials/regions/africa_mediterranean.xml index 12c381bb6..3d82b60ef 100644 --- a/Materials/regions/africa_mediterranean.xml +++ b/Materials/regions/africa_mediterranean.xml @@ -151,7 +151,6 @@ 14000.0 Trees/tropical-alt.png 4 - 20.0 25.0 0.8 @@ -178,7 +177,6 @@ 40000.0 Trees/tropical-alt.png 4 - 20.0 25.0 0.4 @@ -214,7 +212,6 @@ 30000.0 Trees/mixed-shrub.png 4 - 10.0 15.0 0.4 @@ -272,7 +269,6 @@ 3500.0 Trees/mixed-shrub.png 8 - 20.0 12.0 diff --git a/Materials/regions/africa_rainforest.xml b/Materials/regions/africa_rainforest.xml index 60d4e4fef..4296c0f42 100644 --- a/Materials/regions/africa_rainforest.xml +++ b/Materials/regions/africa_rainforest.xml @@ -134,7 +134,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 35.0 30.0 1 @@ -160,7 +159,6 @@ 6000.0 Trees/tropical-alt2.png 8 - 25.0 30.0 1 @@ -201,7 +199,6 @@ 90000.0 Trees/tropical-alt2.png 4 - 25.0 30.0 0.4 diff --git a/Materials/regions/africa_savanna.xml b/Materials/regions/africa_savanna.xml index 843c366ca..949ec8c9d 100644 --- a/Materials/regions/africa_savanna.xml +++ b/Materials/regions/africa_savanna.xml @@ -41,7 +41,6 @@ 8000.0 Trees/savanna-trees.png 4 - 20.0 25.0 0.8 @@ -72,7 +71,6 @@ 80000.0 Trees/savanna-trees.png 4 - 20.0 25.0 0.4 @@ -106,7 +104,6 @@ 85000.0 Trees/savanna-trees.png 4 - 20.0 25.0 0.4 @@ -133,7 +130,6 @@ 90000.0 Trees/savanna-trees.png 4 - 20.0 25.0 0.4 @@ -177,7 +173,6 @@ 250000.0 Trees/mixed-shrub.png 8 - 15.0 10.0 diff --git a/Materials/regions/alaska.xml b/Materials/regions/alaska.xml index 218095686..44280a63a 100644 --- a/Materials/regions/alaska.xml +++ b/Materials/regions/alaska.xml @@ -30,7 +30,6 @@ 4000.0 Trees/mixed-alt.png 8 - 25.0 15.0 1 @@ -58,7 +57,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1500.0 @@ -100,7 +98,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -126,7 +123,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 diff --git a/Materials/regions/ascension.xml b/Materials/regions/ascension.xml index fb67f3669..da87d4c84 100644 --- a/Materials/regions/ascension.xml +++ b/Materials/regions/ascension.xml @@ -28,7 +28,6 @@ 50000.0 Trees/tropical-alt.png 8 - 20.0 12.0 2.5 diff --git a/Materials/regions/asia.xml b/Materials/regions/asia.xml index d1a3435f5..90abe7838 100644 --- a/Materials/regions/asia.xml +++ b/Materials/regions/asia.xml @@ -38,7 +38,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/brazil_amazon_forest.xml b/Materials/regions/brazil_amazon_forest.xml index 6bff23712..d0fc74b71 100644 --- a/Materials/regions/brazil_amazon_forest.xml +++ b/Materials/regions/brazil_amazon_forest.xml @@ -155,7 +155,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 35.0 30.0 1 @@ -190,7 +189,6 @@ 12000.0 Trees/tropical-alt2.png 8 - 25.0 30.0 1 @@ -235,7 +233,6 @@ 25000.0 Trees/tropical-alt2.png 8 - 20.0 25.0 @@ -279,7 +276,6 @@ 25000.0 Trees/tropical-alt2.png 8 - 20.0 25.0 diff --git a/Materials/regions/brazil_brasilia.xml b/Materials/regions/brazil_brasilia.xml index 7014f57b7..ce72014fc 100644 --- a/Materials/regions/brazil_brasilia.xml +++ b/Materials/regions/brazil_brasilia.xml @@ -46,7 +46,6 @@ 250000.0 Trees/mixed-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/brazil_caatinga.xml b/Materials/regions/brazil_caatinga.xml index 8816ccc18..0c524a63b 100644 --- a/Materials/regions/brazil_caatinga.xml +++ b/Materials/regions/brazil_caatinga.xml @@ -105,7 +105,6 @@ 20000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 1 @@ -130,7 +129,6 @@ 300000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 1 @@ -158,7 +156,6 @@ 65000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 1 @@ -192,7 +189,6 @@ 50000.0 Trees/caatinga-trees.png 4 - 10.0 10.0 1 @@ -219,7 +215,6 @@ 1500000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 0.7 @@ -247,7 +242,6 @@ 120000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 0.7 @@ -275,7 +269,6 @@ 7000.0 Trees/tropical-alt2.png 8 - 25.0 18.0 1 diff --git a/Materials/regions/brazil_cerrado.xml b/Materials/regions/brazil_cerrado.xml index 1890d5bf4..eec694376 100644 --- a/Materials/regions/brazil_cerrado.xml +++ b/Materials/regions/brazil_cerrado.xml @@ -27,7 +27,6 @@ 6000.0 Trees/cerrado-trees.png 4 - 20.0 15.0 1 @@ -48,7 +47,6 @@ 4000.0 Trees/cerrado-trees.png 4 - 10.0 10.0 1 @@ -74,7 +72,6 @@ 4000.0 Trees/cerrado-trees.png 4 - 10.0 10.0 1 @@ -98,7 +95,6 @@ 15000.0 Trees/cerrado-trees.png 4 - 10.0 10.0 0.7 @@ -117,7 +113,6 @@ 3500.0 Trees/cerrado-trees.png 4 - 10.0 10.0 0.7 diff --git a/Materials/regions/brazil_chapada_diamantina.xml b/Materials/regions/brazil_chapada_diamantina.xml index af0c41945..a05765b8c 100644 --- a/Materials/regions/brazil_chapada_diamantina.xml +++ b/Materials/regions/brazil_chapada_diamantina.xml @@ -30,7 +30,6 @@ 5000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 1 @@ -58,7 +57,6 @@ 10000.0 Trees/caatinga-trees.png 4 - 8.0 8.0 1 diff --git a/Materials/regions/brazil_manaus.xml b/Materials/regions/brazil_manaus.xml index b16fd8613..28c4215e0 100644 --- a/Materials/regions/brazil_manaus.xml +++ b/Materials/regions/brazil_manaus.xml @@ -43,7 +43,6 @@ 250000.0 Trees/mixed-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/brazil_mata_atlantica.xml b/Materials/regions/brazil_mata_atlantica.xml index f4e4a4c8e..0ed4669dd 100644 --- a/Materials/regions/brazil_mata_atlantica.xml +++ b/Materials/regions/brazil_mata_atlantica.xml @@ -130,7 +130,6 @@ 7000.0 Trees/tropical-alt2.png 8 - 25.0 18.0 1 @@ -165,7 +164,6 @@ 10000.0 Trees/tropical-alt2.png 8 - 20.0 18.0 1 @@ -190,7 +188,6 @@ 7000.0 Trees/tropical-alt2.png 8 - 25.0 30.0 1 diff --git a/Materials/regions/brazil_pampas.xml b/Materials/regions/brazil_pampas.xml index 9144ae77a..bedcdd400 100644 --- a/Materials/regions/brazil_pampas.xml +++ b/Materials/regions/brazil_pampas.xml @@ -104,7 +104,6 @@ 6000.0 Trees/tropical.png 8 - 25.0 20.0 1 @@ -134,7 +133,6 @@ 16000.0 Trees/tropical.png 8 - 20.0 20.0 1 @@ -168,7 +166,6 @@ 4000.0 Trees/tropical.png 8 - 10.0 10.0 1 @@ -186,7 +183,6 @@ 15000.0 Trees/tropical.png 8 - 10.0 10.0 0.7 @@ -205,7 +201,6 @@ 3500.0 Trees/tropical.png 8 - 10.0 10.0 0.7 diff --git a/Materials/regions/brazil_pantanal.xml b/Materials/regions/brazil_pantanal.xml index cfe41957b..781e2b441 100644 --- a/Materials/regions/brazil_pantanal.xml +++ b/Materials/regions/brazil_pantanal.xml @@ -132,7 +132,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 20.0 15.0 1 @@ -162,7 +161,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 15.0 20.0 1 diff --git a/Materials/regions/brazil_southern_cerrado.xml b/Materials/regions/brazil_southern_cerrado.xml index 0fe09b2c4..c327895d9 100644 --- a/Materials/regions/brazil_southern_cerrado.xml +++ b/Materials/regions/brazil_southern_cerrado.xml @@ -28,7 +28,6 @@ 6000.0 Trees/tropical-alt2.png 8 - 20.0 15.0 1 @@ -49,7 +48,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 10.0 10.0 1 @@ -75,7 +73,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 10.0 10.0 1 @@ -99,7 +96,6 @@ 15000.0 Trees/tropical-alt2.png 8 - 10.0 10.0 0.7 @@ -118,7 +114,6 @@ 3500.0 Trees/tropical-alt2.png 8 - 10.0 10.0 0.7 diff --git a/Materials/regions/california.xml b/Materials/regions/california.xml index fa1f24021..10d365372 100644 --- a/Materials/regions/california.xml +++ b/Materials/regions/california.xml @@ -194,7 +194,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -215,7 +214,6 @@ 1500000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -246,7 +244,6 @@ 1500000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -269,7 +266,6 @@ 120000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -300,7 +296,6 @@ 7000.0 Trees/deciduous-alt.png 8 - 25.0 18.0 1 @@ -374,7 +369,6 @@ 5000.0 Trees/deciduous-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/caribbean-common.xml b/Materials/regions/caribbean-common.xml index 092e26141..22fb905ec 100644 --- a/Materials/regions/caribbean-common.xml +++ b/Materials/regions/caribbean-common.xml @@ -17,7 +17,6 @@ Trees/tropical-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/caribbean-farm-buildings.xml b/Materials/regions/caribbean-farm-buildings.xml index 7212b5e29..6cb1f5b52 100644 --- a/Materials/regions/caribbean-farm-buildings.xml +++ b/Materials/regions/caribbean-farm-buildings.xml @@ -1,7 +1,6 @@ - 5000 Models/Buildings/red-barn.ac Models/Buildings/cow-stable.ac diff --git a/Materials/regions/corse.xml b/Materials/regions/corse.xml index 3ddfa958b..1e7ce5947 100644 --- a/Materials/regions/corse.xml +++ b/Materials/regions/corse.xml @@ -112,7 +112,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -153,7 +152,6 @@ 16000.0 Trees/deciduous-alt.png 8 - 20.0 12.0 0.6 diff --git a/Materials/regions/europe-winter.xml b/Materials/regions/europe-winter.xml index fa5ab49fc..3af7a0305 100644 --- a/Materials/regions/europe-winter.xml +++ b/Materials/regions/europe-winter.xml @@ -56,7 +56,6 @@ 250000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -90,7 +89,6 @@ 1000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 diff --git a/Materials/regions/europe.xml b/Materials/regions/europe.xml index 83a95b62a..d8b98bc56 100644 --- a/Materials/regions/europe.xml +++ b/Materials/regions/europe.xml @@ -90,7 +90,6 @@ Trees/mixed-alt.png 8 - 20.0 12.0 @@ -128,7 +127,6 @@ 250000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -162,7 +160,6 @@ 1000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -223,7 +220,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -250,7 +246,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -269,7 +264,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -289,7 +283,6 @@ 4000.0 Trees/mixed-alt.png 8 - 25.0 15.0 1 diff --git a/Materials/regions/florida.xml b/Materials/regions/florida.xml index a8f9810d9..7b5792ca5 100644 --- a/Materials/regions/florida.xml +++ b/Materials/regions/florida.xml @@ -44,7 +44,6 @@ 150000.0 Trees/tropical.png 8 - 20.0 12.0 @@ -78,7 +77,6 @@ 10000.0 Trees/tropical.png 8 - 20.0 12.0 @@ -98,7 +96,6 @@ 4000.0 Trees/tropical.png 8 - 25.0 18.0 1 diff --git a/Materials/regions/global-summer.xml b/Materials/regions/global-summer.xml index 273eb42e8..e6814f924 100644 --- a/Materials/regions/global-summer.xml +++ b/Materials/regions/global-summer.xml @@ -76,7 +76,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 15.0 1 @@ -96,7 +95,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -115,7 +113,6 @@ 4000.0 Trees/mixed-alt.png 8 - 25.0 15.0 1 @@ -135,7 +132,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 @@ -153,7 +149,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 20.0 15.0 1 @@ -170,7 +165,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 15.0 8.0 1 @@ -237,7 +231,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -280,7 +273,6 @@ 250000.0 Trees/mixed-alt.png 8 - 25.0 15.0 @@ -360,7 +352,6 @@ 25000.0 Trees/deciduous-alt.png 8 - 12.0 7.0 @@ -613,7 +604,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -645,7 +635,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -675,7 +664,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -696,7 +684,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -734,7 +721,6 @@ 150000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -770,7 +756,6 @@ 150000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -803,7 +788,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -826,7 +810,6 @@ 4000.0 Trees/mixed-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/global-winter.xml b/Materials/regions/global-winter.xml index 6b2377b03..0c7344b37 100644 --- a/Materials/regions/global-winter.xml +++ b/Materials/regions/global-winter.xml @@ -27,7 +27,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 15.0 1 @@ -48,7 +47,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -68,7 +66,6 @@ 4000.0 Trees/mixed-alt.png 8 - 25.0 15.0 1 @@ -85,7 +82,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 20.0 15.0 1 @@ -101,7 +97,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 15.0 8.0 1 @@ -148,7 +143,6 @@ 8000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -190,7 +184,6 @@ 250000.0 Trees/mixed-alt.png 8 - 25.0 15.0 @@ -266,7 +259,6 @@ 5000.0 Trees/mixed-alt.png 8 - 25.0 15.0 @@ -566,7 +558,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -596,7 +587,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -624,7 +614,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -645,7 +634,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -681,7 +669,6 @@ 150000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -714,7 +701,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -736,7 +722,6 @@ 4000.0 Trees/mixed-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/hawaii.xml b/Materials/regions/hawaii.xml index 72179baf0..339b345ad 100644 --- a/Materials/regions/hawaii.xml +++ b/Materials/regions/hawaii.xml @@ -33,7 +33,6 @@ 4000.0 Trees/tropical.png 8 - 25.0 15.0 1 @@ -94,7 +93,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -149,7 +147,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -187,7 +184,6 @@ 5000.0 Trees/tropical.png 8 - 25.0 15.0 @@ -251,7 +247,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/iceland.xml b/Materials/regions/iceland.xml index 7058ca55a..5afa0b5de 100644 --- a/Materials/regions/iceland.xml +++ b/Materials/regions/iceland.xml @@ -60,7 +60,6 @@ 1 @@ -124,7 +123,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 diff --git a/Materials/regions/indonesia.xml b/Materials/regions/indonesia.xml index 4575c0a55..830878808 100644 --- a/Materials/regions/indonesia.xml +++ b/Materials/regions/indonesia.xml @@ -30,7 +30,6 @@ 4000.0 Trees/tropical-alt.png 8 - 25.0 15.0 1 @@ -56,7 +55,6 @@ 25000.0 Trees/tropical-alt.png 8 - 25.0 15.0 @@ -109,7 +107,6 @@ 120000.0 Trees/tropical-alt.png 8 - 20.0 12.0 @@ -139,7 +136,6 @@ 80000.0 Trees/tropical-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/ireland.xml b/Materials/regions/ireland.xml index 8e1f3af88..5da18b4aa 100644 --- a/Materials/regions/ireland.xml +++ b/Materials/regions/ireland.xml @@ -69,7 +69,6 @@ 2000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -147,7 +146,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -195,7 +193,6 @@ 1000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 diff --git a/Materials/regions/latin_american_cities.xml b/Materials/regions/latin_american_cities.xml index 2ec79c679..86f99903c 100644 --- a/Materials/regions/latin_american_cities.xml +++ b/Materials/regions/latin_american_cities.xml @@ -90,7 +90,6 @@ 250000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 @@ -122,7 +121,6 @@ 5000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/madagascar.xml b/Materials/regions/madagascar.xml index 56eca792c..b9b218e5d 100644 --- a/Materials/regions/madagascar.xml +++ b/Materials/regions/madagascar.xml @@ -31,7 +31,6 @@ 4000.0 Trees/tropical.png 8 - 35.0 30.0 1 @@ -117,7 +116,6 @@ 50000.0 Trees/tropical.png 8 - 20.0 12.0 @@ -146,7 +144,6 @@ 1000.0 Trees/tropical-alt.png 8 - 15.0 10.0 @@ -169,7 +166,6 @@ 4000.0 Trees/tropical.png 8 - 25.0 15.0 1 diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index da61035a1..dfaf0ebb1 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -3,20 +3,6 @@ - - - - - - 8000 - - - - - 10000 - - - diff --git a/Materials/regions/mediterranean_cities.xml b/Materials/regions/mediterranean_cities.xml index b265fe884..56e505847 100644 --- a/Materials/regions/mediterranean_cities.xml +++ b/Materials/regions/mediterranean_cities.xml @@ -63,7 +63,6 @@ 250000.0 Trees/mixed-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/mexico.xml b/Materials/regions/mexico.xml index 202ff9520..742bfdcfe 100644 --- a/Materials/regions/mexico.xml +++ b/Materials/regions/mexico.xml @@ -191,7 +191,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -217,7 +216,6 @@ 1500000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -242,7 +240,6 @@ 1500000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -265,7 +262,6 @@ 120000.0 Trees/deciduous-alt.png 8 - 8.0 8.0 0.7 @@ -296,7 +292,6 @@ 7000.0 Trees/deciduous-alt.png 8 - 25.0 18.0 1 @@ -370,7 +365,6 @@ 5000.0 Trees/deciduous-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/middle_east.xml b/Materials/regions/middle_east.xml index ef35595ee..03d835589 100644 --- a/Materials/regions/middle_east.xml +++ b/Materials/regions/middle_east.xml @@ -81,7 +81,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -143,7 +142,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -179,7 +177,6 @@ 120000.0 Trees/deciduous-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/middle_east_large_cities.xml b/Materials/regions/middle_east_large_cities.xml index 8ef9c6b9f..1df1c9b9c 100644 --- a/Materials/regions/middle_east_large_cities.xml +++ b/Materials/regions/middle_east_large_cities.xml @@ -94,7 +94,6 @@ 250000.0 Trees/tropical-alt.png 8 - 25.0 15.0 diff --git a/Materials/regions/north_atlantic_islands.xml b/Materials/regions/north_atlantic_islands.xml index b976e500d..43f37795c 100644 --- a/Materials/regions/north_atlantic_islands.xml +++ b/Materials/regions/north_atlantic_islands.xml @@ -142,7 +142,6 @@ 5000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -191,7 +190,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 diff --git a/Materials/regions/oahu.xml b/Materials/regions/oahu.xml index 4a1363e25..3d1cf40b7 100644 --- a/Materials/regions/oahu.xml +++ b/Materials/regions/oahu.xml @@ -52,7 +52,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 diff --git a/Materials/regions/scandinavia.xml b/Materials/regions/scandinavia.xml index ad92714f7..a1539313e 100644 --- a/Materials/regions/scandinavia.xml +++ b/Materials/regions/scandinavia.xml @@ -39,7 +39,6 @@ 8000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -64,7 +63,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 @@ -132,7 +130,6 @@ 48000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 0.6 @@ -166,7 +163,6 @@ 30000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 0.8 @@ -200,7 +196,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 diff --git a/Materials/regions/sierras.xml b/Materials/regions/sierras.xml index e598ae1de..14bb7d8e8 100644 --- a/Materials/regions/sierras.xml +++ b/Materials/regions/sierras.xml @@ -49,7 +49,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 diff --git a/Materials/regions/south_africa.xml b/Materials/regions/south_africa.xml index c403216a2..143829d9c 100644 --- a/Materials/regions/south_africa.xml +++ b/Materials/regions/south_africa.xml @@ -59,7 +59,6 @@ 4000.0 Trees/tropical.png 8 - 25.0 15.0 1 @@ -84,7 +83,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 @@ -118,7 +116,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -150,7 +147,6 @@ 10000.0 Trees/mixed.png 8 - 20.0 12.0 @@ -189,7 +185,6 @@ 150000.0 Trees/mixed.png 8 - 20.0 12.0 diff --git a/Materials/regions/southeast_asia.xml b/Materials/regions/southeast_asia.xml index 9c0ddea6f..da6fbefa5 100644 --- a/Materials/regions/southeast_asia.xml +++ b/Materials/regions/southeast_asia.xml @@ -107,7 +107,6 @@ 4000.0 Trees/tropical-alt.png 8 - 25.0 15.0 1 @@ -135,7 +134,6 @@ 25000.0 Trees/tropical.png 8 - 25.0 15.0 @@ -188,7 +186,6 @@ 120000.0 Trees/tropical.png 8 - 20.0 12.0 @@ -220,7 +217,6 @@ 80000.0 Trees/tropical.png 8 - 20.0 12.0 diff --git a/Materials/regions/southern_europe.xml b/Materials/regions/southern_europe.xml index 56eaf6c7b..4ed145412 100644 --- a/Materials/regions/southern_europe.xml +++ b/Materials/regions/southern_europe.xml @@ -184,7 +184,6 @@ 14000.0 Trees/tropical-alt.png 8 - 20.0 15.0 0.8 @@ -212,7 +211,6 @@ 40000.0 Trees/tropical-alt.png 8 - 20.0 15.0 0.4 @@ -249,7 +247,6 @@ 30000.0 Trees/mixed-shrub.png 4 - 10.0 15.0 0.4 @@ -307,7 +304,6 @@ 3500.0 Trees/mixed-shrub.png 8 - 20.0 12.0 @@ -367,7 +363,6 @@ 250000.0 Trees/mixed-shrub.png 8 - 15.0 10.0 @@ -401,7 +396,6 @@ 1000.0 Trees/mixed-shrub.png 8 - 15.0 10.0 diff --git a/Materials/regions/tropical_south_america.xml b/Materials/regions/tropical_south_america.xml index 48d573939..101b47856 100644 --- a/Materials/regions/tropical_south_america.xml +++ b/Materials/regions/tropical_south_america.xml @@ -143,7 +143,6 @@ 4000.0 Trees/tropical-alt2.png 8 - 35.0 30.0 1 @@ -178,7 +177,6 @@ 12000.0 Trees/tropical-alt2.png 8 - 25.0 30.0 1 @@ -223,7 +221,6 @@ 25000.0 Trees/tropical-alt2.png 8 - 20.0 25.0 @@ -267,7 +264,6 @@ 25000.0 Trees/tropical-alt2.png 8 - 20.0 25.0 diff --git a/Materials/regions/united_kingdom.xml b/Materials/regions/united_kingdom.xml index ca9b8c07e..1f94acc81 100644 --- a/Materials/regions/united_kingdom.xml +++ b/Materials/regions/united_kingdom.xml @@ -51,7 +51,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -75,7 +74,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -136,7 +134,6 @@ 2000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -174,7 +171,6 @@ 2000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -218,7 +214,6 @@ Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -277,7 +272,6 @@ 5000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -300,7 +294,6 @@ 2000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -334,7 +327,6 @@ 25000.0 Trees/deciduous-alt.png 8 - 15.0 10.0 @@ -364,7 +356,6 @@ 1500.0 Trees/deciduous-alt.png 8 - 15.0 10.0 diff --git a/Materials/regions/us_southwest.xml b/Materials/regions/us_southwest.xml index 81428d0ef..a05efdd6c 100644 --- a/Materials/regions/us_southwest.xml +++ b/Materials/regions/us_southwest.xml @@ -121,7 +121,6 @@ 12000.0 Trees/mixed-shrub.png 8 - 2.0 2.0 0.6 @@ -163,7 +162,6 @@ 150000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -184,7 +182,6 @@ 4000.0 Trees/deciduous-alt.png 8 - 25.0 15.0 1 @@ -209,7 +206,6 @@ 4000.0 Trees/coniferous-alt.png 8 - 25.0 18.0 1 @@ -241,7 +237,6 @@ 10000.0 Trees/mixed-alt.png 8 - 20.0 12.0 @@ -262,7 +257,6 @@ 4000.0 Trees/mixed-alt.png 8 - 25.0 15.0 1 diff --git a/gui/dialogs/static-lod.xml b/gui/dialogs/static-lod.xml index fd490ce48..e4acd6503 100644 --- a/gui/dialogs/static-lod.xml +++ b/gui/dialogs/static-lod.xml @@ -7,6 +7,15 @@ var modePixel = (getprop("/sim/rendering/static-lod/ai-range-mode-pixel") == 1); setprop( "/sim/gui/dialogs/static-lod/mode/pixel", modePixel ); setprop( "/sim/gui/dialogs/static-lod/mode/distance", !modePixel ); + + var reload_props = [ + "/sim/rendering/static-lod/rough", + "/sim/rendering/static-lod/bare"]; + + var reload_vals = {}; + foreach (var p; reload_props) { + reload_vals[p] = getprop(p); + } ]]> @@ -181,6 +190,23 @@ dialog-apply + + nasal + + dialog-close @@ -210,4 +236,10 @@ + + + + + +