From c9428e0bebb8d7e21083766132b52df7e7c382f8 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Tue, 2 Feb 2021 15:56:07 +0000 Subject: [PATCH] OSM2City: Add Details and Trees directories Update defaults.xml and Rendering dialog to include Details and Trees directories, for use by osm2city --- defaults.xml | 18 +++++++--- gui/dialogs/rendering.xml | 69 ++++++++++++++++++++++++++++++++------- 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/defaults.xml b/defaults.xml index fdd022a7e..d46e6c4ae 100644 --- a/defaults.xml +++ b/defaults.xml @@ -300,26 +300,36 @@ Started September 2000 by David Megginson, david@megginson.com 1 - + Pylons false - + Roads false - + Buildings false - + Objects true + + Details + false + + + + Trees + false + + Terrain diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml index 5a68101a5..7f9432210 100644 --- a/gui/dialogs/rendering.xml +++ b/gui/dialogs/rendering.xml @@ -649,7 +649,8 @@ 200 /sim/gui/dialogs/rendering/pylons Disabled - Enabled + Basic + Detailed dialog-apply pylons @@ -658,10 +659,15 @@ nasal @@ -777,7 +783,7 @@ 4 0 left - + 4 @@ -848,11 +854,44 @@ 5 0 left - + 5 1 + osm2city-trees + 200 + /sim/gui/dialogs/rendering/osm2city-trees + Disabled + Enabled + + dialog-apply + osm2city-trees + + + nasal + + + + + + + + 6 + 0 + left + + + + 6 + 1 vegetation-shadows 200 /sim/gui/dialogs/rendering/vegetation-shadows @@ -876,14 +915,14 @@ - 6 + 7 0 left - 6 + 7 1 placed-objects 200 @@ -1095,15 +1134,17 @@ # Mapping from underlying properties to those used by the GUI. - if (getScenerySuffix("Pylons")) { - setprop("/sim/gui/dialogs/rendering/pylons", "Enabled"); - } else { + if (getScenerySuffix("Details")) { + setprop("/sim/gui/dialogs/rendering/pylons", "Detailed"); + } else if (getScenerySuffix("Pylons")) { + setprop("/sim/gui/dialogs/rendering/pylons", "Basic"); + } else { setprop("/sim/gui/dialogs/rendering/pylons", "Disabled"); } if (getScenerySuffix("Roads")) { setprop("/sim/gui/dialogs/rendering/roads", "Enabled"); - } else { + } else { setprop("/sim/gui/dialogs/rendering/roads", "Disabled"); } @@ -1149,6 +1190,12 @@ setprop("/sim/gui/dialogs/rendering/random-vegetation", "Disabled"); } + if (getScenerySuffix("Trees")) { + setprop("/sim/gui/dialogs/rendering/osm2city-trees", "Enabled"); + } else { + setprop("/sim/gui/dialogs/rendering/osm2city-trees", "Disabled"); + } + if (getprop("/sim/rendering/random-vegetation-shadows")) { setprop("/sim/gui/dialogs/rendering/vegetation-shadows", "Enabled"); } else {