From c5d298c263d36246f8f9341ced33845816753070 Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Sat, 16 Feb 2013 08:49:47 +0000 Subject: [PATCH] Add United Kingdom region Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net> --- Materials/regions/european.xml | 78 ++- Materials/regions/materials.xml | 815 ++++++++++++--------------- Materials/regions/united-kingdom.xml | 34 ++ 3 files changed, 437 insertions(+), 490 deletions(-) create mode 100644 Materials/regions/united-kingdom.xml diff --git a/Materials/regions/european.xml b/Materials/regions/european.xml index 2a7b6a4b0..3f64b095b 100644 --- a/Materials/regions/european.xml +++ b/Materials/regions/european.xml @@ -1,34 +1,54 @@ <?xml version="1.0"?> <!-- General settings for all European materials --> <PropertyList> - <!-- Define Europe as a box with given latitude/longitude --> - <condition> - <and> - <equals> - <property>sim/startup/season</property> - <value>summer</value> - </equals> - <and> - <greater-than> - <property>position/longitude-deg</property> - <value>-20.0</value> - </greater-than> - <less-than> - <property>position/longitude-deg</property> - <value>40.0</value> - </less-than> - <greater-than> - <property>position/latitude-deg</property> - <value>35.0</value> - </greater-than> - </and> - </and> - </condition> - - <!-- European buildings definitions. Notes that these will be used for --> - <!-- both towns and cities --> - <building-texture>Textures/buildings.png</building-texture> - <building-lightmap>Textures/buildings-lightmap.png</building-lightmap> + <!-- Define Europe as a box with given latitude/longitude --> + <condition> + <and> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + <or> + <and> + <greater-than> + <property>position/longitude-deg</property> + <value>2.0</value> + </greater-than> + <less-than> + <property>position/longitude-deg</property> + <value>40.0</value> + </less-than> + <greater-than> + <property>position/latitude-deg</property> + <value>35.0</value> + </greater-than> + </and> + <and> + <greater-than> + <property>position/longitude-deg</property> + <value>-20.0</value> + </greater-than> + <less-than> + <property>position/longitude-deg</property> + <value>40.0</value> + </less-than> + <less-than> + <property>position/latitude-deg</property> + <value>49.8</value> + </less-than> + <greater-than> + <property>position/latitude-deg</property> + <value>35.0</value> + </greater-than> + </and> + </or> + </and> + </condition> + + <!-- European buildings definitions. Notes that these will be used for --> + <!-- both towns and cities --> + <building-texture>Textures/buildings.png</building-texture> + <building-lightmap>Textures/buildings-lightmap.png</building-lightmap> + - </PropertyList> diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index 6f9a50cdc..af9c4bb89 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -775,144 +775,6 @@ </material> -<!-- REGIONAL DEFINITIONS - INDONESIA --> - -<material include="Materials/regions/indonesia.xml"> - <effect>Effects/forest</effect> - <name>MixedForestCover</name> - <name>MixedForest</name> - <name>RainForest</name> - <name>EvergreenBroadCover</name> - <texture-set> - <texture>Terrain/rainforest-hawaii.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - </texture-set> - <parameters> - <transition_model>0.8</transition_model> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>5000000.0</light-coverage> - <wood-coverage>4000.0</wood-coverage> - <tree-texture>Trees/tropical-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>25.0</tree-height-m> - <tree-width-m>15.0</tree-width-m> - <rolling-friction>1</rolling-friction> - <bumpiness>0.95</bumpiness> -</material> - -<material include="Materials/regions/indonesia.xml"> - <name>GrassCover</name> - <name>BareTundraCover</name> - <name>MixedTundraCover</name> - <name>Cemetery</name> - <effect>Effects/landmass-nowood</effect> - <texture-set> - <texture>Terrain/tundra-hawaii-green.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/airport_grass2.png</texture> - </texture-set> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>4000000.0</light-coverage> - <wood-coverage>25000.0</wood-coverage> - <tree-texture>Trees/tropical-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>25.0</tree-height-m> - <tree-width-m>15.0</tree-width-m> - <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.15</bumpiness> - <load-resistance>1e30</load-resistance> -</material> - -<material include="Materials/regions/indonesia.xml"> - <name>IrrCropPastureCover</name> - <name>IrrCrop</name> - <name>Orchard</name> - <name>Olives</name> - <name>Vineyard</name> - <name>Rice</name> - <texture-set> - <texture>Terrain/rice1.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.1</hires_overlay_bias> - <transition_model>1.0</transition_model> - </parameters> - <!--<object-mask>Terrain/rice1.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>120000.0</wood-coverage> - <tree-texture>Trees/tropical-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>20.0</tree-height-m> - <tree-width-m>12.0</tree-width-m> -</material> - -<material include="Materials/regions/indonesia.xml"> - <name>DryCropPastureCover</name> - <name>MixedCropPastureCover</name> - <name>DryCrop</name> - <texture-set> - <texture>Terrain/dry_pasture4.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/airport_grass2.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.1</hires_overlay_bias> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.6</bumpiness> - <load-resistance>1e30</load-resistance> - <light-coverage>2000000.0</light-coverage> - <wood-coverage>80000.0</wood-coverage> - <tree-texture>Trees/tropical-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>20.0</tree-height-m> - <tree-width-m>12.0</tree-width-m> -</material> - - <!-- REGIONAL DEFINITIONS - HAWAII ISLANDS --> <material include="Materials/regions/hawaii.xml"> @@ -921,12 +783,7 @@ <name>MixedForest</name> <name>RainForest</name> <name>EvergreenBroadCover</name> - <texture-set> - <texture>Terrain/rainforest-hawaii.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - </texture-set> + <texture>Terrain/rainforest-hawaii.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>5000000.0</light-coverage> @@ -940,67 +797,6 @@ <bumpiness>0.95</bumpiness> </material> -<material include="Materials/regions/hawaii.xml"> - <name>DryCropPastureCover</name> - <name>DryCrop</name> - <texture>Terrain/dry_pasture4.png</texture> - <xsize>2000</xsize> - <ysize>2000</ysize> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.6</bumpiness> - <load-resistance>1e30</load-resistance> - <light-coverage>2000000.0</light-coverage> -</material> - -<material include="Materials/regions/hawaii.xml"> - <name>BarrenCover</name> - <name>Dirt</name> - <name>OpenMining</name> - <name>Rock</name> - <name>Dump</name> - <texture-set> - <texture>Terrain/rocks-lava.png</texture> - <texture n="12">Terrain/rocks-desert.png</texture> - <texture n="14">Terrain/rock_grain01.png</texture> - <texture n="13">Terrain/void.png</texture> - </texture-set> - <parameters> - <grain_strength>0.7</grain_strength> - <transition_model>0.0</transition_model> - </parameters> - <xsize>1000</xsize> - <ysize>1000</ysize> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.3</bumpiness> -</material> - -<material include="Materials/regions/hawaii.xml"> - <name>DeciduousBroadCover</name> - <name>DeciduousForest</name> - <name>Bog</name> - <name>Heath</name> - <texture-set> - <texture>Terrain/deciduous-hires.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - </texture-set> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>10000000.0</light-coverage> - <wood-coverage>4000.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>25.0</tree-height-m> - <tree-width-m>15.0</tree-width-m> - <rolling-friction>1</rolling-friction> - <bumpiness>0.85</bumpiness> -</material> - <material include="Materials/regions/hawaii.xml"> <name>Sand</name> <texture>Terrain/sand-hawaii4.png</texture> @@ -1047,16 +843,7 @@ <name>ScrubCover</name> <name>Scrub</name> <name>Sclerophyllous</name> - <texture-set> - <texture>Terrain/shrub-hawaii-green.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii-green.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/rainforest-hawaii.png</texture> - </texture-set> - <parameters> - <transition_model>1.0</transition_model> - </parameters> + <texture>Terrain/shrub-hawaii-green.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <diffuse> @@ -1091,15 +878,7 @@ <name>ScrubCover</name> <name>Scrub</name> <name>Sclerophyllous</name> - <texture-set> - <texture>Terrain/shrub-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/rainforest-hawaii.png</texture> - </texture-set> - <parameters> - <dot_size>10.0</dot_size> - </parameters> + <texture>Terrain/shrub-hawaii.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <diffuse> @@ -1186,13 +965,7 @@ <name>MixedTundraCover</name> <name>Cemetery</name> <effect>Effects/landmass-nowood</effect> - <texture-set> - <texture>Terrain/tundra-hawaii-green.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii-green.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/rainforest-hawaii.png</texture> - </texture-set> + <texture>Terrain/tundra-hawaii-green.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>4000000.0</light-coverage> @@ -1224,16 +997,7 @@ <name>MixedTundraCover</name> <name>Cemetery</name> <effect>Effects/landmass-nowood</effect> - <texture-set> - <texture>Terrain/tundra-hawaii.png</texture> - <texture n="11">Terrain/rainforest-hawaii.png</texture> - <texture n="12">Terrain/shrub-hawaii.png</texture> - <texture n="13">Terrain/shrub-hawaii.png</texture> - <texture n="15">Terrain/airport_grass2.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.07</hires_overlay_bias> - </parameters> + <texture>Terrain/tundra-hawaii.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>4000000.0</light-coverage> @@ -1281,201 +1045,6 @@ <tree-width-m>12.0</tree-width-m> </material> - - -<!-- REGIONAL DEFINITIONS - MIDDLE EAST --> - -<material include="Materials/regions/middle_east.xml"> - <name>Landmass</name> - <name>SomeSort</name> - <name>Island</name> - <name>Default</name> - <texture-set> - <texture>Terrain/dirtrock_dark.png</texture> - <texture n="11">Terrain/sand_hires_ochre.png</texture> - <texture n="12">Terrain/rocks-desert.png</texture> - <texture n="15">Terrain/sand_hires_ochre.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>0.1</hires_overlay_bias> - <dot_density>0.4</dot_density> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>10000000.0</light-coverage> - <shininess>2.5</shininess> - <rolling-friction>0.1</rolling-friction> - <friction-factor>0.7</friction-factor> - <bumpiness>0.1</bumpiness> -</material> - -<material include="Materials/regions/middle_east.xml"> - <effect>Effects/landmass-scrub</effect> - <name>ShrubCover</name> - <name>ShrubGrassCover</name> - <name>ScrubCover</name> - <name>Scrub</name> - <name>Sclerophyllous</name> - <texture-set> - <texture>Terrain/shrub1_dark.png</texture> - <texture n="11">Terrain/sand_hires_ochre.png</texture> - <texture n="12">Terrain/dirtrock_dark.png</texture> - <texture n="15">Terrain/airport_grass2.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.1</hires_overlay_bias> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <diffuse> - <r>0.0</r> - <g>0.86</g> - <b>0.86</b> - <a>1.0</a> - </diffuse> - <specular> - <r>0.1</r> - <g>0.1</g> - <b>0.1</b> - <a>1.0</a> - </specular> - <shininess>1.2</shininess> - <light-coverage>20000000.0</light-coverage> - <wood-coverage>12000.0</wood-coverage> - <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> - <tree-width-m>2.0</tree-width-m> - <rolling-friction>0.6</rolling-friction> - <bumpiness>0.4</bumpiness> -</material> - - -<material include="Materials/regions/middle_east.xml"> - <name>DryCropPastureCover</name> - <name>DryCrop</name> - <texture-set> - <texture>Terrain/dry_pasture4.png</texture> - <texture n="11">Terrain/sand_hires_ochre.png</texture> - <texture n="12">Terrain/dry_pasture4.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.1</hires_overlay_bias> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <solid>1</solid> - <friction-factor>0.9</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.6</bumpiness> - <load-resistance>1e30</load-resistance> - <light-coverage>2000000.0</light-coverage> -</material> - -<material include="Materials/regions/middle_east.xml"> - <name>MixedCropPastureCover</name> - <name>MixedCrop</name> - <name>ComplexCrop</name> - <texture-set> - <texture>Terrain/irrcrop.png</texture> - <texture n="11">Terrain/dry_pasture4.png</texture> - <texture n="12">Terrain/town-europe.png</texture> - </texture-set> - <texture-set> - <texture>Terrain/drycrop.png</texture> - <texture n="11">Terrain/dry_pasture4.png</texture> - <texture n="12">Terrain/town-europe.png</texture> - </texture-set> - <parameters> - <hires_overlay_bias>-0.05</hires_overlay_bias> - <dust_resistance>0.7</dust_resistance> - <transition_model>0.7</transition_model> - </parameters> - <object-mask>Terrain/irrcrop.mask.png</object-mask> - <object-mask>Terrain/irrcrop.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/mixed-summer.png</tree-texture> - <tree-varieties>8</tree-varieties> - <tree-range-m alias="/params/forest/tree-range-m"/> - <tree-height-m>20.0</tree-height-m> - <tree-width-m>12.0</tree-width-m> -</material> - -<material include="Materials/regions/middle_east.xml"> - <name>IrrCropPastureCover</name> - <name>IrrCrop</name> - <name>Orchard</name> - <name>Olives</name> - <name>Vineyard</name> - <name>Rice</name> - <texture-set> - <texture>Terrain/mixedcrop.png</texture> - <texture n="11">Terrain/mixedforest-hires.png</texture> - <texture n="12">Terrain/drycrop.png</texture> - </texture-set> - <object-mask>Terrain/irrcrop.mask.png</object-mask> - <parameters> - <hires_overlay_bias>-0.12</hires_overlay_bias> - <transition_model>0.0</transition_model> - <dust_resistance>0.1</dust_resistance> - </parameters> - <!--<object-mask>Terrain/rice1.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>120000.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>20.0</tree-height-m> - <tree-width-m>12.0</tree-width-m> -</material> - -<material include="Materials/regions/middle_east.xml"> - <name>GrassCover</name> - <name>BareTundraCover</name> - <name>MixedTundraCover</name> - <name>Cemetery</name> - <effect>Effects/landmass-nowood</effect> - <texture-set> - <texture>Terrain/tundra2.png</texture> - <texture n="11">Terrain/grass_hires.png</texture> - <texture n="12">Terrain/dirtrock_dark.png</texture> - </texture-set> - <parameters> - <transition_model>0.8</transition_model> - <hires_overlay_bias>-0.1</hires_overlay_bias> - </parameters> - <xsize>2000</xsize> - <ysize>2000</ysize> - <light-coverage>4000000.0</light-coverage> - <shininess>1.2</shininess> - <solid>1</solid> - <friction-factor>0.7</friction-factor> - <rolling-friction>0.1</rolling-friction> - <bumpiness>0.15</bumpiness> - <load-resistance>1e30</load-resistance> -</material> - - - - <!-- REGIONAL DEFINITIONS - EUROPE --> <material include="Materials/regions/european.xml"> @@ -1483,7 +1052,7 @@ <name>CropGrassCover</name> <name>CropGrass</name> <name>Grassland</name> - <texture>Terrain/cropgrass-hires-autumn.png</texture> + <texture>Terrain/cropgrass-hires.png</texture> <object-mask>Terrain/cropgrass-hires.mask.png</object-mask> <xsize>2000</xsize> <ysize>2000</ysize> @@ -1549,7 +1118,7 @@ <material include="Materials/regions/european.xml"> <name>Town</name> <name>SubUrban</name> - <texture>Terrain/town-europe-autumn.png</texture> + <texture>Terrain/town-europe.png</texture> <object-mask>Terrain/town-europe.mask.png</object-mask> <xsize>1024</xsize> <ysize>1024</ysize> @@ -1611,7 +1180,7 @@ <name>MixedCropPastureCover</name> <name>MixedCrop</name> <name>ComplexCrop</name> - <texture>Terrain/irrcrop-europe-autumn.png</texture> + <texture>Terrain/irrcrop-europe.png</texture> <object-mask>Terrain/irrcrop-europe.mask.png</object-mask> <xsize>2000</xsize> <ysize>2000</ysize> @@ -1657,6 +1226,291 @@ <tree-width-m>12.0</tree-width-m> </material> + <!-- REGIONAL DEFINITIONS - UNITED KINGDOM --> + + <material include="Materials/regions/united-kingdom.xml"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> + <effect>Effects/transition-base-dirt</effect> + <name>DryCropPastureCover</name> + <name>DryCrop</name> + <name>Default</name> + <texture-set> + <texture>Terrain/uk_countryside1.png</texture> + <texture n="4">Terrain.winter/countryside1.winter.png</texture> + </texture-set> + <texture-set> + <texture>Terrain/uk_countryside2.png</texture> + <texture n="4">Terrain.winter/countryside2.winter.png</texture> + </texture-set> + <!--<texture-set> + <texture>Terrain/countryside3.green.dds</texture> + <texture n="4">Terrain.winter/countryside3.winter.dds</texture> + </texture-set> + <texture-set> + <texture>Terrain/countryside4.green.dds</texture> + <texture n="4">Terrain.winter/countryside4.winter.dds</texture> + </texture-set> --> + <object-mask>Terrain/countryside1.green.mask.png</object-mask> + <object-mask>Terrain/countryside2.green.mask.png</object-mask> + <!--<object-mask>Terrain/countryside3.green.mask.png</object-mask> + <object-mask>Terrain/countryside4.green.mask.png</object-mask>--> + <xsize>1800</xsize> + <ysize>1800</ysize> + <solid>1</solid> + <friction-factor>0.9</friction-factor> + <rolling-friction>0.1</rolling-friction> + <bumpiness>0.6</bumpiness> + <load-resistance>1e30</load-resistance> + <light-coverage>2000000.0</light-coverage> + <object-group include="Materials/base/farm-buildings.xml"/> + <wood-coverage>2000.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"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> + <effect>Effects/transition-base-dirt</effect> + <name>MixedCropPastureCover</name> + <name>MixedCrop</name> + <name>ComplexCrop</name> + <texture>Terrain/countryside1.green.png</texture> + <texture>Terrain/countryside2.green.png</texture> + <texture>Terrain/countryside3.green.png</texture> + <texture>Terrain/countryside4.green.png</texture> + <!-- <texture>Terrain/mixedcrop1.dds</texture> + <texture>Terrain/mixedcrop4.dds</texture> + <texture>Terrain/mixedcrop3.dds</texture>--> + <object-mask>Terrain/countryside1.green.mask.png</object-mask> + <object-mask>Terrain/countryside2.green.mask.png</object-mask> + <object-mask>Terrain/countryside3.green.mask.png</object-mask> + <object-mask>Terrain/countryside4.green.mask.png</object-mask> + <!-- <object-mask>Terrain/mixedcrop1.mask.png</object-mask> + <object-mask>Terrain/mixedcrop4.mask.png</object-mask> + <object-mask>Terrain/mixedcrop3.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>2000.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/cropgrass</effect> + <name>CropGrassCover</name> + <name>CropGrass</name> + <name>Grassland</name> + <texture>Terrain/cropgrass-hires.png</texture> + <object-mask>Terrain/cropgrass-hires.mask.png</object-mask> + <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> + <wood-coverage>5000.0</wood-coverage> + <object-group include="Materials/base/farm-buildings.xml"/> + <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> + <texture>Terrain/town-europe.png</texture> + <object-mask>Terrain/town-europe.mask.png</object-mask> + <xsize>1024</xsize> + <ysize>1024</ysize> + <light-coverage>100000.0</light-coverage> + <emissive> + <r>0.05</r> + <g>0.05</g> + <b>0.02</b> + <a>1.0</a> + </emissive> + <object-group include="Materials/base/urban-buildings.xml"/> + <building-coverage>500.0</building-coverage> + <building-small-ratio>0.4</building-small-ratio> + <building-small-min-floors>3</building-small-min-floors> + <building-small-max-width-m>30.0</building-small-max-width-m> + <building-small-min-depth-m>10.0</building-small-min-depth-m> + <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> + <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>Town</name> + <name>SubUrban</name> + <texture>Terrain/town-europe.png</texture> + <object-mask>Terrain/town-europe.mask.png</object-mask> + <xsize>1024</xsize> + <ysize>1024</ysize> + <light-coverage>100000.0</light-coverage> + <emissive> + <r>0.05</r> + <g>0.05</g> + <b>0.02</b> + <a>1.0</a> + </emissive> + <object-group include="Materials/base/town-buildings.xml"/> + <building-coverage>500.0</building-coverage> + <building-small-ratio>0.9</building-small-ratio> + <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> + <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>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> + <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"> + <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> + <light-coverage>10000000.0</light-coverage> + <shininess>2.5</shininess> + <rolling-friction>0.1</rolling-friction> + <friction-factor>0.7</friction-factor> + <bumpiness>0.1</bumpiness> + </material> <!-- REGIONAL DEFINITIONS - ASIA --> @@ -1929,7 +1783,7 @@ <name>Scrub</name> <name>Sclerophyllous</name> <texture-set> - <texture>Terrain/shrub1-autumn.png</texture> + <texture>Terrain/shrub1.png</texture> <texture n="11">Terrain/grass_green_hires.png</texture> <texture n="12">Terrain/herbtundra_iceland.png</texture> </texture-set> @@ -2072,7 +1926,7 @@ <name>DeciduousForest</name> <name>Bog</name> <name>Heath</name> - <texture>Terrain/deciduous-hires-autumn.png</texture> + <texture>Terrain/deciduous-hires.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>10000000.0</light-coverage> @@ -2099,7 +1953,7 @@ <name>MixedForestCover</name> <name>MixedForest</name> <name>RainForest</name> - <texture>Terrain/mixedforest-hires-autumn.png</texture> + <texture>Terrain/mixedforest-hires.png</texture> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>5000000.0</light-coverage> @@ -2235,13 +2089,15 @@ <name>Scrub</name> <name>Sclerophyllous</name> <texture-set> - <texture>Terrain/shrub1-autumn.png</texture> + <texture>Terrain/shrub1.png</texture> <texture n="11">Terrain/grass_hires.png</texture> <texture n="12">Terrain/dirtrock.png</texture> - <texture n="12">Terrain/dirtrock.png</texture> - <texture n="14">Terrain/grain_texture.png</texture> - <texture n="15">Terrain/airport_grass2.png</texture> </texture-set> +<!-- <texture>Terrain/shrub1.png</texture> + <texture>Terrain/shrub.png</texture> + <texture>Terrain/shrub2.png</texture> + <texture>Terrain/shrub3.png</texture> +--> <xsize>2000</xsize> <ysize>2000</ysize> <diffuse> @@ -2534,7 +2390,7 @@ <name>Cemetery</name> <effect>Effects/landmass-nowood</effect> <texture-set> - <texture>Terrain/tundra2-autumn.png</texture> + <texture>Terrain/tundra2.png</texture> <texture n="11">Terrain/grass_hires.png</texture> <texture n="12">Terrain/rock.png</texture> </texture-set> @@ -2575,13 +2431,8 @@ <texture>Terrain/herbtundra.png</texture> <texture n="11">Terrain/grass_hires.png</texture> <texture n="12">Terrain/rock.png</texture> - <texture n="15">Terrain/rock.png</texture> </texture-set> - <parameters> - <grain_strength>1.0</grain_strength> - <dot_density>0.2</dot_density> - </parameters> - <!--<texture-set> + <texture-set> <texture>Terrain/herbtundra2.png</texture> <texture n="11">Terrain/grass_hires.png</texture> <texture n="12">Terrain/rock.png</texture> @@ -2590,7 +2441,7 @@ <texture>Terrain/herbtundra3.png</texture> <texture n="11">Terrain/grass_hires.png</texture> <texture n="12">Terrain/rock.png</texture> - </texture-set>--> + </texture-set> <!--<texture>Terrain/herbtundra.png</texture> <texture>Terrain/herbtundra2.png</texture> <texture>Terrain/herbtundra3.png</texture>--> @@ -2755,14 +2606,14 @@ <effect>Effects/crop</effect> <name>DryCropPastureCover</name> <name>DryCrop</name> - <texture>Terrain/drycrop1-autumn.png</texture> - <!--<texture>Terrain/drycrop2.png</texture> + <texture>Terrain/drycrop1.png</texture> + <texture>Terrain/drycrop2.png</texture> <texture>Terrain/drycrop3.png</texture> - <texture>Terrain/drycrop4.png</texture>--> + <texture>Terrain/drycrop4.png</texture> <object-mask>Terrain/drycrop1.mask.png</object-mask> <object-mask>Terrain/drycrop2.mask.png</object-mask> <object-mask>Terrain/drycrop3.mask.png</object-mask> - <!--<object-mask>Terrain/drycrop4.mask.png</object-mask>--> + <object-mask>Terrain/drycrop4.mask.png</object-mask> <xsize>2000</xsize> <ysize>2000</ysize> <solid>1</solid> @@ -2902,7 +2753,7 @@ <name>CropWood</name> <name>AgroForest</name> <effect>Effects/landmass-nowood</effect> - <texture>Terrain/cropwood-autumn.png</texture> + <texture>Terrain/cropwood.png</texture> <object-mask>Terrain/cropwood.mask.png</object-mask> <xsize>2000</xsize> <ysize>2000</ysize> @@ -2920,6 +2771,27 @@ <tree-width-m>12.0</tree-width-m> </material> + <!--<material n="2010"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> + <name>Railroad</name> + <name>Transport</name> + --><!--<texture>Terrain/track-usage-high.png</texture>--><!-- + <texture>Terrain/track-usage-high-3-rail.png</texture> + <xsize>1000</xsize> + <ysize>2000</ysize> + <light-coverage>1000000.0</light-coverage> + <solid>1</solid> + <friction-factor>0.5</friction-factor> + <rolling-friction>0.04</rolling-friction> + <bumpiness>0.5</bumpiness> + <load-resistance>1e10</load-resistance> + </material>--> + <!-- end summer--> @@ -3688,7 +3560,7 @@ <name>CropWood</name> <name>AgroForest</name> <texture>Terrain.winter/cropwood.png</texture> - <object-mask>Terrain/cropwood.mask.png</object-mask> + <object-mask>Terrain/cropwood.mask.png</object-mask> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>2000000.0</light-coverage> @@ -3705,7 +3577,28 @@ <tree-width-m>12.0</tree-width-m> </material> -<!-- end winter--> + <!--<material n="2012"> + <condition> + <equals> + <property>sim/startup/season</property> + <value>winter</value> + </equals> + </condition> + <name>Railroad</name> + <name>Transport</name> + <texture>Terrain.winter/track-usage-low.png</texture> + <xsize>1000</xsize> + <ysize>500</ysize> + <light-coverage>1000000.0</light-coverage> + <solid>1</solid> + <friction-factor>0.5</friction-factor> + <rolling-friction>0.04</rolling-friction> + <bumpiness>0.5</bumpiness> + <load-resistance>1e10</load-resistance> + </material>--> + + + <!-- end winter--> <material include="Materials/base/rock.xml"> <name>BarrenCover</name> diff --git a/Materials/regions/united-kingdom.xml b/Materials/regions/united-kingdom.xml new file mode 100644 index 000000000..ed625d06b --- /dev/null +++ b/Materials/regions/united-kingdom.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<!-- General settings for all UK materials --> +<PropertyList> + <!-- Define the United Kingdom as a box with given latitude/longitude --> + <condition> + <and> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + <and> + <greater-than> + <property>position/longitude-deg</property> + <value>-20.0</value> + </greater-than> + <less-than-equals> + <property>position/longitude-deg</property> + <value>2.0</value> + </less-than-equals> + <greater-than-equals> + <property>position/latitude-deg</property> + <value>49.8</value> + </greater-than-equals> + </and> + </and> + </condition> + + <!-- European buildings definitions. Notes that these will be used for --> + <!-- both towns and cities --> + <building-texture>Textures/buildings.png</building-texture> + <building-lightmap>Textures/buildings-lightmap.png</building-lightmap> + + +</PropertyList>