From 4ad071b1c86351fb4d68ccdf78d0a2ea323d0df4 Mon Sep 17 00:00:00 2001 From: Gijs de Rooy <gijsrooy@hotmail.com> Date: Tue, 19 Feb 2013 12:12:09 +0100 Subject: [PATCH 1/3] Add 2D panel hide options to view dialog. Fix indentation. --- gui/dialogs/view.xml | 72 ++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml index cfb398e68..cf503cc1f 100644 --- a/gui/dialogs/view.xml +++ b/gui/dialogs/view.xml @@ -1,11 +1,8 @@ <?xml version="1.0"?> <PropertyList> - <name>view</name> - - - - + <name>view</name> + <nasal> <open> @@ -53,21 +50,19 @@ } </open> </nasal> - - <modal>false</modal> - <layout>vbox</layout> - - + + <modal>false</modal> + <layout>vbox</layout> <group> <layout>hbox</layout> - <empty><stretch>1</stretch></empty> + <empty><stretch>1</stretch></empty> <text> <label>View Options</label> </text> - <empty><stretch>1</stretch></empty> + <empty><stretch>1</stretch></empty> <button> <pref-width>16</pref-width> @@ -169,7 +164,31 @@ <command>dialog-apply</command> </binding> </checkbox> - + + <checkbox> + <halign>left</halign> + <label>Hide 2D panel in non-centered view</label> + <property>/sim/panel/hide-nonzero-heading-offset</property> + <enable> + <property>/sim/panel/visibility</property> + </enable> + <binding> + <command>dialog-apply</command> + </binding> + </checkbox> + + <checkbox> + <halign>left</halign> + <label>Hide 2D panel in non-cockpit view</label> + <property>/sim/panel/hide-nonzero-view</property> + <enable> + <property>/sim/panel/visibility</property> + </enable> + <binding> + <command>dialog-apply</command> + </binding> + </checkbox> + <checkbox> <halign>left</halign> <label>Autohide menubar</label> @@ -181,6 +200,7 @@ <group> <layout>hbox</layout> + <halign>left</halign> <padding>0</padding> <checkbox> @@ -212,19 +232,19 @@ </group> </group> - - <hrule/> + <hrule/> + + <button> + <legend>Close</legend> + <default>true</default> + <key>Esc</key> + <binding> + <command>dialog-apply</command> + </binding> + <binding> + <command>dialog-close</command> + </binding> + </button> - <button> - <legend>Close</legend> - <default>true</default> - <key>Esc</key> - <binding> - <command>dialog-apply</command> - </binding> - <binding> - <command>dialog-close</command> - </binding> - </button> </PropertyList> From e9dd79dce17e2ab73bd4af597d8eeeb1c8ba7280 Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Tue, 19 Feb 2013 20:31:00 +0000 Subject: [PATCH 2/3] Update Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net> --- Materials/regions/materials.xml | 137 ++++++++++++++------------------ 1 file changed, 58 insertions(+), 79 deletions(-) diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index 0cf9f11ca..f4155237b 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -1675,9 +1675,6 @@ <texture>Terrain/shrub1.png</texture> <texture>Terrain/shrub2.png</texture> <texture>Terrain/shrub3.png</texture> - <!--<texture>Terrain/shrub1.dds</texture> - <texture>Terrain/shrub2.dds</texture> - <texture>Terrain/shrub3.dds</texture>--> <xsize>2000</xsize> <ysize>2000</ysize> <diffuse> @@ -1695,7 +1692,7 @@ <shininess>1.2</shininess> <light-coverage>20000000.0</light-coverage> <wood-coverage>12000.0</wood-coverage> - <tree-texture>Trees/mixed-shrub.dds</tree-texture> + <tree-texture>Trees/mixed-shrub.png</tree-texture> <tree-varieties>8</tree-varieties> <tree-range-m alias="/params/forest/tree-range-m"/> <tree-height-m>2.0</tree-height-m> @@ -1737,7 +1734,6 @@ </condition> <effect>Effects/forest</effect> <name>Marsh</name> - <name>Littoral</name> <name>FloodLand</name> <name>SaltMarsh</name> <name>HerbWetlandCover</name> @@ -1796,9 +1792,10 @@ </equals> </condition> <!--<effect>Effects/transition-base-dirt</effect>--> - <name>MixedCropPastureCover</name> + <!--<name>MixedCropPastureCover</name>--> <name>MixedCrop</name> <name>ComplexCrop</name> + <name>IrrCrop</name> <name>Default</name> <texture>Terrain/countryside1.green.png</texture> <texture>Terrain/countryside2.green.png</texture> @@ -1825,8 +1822,13 @@ <tree-width-m>10.0</tree-width-m> </material> - <material include="Materials/regions/united-kingdom.xml"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> <effect>Effects/cropgrass</effect> <name>CropGrassCover</name> <name>CropGrass</name> @@ -1863,6 +1865,54 @@ <tree-width-m>10.0</tree-width-m> </material> + <material include="Materials/regions/united-kingdom.xml"> + <effect>Effects/crop</effect> + <name>MixedCropPastureCover</name> + <name>IrrCropPastureCover</name> + <name>ComplexCrop</name> + <texture>Terrain/irrcrop-europe.png</texture> + <object-mask>Terrain/irrcrop-europe.mask.png</object-mask> + <xsize>2000</xsize> + <ysize>2000</ysize> + <light-coverage>2000000.0</light-coverage> + <solid>1</solid> + <friction-factor>0.9</friction-factor> + <rolling-friction>0.1</rolling-friction> + <bumpiness>0.7</bumpiness> + <load-resistance>1e30</load-resistance> + <object-group include="Materials/base/farm-buildings.xml"/> + <wood-coverage>5000.0</wood-coverage> + <tree-texture>Trees/deciduous-summer.png</tree-texture> + <tree-varieties>8</tree-varieties> + <tree-range-m alias="/params/forest/tree-range-m"/> + <tree-height-m>15.0</tree-height-m> + <tree-width-m>10.0</tree-width-m> + </material> + + <material include="Materials/regions/united-kingdom.xml"> + <effect>Effects/crop</effect> + <name>Orchard</name> + <name>Vineyard</name> + <texture>Terrain/irrcrop-europe.png</texture> + <object-mask>Terrain/irrcrop-europe.mask.png</object-mask> + <xsize>2000</xsize> + <ysize>2000</ysize> + <light-coverage>2000000.0</light-coverage> + <solid>1</solid> + <friction-factor>0.9</friction-factor> + <rolling-friction>0.3</rolling-friction> + <bumpiness>0.6</bumpiness> + <load-resistance>1e30</load-resistance> + <object-group include="Materials/base/farm-buildings.xml"/> + <wood-coverage>5000.0</wood-coverage> + <tree-texture>Trees/deciduous-summer.png</tree-texture> + <tree-varieties>8</tree-varieties> + <tree-range-m alias="/params/forest/tree-range-m"/> + <tree-height-m>15.0</tree-height-m> + <tree-width-m>10.0</tree-width-m> + </material> + + <material include="Materials/regions/united-kingdom.xml"> <name>BuiltUpCover</name> <name>Urban</name> @@ -1922,25 +1972,6 @@ <tree-width-m>10.0</tree-width-m> </material> - <material include="Materials/regions/united-kingdom.xml"> - <name>Marsh</name> - <name>FloodLand</name> - <name>SaltMarsh</name> - <name>HerbWetlandCover</name> - <name>WoodedWetlandCover</name> - <texture>Terrain/marsh2a.png</texture> - <texture>Terrain/marsh3a.png</texture> - <texture>Terrain/marsh4a.png</texture> - <xsize>2000</xsize> - <ysize>2000</ysize> - <solid>1</solid> - <light-coverage>40000000.0</light-coverage> - <friction-factor>0.8</friction-factor> - <rolling-friction>0.3</rolling-friction> - <bumpiness>0.2</bumpiness> - <load-resistance>1e30</load-resistance> - </material> - <material include="Materials/regions/united-kingdom.xml"> <name>Littoral</name> <texture>Terrain/tidal.png</texture> @@ -1954,61 +1985,9 @@ <load-resistance>1e30</load-resistance> </material> - <material include="Materials/regions/united-kingdom.xml"> - <effect>Effects/crop</effect> - <name>MixedCropPastureCover</name> - <name>MixedCrop</name> - <name>ComplexCrop</name> - <texture>Terrain/irrcrop-europe.png</texture> - <object-mask>Terrain/irrcrop-europe.mask.png</object-mask> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>2000000.0</light-coverage> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.7</bumpiness> - <load-resistance>1e30</load-resistance> - <object-group include="Materials/base/farm-buildings.xml"/> - <wood-coverage>5000.0</wood-coverage> - <tree-texture>Trees/deciduous-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>15.0</tree-height-m> - <tree-width-m>10.0</tree-width-m> - </material> - - <material include="Materials/regions/united-kingdom.xml"> - <effect>Effects/crop</effect> - <name>IrrCropPastureCover</name> - <name>IrrCrop</name> - <name>Orchard</name> - <name>Olives</name> - <name>Vineyard</name> - <name>Rice</name> - <texture>Terrain/irrcrop-europe.png</texture> - <object-mask>Terrain/irrcrop-europe.mask.png</object-mask> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>2000000.0</light-coverage> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.3</rolling-friction> - <bumpiness>0.6</bumpiness> - <load-resistance>1e30</load-resistance> - <object-group include="Materials/base/farm-buildings.xml"/> - <wood-coverage>5000.0</wood-coverage> - <tree-texture>Trees/deciduous-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>15.0</tree-height-m> - <tree-width-m>10.0</tree-width-m> - </material> - <material include="Materials/regions/united-kingdom.xml"> <name>Dirt</name> <effect>Effects/transition-base-dirt</effect> - <!--<effect>Effects/transition-base-grass-inverse</effect>--> <texture>Terrain/mud.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> @@ -2019,7 +1998,7 @@ <bumpiness>0.1</bumpiness> </material> - <!-- REGIONAL DEFINITIONS - ASIA --> + <!-- REGIONAL DEFINITIONS - ASIA --> <!-- Regional Asian irrigated crops --> <material> From b1bff450fb2727fb65bdda689bfd2e56339145cf Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Wed, 20 Feb 2013 09:42:47 +0000 Subject: [PATCH 3/3] Separate out UK grass-cover Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net> --- Materials/regions/materials.xml | 42 ++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index f4155237b..3a6d944f0 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -1830,6 +1830,7 @@ </equals> </condition> <effect>Effects/cropgrass</effect> + <!--<name>GrassCover</name>--> <name>CropGrassCover</name> <name>CropGrass</name> <name>Grassland</name> @@ -1865,6 +1866,41 @@ <tree-width-m>10.0</tree-width-m> </material> + <material include="Materials/regions/united-kingdom.xml"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> + <name>GrassCover</name> + <texture>Terrain/grass.png</texture> + <texture>Terrain/iceland_grass.png</texture> + <!--<texture>Terrain/grass_green_hires.png</texture>--> + <texture>Terrain/dry_pasture4.png</texture> + <xsize>2000</xsize> + <ysize>2000</ysize> + <light-coverage>2000000.0</light-coverage> + <diffuse> + <r>0.93</r> + <g>0.95</g> + <b>0.93</b> + <a>1.0</a> + </diffuse> + <specular> + <r>0.1</r> + <g>0.12</g> + <b>0.1</b> + <a>1.0</a> + </specular> + <shininess>1.2</shininess> + <solid>1</solid> + <friction-factor>0.7</friction-factor> + <rolling-friction>0.1</rolling-friction> + <bumpiness>0.3</bumpiness> + <load-resistance>1e30</load-resistance> + </material> + <material include="Materials/regions/united-kingdom.xml"> <effect>Effects/crop</effect> <name>MixedCropPastureCover</name> @@ -1936,7 +1972,7 @@ <building-small-max-depth-m>30.0</building-small-max-depth-m> <building-medium-ratio>0.6</building-medium-ratio> <building-large-ratio>0.2</building-large-ratio> - <wood-coverage>250000.0</wood-coverage> + <wood-coverage>25000.0</wood-coverage> <tree-texture>Trees/deciduous-summer.png</tree-texture> <tree-varieties>8</tree-varieties> <tree-range-m alias="/params/forest/tree-range-m"/> @@ -1964,7 +2000,7 @@ <building-medium-ratio>0.1</building-medium-ratio> <building-large-ratio>0.0</building-large-ratio> <building-medium-max-floors>4</building-medium-max-floors> - <wood-coverage>1000.0</wood-coverage> + <wood-coverage>1500.0</wood-coverage> <tree-texture>Trees/deciduous-summer.png</tree-texture> <tree-varieties>8</tree-varieties> <tree-range-m alias="/params/forest/tree-range-m"/> @@ -1998,7 +2034,7 @@ <bumpiness>0.1</bumpiness> </material> - <!-- REGIONAL DEFINITIONS - ASIA --> + <!-- REGIONAL DEFINITIONS - ASIA --> <!-- Regional Asian irrigated crops --> <material>