Menu
▾
▴
[Flightgear-commitlogs] [FGData] branch next updated: Remove any reference to the winter textures which are relaced with a snow shader now
|
From: <fli...@li...> - 2021-01-19 12:10:16
|
ehofman pushed a commit to branch next
in repository fgdata.
The following commit(s) were added to refs/heads/next by this push:
new e70f09665 Remove any reference to the winter textures which are relaced with a snow shader now
e70f09665 is described below
SF URL: http://sourceforge.net/p/flightgear/fgdata/ci/e70f0966547159dbafd43453cfc1c217458efe27/
Commit: e70f0966547159dbafd43453cfc1c217458efe27
Author: Erik Hofman
Committer: Erik Hofman
AuthorDate: Tue Jan 19 13:10:06 2021 +0100
Remove any reference to the winter textures which are relaced with a snow shader now
---
Materials/dds/global-winter.xml | 624 ------------------------------
Materials/default/global-winter.xml | 620 -----------------------------
Materials/default/materials.xml | 1 -
Materials/regions/arctic.xml | 2 +-
Materials/regions/europe-winter.xml | 96 -----
Materials/regions/global-winter.xml | 750 ------------------------------------
Materials/regions/materials.xml | 2 -
options.xml | 6 -
8 files changed, 1 insertion(+), 2100 deletions(-)
diff --git a/Materials/dds/global-winter.xml b/Materials/dds/global-winter.xml
deleted file mode 100644
index 37d774f40..000000000
--- a/Materials/dds/global-winter.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0"?>
-<PropertyList include="Materials/base/materials-base.xml">
- <name>Global Winter DDS</name>
-
- <condition>
- <equals>
- <property>sim/startup/season</property>
- <value>winter</value>
- </equals>
- </condition>
-
-<material>
- <name>Landmass</name>
- <name>SomeSort</name>
- <name>EvergreenBroadCover</name>
- <name>EvergreenForest</name>
- <name>Island</name>
- <name>Default</name>
- <texture>Terrain.winter/forest1a.png</texture>
- <texture>Terrain.winter/forest1b.png</texture>
- <texture>Terrain.winter/forest1c.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>DeciduousBroadCover</name>
- <name>DeciduousForest</name>
- <texture>Terrain.winter/deciduous1.png</texture>
- <texture>Terrain.winter/deciduous2.png</texture>
- <texture>Terrain.winter/deciduous4.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>MixedForestCover</name>
- <name>MixedForest</name>
- <name>RainForest</name>
- <texture>Terrain.winter/mixedforest.png</texture>
- <texture>Terrain.winter/mixedforest2.png</texture>
- <texture>Terrain.winter/mixedforest3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>5000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>EvergreenNeedleCover</name>
- <name>WoodedTundraCover</name>
- <texture>Terrain.winter/evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>DeciduousNeedleCover</name>
- <texture>Terrain.winter/dec_evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>15.0</tree-height-m>
- <tree-width-m>8.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>Sand</name>
- <texture>Terrain.winter/sand.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>
-
-<material>
- <name>ShrubCover</name>
- <name>ShrubGrassCover</name>
- <name>ScrubCover</name>
- <name>Scrub</name>
- <name>Sclerophyllous</name>
- <name>Heath</name>
- <texture>Terrain.winter/shrub.png</texture>
- <texture>Terrain.winter/shrub2.png</texture>
- <texture>Terrain.winter/shrub3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <diffuse>
- <r>0.86</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>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>BuiltUpCover</name>
- <name>Urban</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain/city1.png</texture>
- <texture n="2">Terrain/city1-relief-light.png</texture>
- </texture-set>
- <texture-set>
- <texture>Terrain/city2.png</texture>
- <texture n="2">Terrain/city2-relief-light.png</texture>
- </texture-set>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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>2500.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/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
-</material>
-
-<material>
- <name>Construction</name>
- <name>Industrial</name>
- <name>Port</name>
- <name>Transport</name>
- <texture>Terrain/city1.png</texture>
- <texture>Terrain/city2.png</texture>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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/industrial-buildings.xml"/>
-</material>
-
-<material>
- <name>Town</name>
- <name>SubUrban</name>
- <texture>Terrain.winter/Town1.png</texture>
- <object-mask>Terrain/Town1.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>2500.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>5000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
-</material>
-
-<material>
- <name>Lake</name>
- <name>Pond</name>
- <name>Reservoir</name>
- <name>Stream</name>
- <name>Canal</name>
- <name>Lagoon</name>
- <name>Estuary</name>
- <name>Watercourse</name>
- <name>Saline</name>
- <texture>Terrain.winter/water-lake.png</texture>
- <xsize>400</xsize>
- <ysize>400</ysize>
- <ambient>
- <r>0.0</r>
- <g>0.0</g>
- <b>0.0</b>
- <a>1.0</a>
- </ambient>
- <diffuse>
- <r>0.5</r>
- <g>0.5</g>
- <b>0.5</b>
- <a>1.0</a>
- </diffuse>
- <specular>
- <r>0.3</r>
- <g>0.3</g>
- <b>0.3</b>
- <a>1.0</a>
- </specular>
- <shininess>1.2</shininess>
- <solid>1</solid>
- <rolling-friction>0.5</rolling-friction>
- <bumpiness>0.1</bumpiness>
-</material>
-
-<material>
- <name>DryLake</name>
- <name>IntermittentReservoir</name>
- <name>IntermittentLake</name>
- <texture>Terrain.winter/sand.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <solid>1</solid>
- <friction-factor>0.9</friction-factor>
- <rolling-friction>0.04</rolling-friction>
- <bumpiness>0.1</bumpiness>
-</material>
-
-<material>
- <name>IntermittentStream</name>
- <texture>Terrain.winter/wash.png</texture>
- <xsize>200</xsize>
- <ysize>200</ysize>
- <shininess>1.5</shininess>
- <solid>0</solid>
- <rolling-friction>2.5</rolling-friction>
- <bumpiness>0.6</bumpiness>
-</material>
-
-<material>
- <name>Marsh</name>
- <name>Bog</name>
- <name>Littoral</name>
- <name>FloodLand</name>
- <name>SaltMarsh</name>
- <name>HerbWetlandCover</name>
- <name>WoodedWetlandCover</name>
- <texture>Terrain.winter/marsh2.png</texture>
- <texture>Terrain.winter/marsh3.png</texture>
- <texture>Terrain.winter/marsh4.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>
- <name>GrassCover</name>
- <name>GrassLand</name>
- <name>BareTundraCover</name>
- <name>MixedTundraCover</name>
- <texture>Terrain.winter/tundra.png</texture>
- <texture>Terrain.winter/tundra2.png</texture>
- <texture>Terrain.winter/tundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.15</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>HerbTundraCover</name>
- <name>HerbTundra</name>
- <texture>Terrain.winter/herbtundra.png</texture>
- <texture>Terrain.winter/herbtundra2.png</texture>
- <texture>Terrain.winter/herbtundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.15</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>SavannaCover</name>
- <texture>Terrain.winter/savanna.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>4000000.0</light-coverage>
- <solid>1</solid>
- <friction-factor>0.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.2</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>Grass</name>
- <name>Airport</name>
- <name>AirportKeep</name>
- <name>Greenspace</name>
- <texture>Terrain.winter/airport.png</texture>
- <xsize>125</xsize>
- <ysize>125</ysize>
- <light-coverage>4000000.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.1</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>MixedCropPastureCover</name>
- <name>MixedCrop</name>
- <name>ComplexCrop</name>
- <texture>Terrain.winter/mixedcrop1.png</texture>
- <texture>Terrain.winter/mixedcrop4.png</texture>
- <texture>Terrain.winter/mixedcrop3.png</texture>
- <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>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>IrrCropPastureCover</name>
- <name>IrrCrop</name>
- <name>Orchard</name>
- <name>Olives</name>
- <name>Vineyard</name>
- <name>Rice</name>
- <texture>Terrain.winter/irrcrop1.png</texture>
- <texture>Terrain.winter/irrcrop2.png</texture>
- <texture>Terrain.winter/irrcrop3.png</texture>
- <object-mask>Terrain/irrcrop1.mask.png</object-mask>
- <object-mask>Terrain/irrcrop2.mask.png</object-mask>
- <object-mask>Terrain/irrcrop3.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>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>DryCropPastureCover</name>
- <name>DryCrop</name>
- <effect>Effects/transition-base-dirt</effect>
- <texture >Terrain.winter/countryside1.winter.dds</texture>
- <texture >Terrain.winter/countryside2.winter.dds</texture>
- <!--<texture >Terrain.winter/countryside3.winter.dds</texture>
- <texture >Terrain.winter/countryside3.winter.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>-->
- <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>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous.dds</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>NaturalCrop</name>
- <texture>Terrain.winter/naturalcrop1.png</texture>
- <object-mask>Terrain/naturalcrop1.mask.png</object-mask>
- <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>
- <object-group include="Materials/base/farm-buildings.xml"/>
- <wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/deciduous.dds</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>CropGrassCover</name>
- <name>CropGrass</name>
- <name>Grassland</name>
- <texture>Terrain.winter/cropgrass1.png</texture>
- <texture>Terrain.winter/cropgrass2.png</texture>
- <texture>Terrain.winter/cropgrass3.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>
- <wood-coverage>500000.0</wood-coverage>
- <tree-texture>Trees/deciduous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>GolfCourse</name>
- <texture>Terrain.winter/golfcourse1.png</texture>
- <object-mask>Terrain/golfcourse1.mask.png</object-mask>
- <xsize>800</xsize>
- <ysize>800</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>
- <tree-texture>Trees/deciduous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>CropWoodCover</name>
- <name>AgroForest</name>
- <texture>Terrain.winter/cropwood.png</texture>
- <object-mask>Terrain/cropwood.mask.png</object-mask>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>2000000.0</light-coverage>
- <solid>1</solid>
- <friction-factor>0.4</friction-factor>
- <rolling-friction>0.6</rolling-friction>
- <bumpiness>0.7</bumpiness>
- <load-resistance>10</load-resistance>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>Littoral</name>
- <texture>Terrain/sand1.dds</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>
-
-</PropertyList>
diff --git a/Materials/default/global-winter.xml b/Materials/default/global-winter.xml
deleted file mode 100644
index 7c6216108..000000000
--- a/Materials/default/global-winter.xml
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0"?>
-<PropertyList>
- <name>Global Winter</name>
-
- <condition>
- <equals>
- <property>sim/startup/season</property>
- <value>winter</value>
- </equals>
- </condition>
-
-<material>
- <name>Landmass</name>
- <name>SomeSort</name>
- <name>EvergreenBroadCover</name>
- <name>EvergreenForest</name>
- <name>Island</name>
- <name>Default</name>
- <texture>Terrain.winter/forest1a.png</texture>
- <texture>Terrain.winter/forest1b.png</texture>
- <texture>Terrain.winter/forest1c.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>DeciduousBroadCover</name>
- <name>DeciduousForest</name>
- <name>Bog</name>
- <name>Heath</name>
- <texture>Terrain.winter/deciduous1.png</texture>
- <texture>Terrain.winter/deciduous2.png</texture>
- <texture>Terrain.winter/deciduous4.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>MixedForestCover</name>
- <name>MixedForest</name>
- <name>RainForest</name>
- <texture>Terrain.winter/mixedforest.png</texture>
- <texture>Terrain.winter/mixedforest2.png</texture>
- <texture>Terrain.winter/mixedforest3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>5000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>EvergreenNeedleCover</name>
- <name>WoodedTundraCover</name>
- <texture>Terrain.winter/evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>DeciduousNeedleCover</name>
- <texture>Terrain.winter/dec_evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>15.0</tree-height-m>
- <tree-width-m>8.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
-</material>
-
-<material>
- <name>Sand</name>
- <texture>Terrain.winter/sand.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>
-
-<material>
- <name>ShrubCover</name>
- <name>ShrubGrassCover</name>
- <name>ScrubCover</name>
- <name>Scrub</name>
- <name>Sclerophyllous</name>
- <texture>Terrain.winter/shrub.png</texture>
- <texture>Terrain.winter/shrub2.png</texture>
- <texture>Terrain.winter/shrub3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <diffuse>
- <r>0.86</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>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>BuiltUpCover</name>
- <name>Urban</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain/city1.png</texture>
- <texture n="2">Terrain/city1-relief-light.png</texture>
- </texture-set>
- <texture-set>
- <texture>Terrain/city2.png</texture>
- <texture n="2">Terrain/city2-relief-light.png</texture>
- </texture-set>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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>2500.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/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
-</material>
-
-<material>
- <name>Construction</name>
- <name>Industrial</name>
- <name>Port</name>
- <texture>Terrain/city1.png</texture>
- <texture>Terrain/city2.png</texture>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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/industrial-buildings.xml"/>
-</material>
-
-<material>
- <name>Town</name>
- <name>SubUrban</name>
- <texture>Terrain.winter/Town1.png</texture>
- <object-mask>Terrain/Town1.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>2500.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>5000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
-</material>
-
-<material>
- <name>Lake</name>
- <name>Pond</name>
- <name>Reservoir</name>
- <name>Stream</name>
- <name>Canal</name>
- <name>Lagoon</name>
- <name>Estuary</name>
- <name>Watercourse</name>
- <name>Saline</name>
- <texture>Terrain.winter/water-lake.png</texture>
- <xsize>400</xsize>
- <ysize>400</ysize>
- <ambient>
- <r>0.0</r>
- <g>0.0</g>
- <b>0.0</b>
- <a>1.0</a>
- </ambient>
- <diffuse>
- <r>0.5</r>
- <g>0.5</g>
- <b>0.5</b>
- <a>1.0</a>
- </diffuse>
- <specular>
- <r>0.3</r>
- <g>0.3</g>
- <b>0.3</b>
- <a>1.0</a>
- </specular>
- <shininess>1.2</shininess>
- <solid>1</solid>
- <rolling-friction>0.5</rolling-friction>
- <bumpiness>0.1</bumpiness>
-</material>
-
-<material>
- <name>DryLake</name>
- <name>IntermittentReservoir</name>
- <name>IntermittentLake</name>
- <texture>Terrain.winter/sand.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <solid>1</solid>
- <friction-factor>0.9</friction-factor>
- <rolling-friction>0.04</rolling-friction>
- <bumpiness>0.1</bumpiness>
-</material>
-
-<material>
- <name>IntermittentStream</name>
- <texture>Terrain.winter/wash.png</texture>
- <xsize>200</xsize>
- <ysize>200</ysize>
- <shininess>1.5</shininess>
- <solid>0</solid>
- <rolling-friction>2.5</rolling-friction>
- <bumpiness>0.6</bumpiness>
-</material>
-
-<material>
- <name>Marsh</name>
- <name>FloodLand</name>
- <name>SaltMarsh</name>
- <name>HerbWetlandCover</name>
- <name>WoodedWetlandCover</name>
- <texture>Terrain.winter/marsh2.png</texture>
- <texture>Terrain.winter/marsh3.png</texture>
- <texture>Terrain.winter/marsh4.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>
- <name>Littoral</name>
- <texture>Terrain/tidal.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</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>
- <name>GrassCover</name>
- <name>BareTundraCover</name>
- <name>MixedTundraCover</name>
- <texture>Terrain.winter/tundra.png</texture>
- <texture>Terrain.winter/tundra2.png</texture>
- <texture>Terrain.winter/tundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.15</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>HerbTundraCover</name>
- <name>HerbTundra</name>
- <texture>Terrain.winter/herbtundra.png</texture>
- <texture>Terrain.winter/herbtundra2.png</texture>
- <texture>Terrain.winter/herbtundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.15</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>SavannaCover</name>
- <texture>Terrain.winter/savanna.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>4000000.0</light-coverage>
- <solid>1</solid>
- <friction-factor>0.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.2</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>Grass</name>
- <name>Airport</name>
- <name>AirportKeep</name>
- <name>Greenspace</name>
- <texture>Terrain.winter/airport.png</texture>
- <xsize>125</xsize>
- <ysize>125</ysize>
- <light-coverage>4000000.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.1</bumpiness>
- <load-resistance>1e30</load-resistance>
-</material>
-
-<material>
- <name>MixedCropPastureCover</name>
- <name>MixedCrop</name>
- <name>ComplexCrop</name>
- <texture>Terrain.winter/mixedcrop1.png</texture>
- <texture>Terrain.winter/mixedcrop4.png</texture>
- <texture>Terrain.winter/mixedcrop3.png</texture>
- <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>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>IrrCropPastureCover</name>
- <name>IrrCrop</name>
- <name>Orchard</name>
- <name>Olives</name>
- <name>Vineyard</name>
- <name>Rice</name>
- <texture>Terrain.winter/irrcrop1.png</texture>
- <texture>Terrain.winter/irrcrop2.png</texture>
- <texture>Terrain.winter/irrcrop3.png</texture>
- <object-mask>Terrain/irrcrop1.mask.png</object-mask>
- <object-mask>Terrain/irrcrop2.mask.png</object-mask>
- <object-mask>Terrain/irrcrop3.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>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>DryCropPastureCover</name>
- <name>DryCrop</name>
- <texture>Terrain.winter/drycrop1.png</texture>
- <texture>Terrain.winter/drycrop2.png</texture>
- <texture>Terrain.winter/drycrop3.png</texture>
- <texture>Terrain.winter/drycrop4.png</texture>
- <object-mask>Terrain/drycrop1.png</object-mask>
- <object-mask>Terrain/drycrop2.png</object-mask>
- <object-mask>Terrain/drycrop3.png</object-mask>
- <object-mask>Terrain/drycrop4.png</object-mask>
- <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>
- <object-group include="Materials/base/farm-buildings.xml"/>
- <wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>NaturalCrop</name>
- <texture>Terrain.winter/naturalcrop1.png</texture>
- <object-mask>Terrain/naturalcrop1.mask.png</object-mask>
- <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>
- <object-group include="Materials/base/farm-buildings.xml"/>
- <wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>CropGrassCover</name>
- <name>CropGrass</name>
- <name>Grassland</name>
- <texture>Terrain.winter/cropgrass1.png</texture>
- <texture>Terrain.winter/cropgrass2.png</texture>
- <texture>Terrain.winter/cropgrass3.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>
- <wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>GolfCourse</name>
- <texture>Terrain.winter/golfcourse1.png</texture>
- <object-mask>Terrain/golfcourse1.mask.png</object-mask>
- <xsize>800</xsize>
- <ysize>800</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>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-<material>
- <name>CropWoodCover</name>
- <name>CropWood</name>
- <name>AgroForest</name>
- <texture>Terrain.winter/cropwood.png</texture>
- <object-mask>Terrain/cropwood.mask.png</object-mask>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>2000000.0</light-coverage>
- <solid>1</solid>
- <friction-factor>0.4</friction-factor>
- <rolling-friction>0.6</rolling-friction>
- <bumpiness>0.7</bumpiness>
- <load-resistance>10</load-resistance>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>12.0</tree-width-m>
-</material>
-
-</PropertyList>
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index 098cd6d10..9242a6711 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -9,6 +9,5 @@
<!-- Base materials -->
<region include="Materials/default/global.xml"/>
<region include="Materials/default/global-summer.xml"/>
-<region include="Materials/default/global-winter.xml"/>
</PropertyList>
diff --git a/Materials/regions/arctic.xml b/Materials/regions/arctic.xml
index e5018fbf3..6cfb2d72a 100644
--- a/Materials/regions/arctic.xml
+++ b/Materials/regions/arctic.xml
@@ -123,7 +123,7 @@
<texture-set>
<texture>Runway/dirt_rwy.png</texture>
<texture n="16">Terrain/gravel_gray.png</texture>
- <texture n="17">Terrain.winter/wash.png</texture>
+ <texture n="17">Terrain/wash.png</texture>
</texture-set>
<parameters>
<strength_05m>0.0</strength_05m>
diff --git a/Materials/regions/europe-winter.xml b/Materials/regions/europe-winter.xml
deleted file mode 100644
index 3af7a0305..000000000
--- a/Materials/regions/europe-winter.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<!-- Regional definitions for Europe during winter -->
-<PropertyList>
- <name>Europe winter</name>
- <area>
- <lon1>2.0</lon1>
- <lon2>40.0</lon2>
- <lat1>35.0</lat1>
- <lat2>90.0</lat2>
- </area>
-
- <area>
- <lon1>-20.0</lon1>
- <lon2>40.0</lon2>
- <lat1>35.0</lat1>
- <lat2>49.8</lat2>
- </area>
-
- <condition>
- <equals>
- <property>sim/startup/season</property>
- <value>winter</value>
- </equals>
- </condition>
-
- <material>
- <name>BuiltUpCover</name>
- <name>Urban</name>
- <tree-effect>Effects/tree-european-deciduous</tree-effect>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain.winter/18th_century_city-winter.png</texture>
- <texture n="2">Terrain.winter/18th_century_city-winter-relief-light.png</texture>
- </texture-set>
- <object-mask>Terrain/18th_century_city.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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>
- <building-texture>Textures/buildings.png</building-texture>
- <building-lightmap>Textures/buildings-lightmap.png</building-lightmap>
- <wood-coverage>250000.0</wood-coverage>
- <tree-texture>Trees/deciduous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>15.0</tree-height-m>
- <tree-width-m>10.0</tree-width-m>
- </material>
-
- <material>
- <name>Town</name>
- <name>SubUrban</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain.winter/town-europe-winter.png</texture>
- <texture n="2">Terrain.winter/town-europe-winter-relief-light.png</texture>
- </texture-set>
- <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>
- <building-texture>Textures/buildings.png</building-texture>
- <building-lightmap>Textures/buildings-lightmap.png</building-lightmap>
- <wood-coverage>1000.0</wood-coverage>
- <tree-texture>Trees/deciduous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>15.0</tree-height-m>
- <tree-width-m>10.0</tree-width-m>
- </material>
-
-</PropertyList>
diff --git a/Materials/regions/global-winter.xml b/Materials/regions/global-winter.xml
deleted file mode 100644
index 8954aad4f..000000000
--- a/Materials/regions/global-winter.xml
+++ /dev/null
@@ -1,750 +0,0 @@
-<?xml version="1.0"?>
-<PropertyList>
- <name>Global Winter</name>
-
- <condition>
- <equals>
- <property>sim/startup/season</property>
- <value>winter</value>
- </equals>
- </condition>
-
- <!-- DEFAULT WINTER DEFINITIONS -->
-
- <material>
- <name>Landmass</name>
- <name>SomeSort</name>
- <name>EvergreenBroadCover</name>
- <name>EvergreenForest</name>
- <name>Island</name>
- <name>Default</name>
- <texture>Terrain.winter/forest1a.png</texture>
- <texture>Terrain.winter/forest1b.png</texture>
- <texture>Terrain.winter/forest1c.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
- </material>
-
- <material>
- <name>DeciduousBroadCover</name>
- <name>DeciduousForest</name>
- <name>Bog</name>
- <name>Heath</name>
- <texture>Terrain.winter/deciduous1.png</texture>
- <texture>Terrain.winter/deciduous2.png</texture>
- <texture>Terrain.winter/deciduous4.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>MixedForestCover</name>
- <name>MixedForest</name>
- <name>RainForest</name>
- <texture>Terrain.winter/mixedforest.png</texture>
- <texture>Terrain.winter/mixedforest2.png</texture>
- <texture>Terrain.winter/mixedforest3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>5000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>EvergreenNeedleCover</name>
- <name>WoodedTundraCover</name>
- <texture>Terrain.winter/evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>20.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
- </material>
-
- <material>
- <name>DeciduousNeedleCover</name>
- <texture>Terrain.winter/dec_evergreen.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>15.0</tree-height-m>
- <tree-width-m>8.0</tree-width-m>
- <rolling-friction>1</rolling-friction>
- <bumpiness>1</bumpiness>
- </material>
-
- <material>
- <name>Sand</name>
- <texture>Terrain.winter/sand.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>
-
- <material>
- <name>ShrubCover</name>
- <name>ShrubGrassCover</name>
- <name>ScrubCover</name>
- <name>Scrub</name>
- <name>Sclerophyllous</name>
- <texture>Terrain.winter/shrub.png</texture>
- <texture>Terrain.winter/shrub2.png</texture>
- <texture>Terrain.winter/shrub3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <diffuse>
- <r>0.86</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>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <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>
- <name>BuiltUpCover</name>
- <name>Urban</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain/city1.png</texture>
- <texture n="2">Terrain/city1-relief-light.png</texture>
- </texture-set>
- <texture-set>
- <texture>Terrain/city2.png</texture>
- <texture n="2">Terrain/city2-relief-light.png</texture>
- </texture-set>
- <object-mask>Terrain/city1.mask.png</object-mask>
- <object-mask>Terrain/city2.mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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>2500.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/mixed-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- </material>
-
- <material>
- <name>Construction</name>
- <name>Industrial</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain.winter/industrial-winter.png</texture>
- <texture n="2">Terrain/industrial-relief-light.png</texture>
- </texture-set>
- <object-mask>Terrain/industrial-mask.png</object-mask>
- <xsize>1000</xsize>
- <ysize>1000</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/industrial-buildings.xml"/>
- </material>
-
- <material>
- <name>Railroad</name>
- <texture>Terrain/dark_gravel.png</texture>
- <xsize>200</xsize>
- <ysize>200</ysize>
- </material>
-
- <material>
- <name>Transport</name>
- <name>Port</name>
- <effect>Effects/urban</effect>
- <texture-set>
- <texture>Terrain.winter/transport-winter.png</texture>
- <texture n="2">Terrain.winter/transport-winter-relief-light.png</texture>
- </texture-set>
- <xsize>500</xsize>
- <ysize>500</ysize>
- <light-coverage>1000000.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/industrial-buildings.xml"/>
- </material>
-
- <material>
- <name>Town</name>
- <name>SubUrban</name>
- <texture>Terrain.winter/Town1.png</texture>
- <object-mask>Terrain/Town1.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>2500.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>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-alt.png</tree-texture>
- <tree-varieties>8</tree-varieties>
- <tree-height-m>25.0</tree-height-m>
- <tree-width-m>15.0</tree-width-m>
- </material>
-
- <material>
- <name>Gravel</name>
- <texture>Terrain/snow2.png</texture>
- <xsize>400</xsize>
- <ysize>400</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>
-
- <material include="Materials/base/water.xml">
- <name>Ocean</name>
- <effect>Effects/water</effect>
- <texture>Terrain/water.png</texture>
- </material>
-
- <material>
- <name>Lake</name>
- <name>Pond</name>
- <name>Reservoir</name>
- <name>Stream</name>
- <name>Canal</name>
- <name>Lagoon</name>
- <name>Estuary</name>
- <name>Watercourse</name>
- <name>Saline</name>
- <texture>Terrain.winter/water-lake.png</texture>
- <xsize>400</xsize>
- <ysize>400</ysize>
- <ambient>
- <r>0.0</r>
- <g>0.0</g>
- <b>0.0</b>
- <a>1.0</a>
- </ambient>
- <diffuse>
- <r>0.5</r>
- <g>0.5</g>
- <b>0.5</b>
- <a>1.0</a>
- </diffuse>
- <specular>
- <r>0.3</r>
- <g>0.3</g>
- <b>0.3</b>
- <a>1.0</a>
- </specular>
- <shininess>1.2</shininess>
- <solid>1</solid>
- <friction-factor>0.15</friction-factor>
- <rolling-friction>0.005</rolling-friction>
- <bumpiness>0.1</bumpiness>
- </material>
-
- <material>
- <name>DryLake</name>
- <name>IntermittentReservoir</name>
- <name>IntermittentLake</name>
- <texture>Terrain.winter/sand.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <solid>1</solid>
- <friction-factor>0.9</friction-factor>
- <rolling-friction>0.04</rolling-friction>
- <bumpiness>0.1</bumpiness>
- </material>
-
- <material>
- <name>IntermittentStream</name>
- <texture>Terrain.winter/wash.png</texture>
- <xsize>200</xsize>
- <ysize>200</ysize>
- <shininess>1.5</shininess>
- <solid>0</solid>
- <rolling-friction>2.5</rolling-friction>
- <bumpiness>0.6</bumpiness>
- </material>
-
- <material>
- <name>Marsh</name>
- <name>FloodLand</name>
- <name>SaltMarsh</name>
- <name>HerbWetlandCover</name>
- <name>WoodedWetlandCover</name>
- <texture>Terrain.winter/marsh2.png</texture>
- <texture>Terrain.winter/marsh3.png</texture>
- <texture>Terrain.winter/marsh4.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>
- <name>Littoral</name>
- <effect>Effects/water</effect>
- <texture-set>
- <texture>Terrain/tidal.png</texture>
- <texture n="10">Terrain/mud.png</texture>
- <texture n="14">Terrain/sand_overlay.png</texture>
- <texture n="20">Terrain/sand6_hires.png</texture>
- </texture-set>
- <parameters>
- <ice_cover><use>/environment/sea/surface/delta-T-tide</use></ice_cover>
- <grit_alpha>0.4</grit_alpha>
- <base_layer_magnification>1.0</base_layer_magnification>
- <use_overlay>1</use_overlay>
- <overlay_bias>0.5</overlay_bias>
- <use_color_overlay>0</use_color_overlay>
- <overlay_layer_magnification>60.0</overlay_layer_magnification>
- <overlay_alpha>1.21</overlay_alpha>
- <use_grain>0</use_grain>
- <grain_layer_magnification>4.0</grain_layer_magnification>
- </parameters>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>40000000.0</light-coverage>
- <shininess>1.2</shininess>
- <solid>1</solid>
- <friction-factor>0.8</friction-factor>
- <rolling-friction>0.4</rolling-friction>
- <bumpiness>0.2</bumpiness>
- <load-resistance>1e30</load-resistance>
- </material>
-
- <material>
- <name>GrassCover</name>
- <name>BareTundraCover</name>
- <name>MixedTundraCover</name>
- <texture>Terrain.winter/tundra.png</texture>
- <texture>Terrain.winter/tundra2.png</texture>
- <texture>Terrain.winter/tundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.15</bumpiness>
- <load-resistance>1e30</load-resistance>
- </material>
-
- <material>
- <name>HerbTundraCover</name>
- <name>HerbTundra</name>
- <texture>Terrain.winter/herbtundra.png</texture>
- <texture>Terrain.winter/herbtundra2.png</texture>
- <texture>Terrain.winter/herbtundra3.png</texture>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>4000000.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.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.15</bumpiness>
- <load-resistance>1e30</load-resistance>
- </material>
-
- <material>
- <name>SavannaCover</name>
- <texture>Terrain.winter/savanna.png</texture>
- <xsize>1000</xsize>
- <ysize>1000</ysize>
- <light-coverage>4000000.0</light-coverage>
- <solid>1</solid>
- <friction-factor>0.8</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.2</bumpiness>
- <load-resistance>1e30</load-resistance>
- </material>
-
- <material>
- <name>Greenspace</name>
- <texture-set>
- <texture>Terrain/snow2.png</texture>
- <texture n="11">Terrain/snow2.png</texture>
- </texture-set>
- <parameters>
- <hires_overlay_bias>0.12</hires_overlay_bias>
- </parameters>
- <xsize>2000</xsize>
- <ysize>2000</ysize>
- <light-coverage>10000000.0</light-coverage>
- <friction-factor>0.7</friction-factor>
- <rolling-friction>0.1</rolling-friction>
- <bumpiness>0.1</bumpiness>
- </material>
-
- <material>
- <name>pa_shoulder</name>
- <texture>Runway/pa_shoulder_winter.png</texture>
- <parameters>
- <uvstretch>8.0</uvstretch>
- </parameters>
- </material>
-
- <material>
- <name>pa_shoulder_f</name>
- <texture>Runway/pa_shoulder_f_winter.png</texture>
- <parameters>
- <uvstretch>8.0</uvstretch>
- </parameters>
- </material>
-
- <material>
- <name>pc_shoulder</name>
- <texture>Runway/pc_shoulder_winter.png</texture>
- <parameters>
- <uvstretch>8.0</uvstretch>
- </parameters>
- </material>
-
- <material>
- <name>pc_shoulder_f</name>
- <texture>Runway/pc_shoulder_f_winter.png</texture>
- <parameters>
- <uvstretch>8.0</uvstretch>
- </parameters>
- </material>
-
- <material>
- <name>Grass</name>
- <name>Airport</name>
- <name>AirportKeep</name>
- <effect>Effects/airfield</effect>
- <texture-set>
- <texture>Terrain/snow2.png</texture>
- <texture n="13">Terrain/snow2.png</texture>
- <texture n="14">Terrain.winter/airport_overlay.png</texture>
- </texture-set>
- <parameters>
- <grit_alpha>0.25</grit_alpha>
- <use_overlay>1</use_overlay>
- <overlay_bias>0.5</overlay_bias>
- <use_color_overlay>0</use_color_overlay>
- <base_layer_magnification>1.2</base_layer_magnification>
- <overlay_layer_magnification>2.0</overlay_layer_magnification>
- </parameters>
- <xsize>512</xsize>
- <ysize>512</ysize>
- <light-coverage>4000000.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.1</bumpiness>
- <load-resistance>1e30</load-resistance>
- </material>
-
- <material>
- <name>MixedCropPastureCover</name>
- <name>MixedCrop</name>
- <name>ComplexCrop</name>
- <texture>Terrain.winter/mixedcrop1.png</texture>
- <texture>Terrain.winter/mixedcrop4.png</texture>
- <texture>Terrain.winter/mixedcrop3.png</texture>
- <object-mask>Terrain/mixedcrop1.mask.png</object-mask>
- <object-mask>Terrain/mixedcrop4.mask.png</object-mask>
- <object-mask>Terrain/mi...
[truncated message content] |
