diff --git a/Docs/README.materials b/Docs/README.materials
index 226b8147c..df06fadb3 100644
--- a/Docs/README.materials
+++ b/Docs/README.materials
@@ -109,8 +109,13 @@ tree-range-m : The range at which trees become visible. Note that this
is not absolute, as trees are loaded in blocks. A lower number means
trees will not become visible until you are closer.
-tree-texture : A texture to use for the trees. Typically this will be a
- strip with multiple tree textures.
+tree-texture : A texture to use for the trees. Typically this will contain around
+ 8 different trees in a row, duplicate 4 times. From bottom to top, the
+ rows contain
+ * summer textures
+ * snow texture
+ * winter texture
+ * winter snow texture
tree-varieties : The number of different trees defined in the tree-texture
horizontally. (default: 1)
@@ -233,3 +238,6 @@ building-texture : The texture used for all buildings. See Docs/buildings.png fo
building-lightmap: Emissive texture for all buildings, which is faded in at night to provide
illusion of lit windows. Same texture coordinates and format at building-texture above.
+
+building-range-m: Range at which all buildings are visible. Beyond this point fewer and fewer
+ buildings are rendered, with no buildings rendered at 2*building-range-m (default 10000)
diff --git a/Effects/tree.eff b/Effects/tree.eff
index 3970b7de1..b12badec0 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -25,13 +25,14 @@
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
- <overcast><use>/rendering/scene/overcast</use></overcast>
- <eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
+ <overcast><use>/rendering/scene/overcast</use></overcast>
+ <eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<snow_level><use>/environment/snow-level-m</use></snow_level>
+ <season><use>/environment/tree-season</use></season>
<dust_cover_factor><use>/environment/surface/dust-cover-factor</use></dust_cover_factor>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<fogstructure><use>/environment/fog-structure</use></fogstructure>
- <quality_level><use>/sim/rendering/shaders/landmass</use></quality_level>
+ <quality_level><use>/sim/rendering/shaders/landmass</use></quality_level>
<!-- END fog include -->
</parameters>
@@ -123,9 +124,19 @@
<value><use>eye_alt</use></value>
</uniform>
<uniform>
- <name>dust_cover_factor</name>
- <type>float</type>
- <value> <use>dust_cover_factor</use></value>
+ <name>dust_cover_factor</name>
+ <type>float</type>
+ <value><use>dust_cover_factor</use></value>
+ </uniform>
+ <uniform>
+ <name>snow_level</name>
+ <type>float</type>
+ <value><use>snow_level</use></value>
+ </uniform>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
</uniform>
<uniform>
<name>texture</name>
@@ -138,9 +149,9 @@
<value>2</value> <!-- AMBIENT_AND_DIFFUSE -->
</uniform>
<uniform>
- <name>quality_level</name>
- <type>int</type>
- <value> <use>quality_level</use></value>
+ <name>quality_level</name>
+ <type>int</type>
+ <value><use>quality_level</use></value>
</uniform>
</pass>
</technique>
@@ -235,9 +246,19 @@
<value><use>eye_alt</use></value>
</uniform>
<uniform>
- <name>dust_cover_factor</name>
- <type>float</type>
- <value> <use>dust_cover_factor</use></value>
+ <name>dust_cover_factor</name>
+ <type>float</type>
+ <value><use>dust_cover_factor</use></value>
+ </uniform>
+ <uniform>
+ <name>snow_level</name>
+ <type>float</type>
+ <value><use>snow_level</use></value>
+ </uniform>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
</uniform>
<uniform>
<name>texture</name>
@@ -250,9 +271,9 @@
<value>2</value> <!-- AMBIENT_AND_DIFFUSE -->
</uniform>
<uniform>
- <name>quality_level</name>
- <type>int</type>
- <value> <use>quality_level</use></value>
+ <name>quality_level</name>
+ <type>int</type>
+ <value><use>quality_level</use></value>
</uniform>
</pass>
</technique>
@@ -290,6 +311,11 @@
<fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
<fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader>
</program>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
+ </uniform>
<uniform>
<name>texture</name>
<type>sampler-2d</type>
@@ -382,6 +408,11 @@
<use>fogtype</use>
</value>
</uniform>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
+ </uniform>
<!-- END fog include -->
</pass>
</technique>
@@ -471,6 +502,11 @@
<use>fogtype</use>
</value>
</uniform>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
+ </uniform>
<!-- END fog include -->
</pass>
@@ -558,6 +594,11 @@
<use>fogtype</use>
</value>
</uniform>
+ <uniform>
+ <name>season</name>
+ <type>int</type>
+ <value><use>season</use></value>
+ </uniform>
</pass>
</technique>
</PropertyList>
diff --git a/Environment/local-weather-rules.xml b/Environment/local-weather-rules.xml
index 2e9b07e77..92a4fed77 100644
--- a/Environment/local-weather-rules.xml
+++ b/Environment/local-weather-rules.xml
@@ -751,4 +751,54 @@
<output>/environment/mean-terrain-elevation-m</output>
</filter>
+ <!-- Tree "season" - used to determine whether to display the trees in summer or winter foliage -->
+ <filter>
+ <name>EnvironmentInterpolator:Trees:Season:Summer</name>
+ <type>gain</type>
+ <enable>
+ <condition>
+ <not>
+ <or>
+ <equals>
+ <property>sim/startup/season</property>
+ <value>winter</value>
+ </equals>
+ <greater-than>
+ <property>/environment/season</property>
+ <value>1.5</value>
+ </greater-than>
+ </or>
+ </not>
+ </condition>
+ </enable>
+ <input>
+ <value>0.0</value>
+ </input>
+ <output>/environment/tree-season</output>
+ </filter>
+
+
+ <filter>
+ <name>EnvironmentInterpolator:Trees:Season:Winter</name>
+ <type>gain</type>
+ <enable>
+ <condition>
+ <or>
+ <equals>
+ <property>sim/startup/season</property>
+ <value>winter</value>
+ </equals>
+ <greater-than>
+ <property>/environment/season</property>
+ <value>1.5</value>
+ </greater-than>
+ </or>
+ </condition>
+ </enable>
+ <input>
+ <value>1.0</value>
+ </input>
+ <output>/environment/tree-season</output>
+ </filter>
+
</PropertyList>
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index 42f636ab7..9196bc716 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -16,9 +16,15 @@ Shared parameters for various materials.
-->
<params>
<forest>
- <!-- Maximum distance from which a tree is visible -->
- <tree-range-m>8000</tree-range-m>
+ <!-- Maximum distance from which all trees are visible. -->
+ <!-- Some trees will be visible to twice this range -->
+ <tree-range-m>8000</tree-range-m>
</forest>
+ <building>
+ <!-- Maximum distance from which all buildings are visible -->
+ <!-- Some buildings will be visible to twice this range. -->
+ <building-range-m>10000</building-range-m>
+ </building>
</params>
<!-- Signage -->
diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml
index 796aca764..8f595462e 100644
--- a/Materials/dds/materials.xml
+++ b/Materials/dds/materials.xml
@@ -678,7 +678,7 @@
<ysize>500</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.dds</tree-texture>
+ <tree-texture>Trees/coniferous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -702,7 +702,7 @@
<ysize>500</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.dds</tree-texture>
+ <tree-texture>Trees/coniferous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -726,7 +726,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -751,7 +751,7 @@
<ysize>500</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -775,7 +775,7 @@
<ysize>500</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.dds</tree-texture>
+ <tree-texture>Trees/coniferous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -798,7 +798,7 @@
<ysize>500</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.dds</tree-texture>
+ <tree-texture>Trees/coniferous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>15.0</tree-height-m>
@@ -912,8 +912,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -958,8 +959,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>25000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -1026,8 +1028,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>25.0</tree-height-m>
@@ -1312,7 +1315,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>2000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1351,7 +1354,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>2000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1398,7 +1401,7 @@
<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.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1426,7 +1429,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>500000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1472,7 +1475,7 @@
<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.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1512,7 +1515,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1543,7 +1546,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>2000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.dds</tree-texture>
+ <tree-texture>Trees/mixed.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -1593,7 +1596,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1618,7 +1621,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -1644,7 +1647,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1667,7 +1670,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1689,7 +1692,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1749,7 +1752,7 @@
<shininess>1.2</shininess>
<light-coverage>20000000.0</light-coverage>
<wood-coverage>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub-winter.png</tree-texture>
+ <tree-texture>Trees/mixed-shrub.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>2.0</tree-height-m>
@@ -1798,8 +1801,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>250000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1859,8 +1863,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2125,7 +2130,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2161,7 +2166,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2196,7 +2201,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -2223,7 +2228,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.dds</tree-texture>
+ <tree-texture>Trees/deciduous.dds</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
@@ -2265,7 +2270,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>500000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2304,7 +2309,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2331,7 +2336,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index 395e2d711..d135de18a 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -638,7 +638,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -664,7 +664,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -692,7 +692,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -719,7 +719,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -743,7 +743,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -766,7 +766,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -878,8 +878,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>250000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -938,8 +939,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1233,7 +1235,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1270,7 +1272,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1305,7 +1307,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1332,7 +1334,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1375,7 +1377,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1414,7 +1416,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1443,7 +1445,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1474,7 +1476,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1501,7 +1503,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -1527,7 +1529,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1550,7 +1552,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1572,7 +1574,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -1631,7 +1633,7 @@
<shininess>1.2</shininess>
<light-coverage>20000000.0</light-coverage>
<wood-coverage>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub-winter.png</tree-texture>
+ <tree-texture>Trees/mixed-shrub.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>2.0</tree-height-m>
@@ -1678,8 +1680,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>250000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1738,8 +1741,9 @@
<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-range-m alias="/params/building/building-range-m"/>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2020,7 +2024,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2056,7 +2060,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2090,7 +2094,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2117,7 +2121,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2159,7 +2163,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2198,7 +2202,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2226,7 +2230,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml
index f5fe5cb21..16d64ac9f 100644
--- a/Materials/regions/materials.xml
+++ b/Materials/regions/materials.xml
@@ -796,7 +796,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -822,7 +822,7 @@
<ysize>2000</ysize>
<light-coverage>4000000.0</light-coverage>
<wood-coverage>25000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -875,7 +875,7 @@
<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-texture>Trees/tropical.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>
@@ -905,7 +905,7 @@
<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-texture>Trees/tropical.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>
@@ -931,7 +931,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -992,7 +992,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -1146,7 +1146,7 @@
<building-medium-ratio>0.1</building-medium-ratio>
<building-large-ratio>0.0</building-large-ratio>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -1274,7 +1274,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1323,7 +1323,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<!--<wood-coverage>800000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -1603,7 +1603,7 @@
<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-texture>Trees/mixed.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>
@@ -1783,7 +1783,7 @@
<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-texture>Trees/mixed.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>
@@ -1819,7 +1819,7 @@
<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-texture>Trees/deciduous.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>
@@ -1887,7 +1887,7 @@
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -1918,7 +1918,7 @@
<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-texture>Trees/deciduous.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>
@@ -1946,7 +1946,7 @@
<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-texture>Trees/deciduous.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>
@@ -2002,7 +2002,7 @@
<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-texture>Trees/mixed.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>
@@ -2029,7 +2029,7 @@
<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-texture>Trees/mixed.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>
@@ -2095,7 +2095,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2156,7 +2156,7 @@
<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-texture>Trees/deciduous.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>
@@ -2194,7 +2194,7 @@
<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-texture>Trees/deciduous.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>
@@ -2238,7 +2238,7 @@
<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-texture>Trees/deciduous.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>
@@ -2297,7 +2297,7 @@
<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-texture>Trees/deciduous.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>
@@ -2320,7 +2320,7 @@
<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-texture>Trees/deciduous.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>
@@ -2352,7 +2352,7 @@
<building-medium-ratio>0.6</building-medium-ratio>
<building-large-ratio>0.2</building-large-ratio>
<wood-coverage>25000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2380,7 +2380,7 @@
<building-large-ratio>0.0</building-large-ratio>
<building-medium-max-floors>4</building-medium-max-floors>
<wood-coverage>1500.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2462,7 +2462,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2486,7 +2486,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>35.0</tree-height-m>
@@ -2527,7 +2527,7 @@
<bumpiness>0.15</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>70000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -2552,7 +2552,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -2577,7 +2577,7 @@
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<wood-coverage>50000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -2644,7 +2644,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>35.0</tree-height-m>
@@ -2730,7 +2730,7 @@
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<wood-coverage>50000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -2759,7 +2759,7 @@
<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/tropical-alt-summer.png</tree-texture>
+ <tree-texture>Trees/tropical-alt.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>
@@ -2782,7 +2782,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/tropical-summer.png</tree-texture>
+ <tree-texture>Trees/tropical.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>
@@ -2828,7 +2828,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -2855,7 +2855,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-summer.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -2880,7 +2880,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -2906,7 +2906,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -2930,7 +2930,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -2953,7 +2953,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-summer.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -3085,7 +3085,7 @@
<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-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3146,7 +3146,7 @@
<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-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3476,7 +3476,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3514,7 +3514,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3549,7 +3549,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3576,7 +3576,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3621,7 +3621,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3660,7 +3660,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3689,7 +3689,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-summer.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3722,7 +3722,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -3749,7 +3749,7 @@
<ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/deciduous-winter.png</tree-texture>
+ <tree-texture>Trees/deciduous.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>
@@ -3775,7 +3775,7 @@
<ysize>2000</ysize>
<light-coverage>5000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3798,7 +3798,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -3820,7 +3820,7 @@
<ysize>1000</ysize>
<light-coverage>10000000.0</light-coverage>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/coniferous-winter.png</tree-texture>
+ <tree-texture>Trees/coniferous.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>
@@ -3879,7 +3879,7 @@
<shininess>1.2</shininess>
<light-coverage>20000000.0</light-coverage>
<wood-coverage>8000.0</wood-coverage>
- <tree-texture>Trees/mixed-shrub-winter.png</tree-texture>
+ <tree-texture>Trees/mixed-shrub.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>2.0</tree-height-m>
@@ -3927,7 +3927,7 @@
<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-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -3987,7 +3987,7 @@
<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-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4268,7 +4268,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4304,7 +4304,7 @@
<load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4338,7 +4338,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4365,7 +4365,7 @@
<light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4407,7 +4407,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4446,7 +4446,7 @@
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>5000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
@@ -4474,7 +4474,7 @@
<bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage>
- <tree-texture>Trees/mixed-winter.png</tree-texture>
+ <tree-texture>Trees/mixed.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>
diff --git a/Shaders/deferred-tree.vert b/Shaders/deferred-tree.vert
index 2b6b254ec..f19595b57 100644
--- a/Shaders/deferred-tree.vert
+++ b/Shaders/deferred-tree.vert
@@ -5,6 +5,8 @@
// color - xyz of tree quad origin, replicated 4 times.
#version 120
+uniform int season;
+
void main() {
// Texture coordinates
@@ -12,6 +14,7 @@ void main() {
float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties;
texFract += floor(gl_MultiTexCoord0.x) / numVarieties;
gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season;
// Position and scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
diff --git a/Shaders/tree-haze.vert b/Shaders/tree-haze.vert
index feea2ba53..1135ef852 100644
--- a/Shaders/tree-haze.vert
+++ b/Shaders/tree-haze.vert
@@ -37,6 +37,8 @@ uniform float visibility;
uniform float overcast;
//uniform float scattering;
uniform float ground_scattering;
+uniform float snow_level;
+uniform int season;
float earthShade;
float mie_angle;
@@ -82,6 +84,9 @@ void main()
float sr = sin(gl_FogCoord + gl_Color.x);
float cr = cos(gl_FogCoord + gl_Color.x);
gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
+
+ // Determine the y texture coordinate based on whether it's summer, winter, snowy.
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.25 * int(gl_Color.z > snow_level) + 0.5 * season;
// scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
diff --git a/Shaders/tree.vert b/Shaders/tree.vert
index 65b3d2d7e..3a50f5491 100644
--- a/Shaders/tree.vert
+++ b/Shaders/tree.vert
@@ -12,6 +12,7 @@
//
// void fog_Func(int type);
// /////////////////////////
+uniform int season;
void main(void)
{
@@ -25,6 +26,7 @@ void main(void)
float sr = sin(gl_FogCoord + gl_Color.x);
float cr = cos(gl_FogCoord + gl_Color.x);
gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season;
// scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
diff --git a/Textures/Trees/coniferous-summer.dds b/Textures/Trees/coniferous-summer.dds
deleted file mode 100644
index eabddd54b..000000000
Binary files a/Textures/Trees/coniferous-summer.dds and /dev/null differ
diff --git a/Textures/Trees/coniferous-summer.png b/Textures/Trees/coniferous-summer.png
deleted file mode 100644
index b5cab5934..000000000
Binary files a/Textures/Trees/coniferous-summer.png and /dev/null differ
diff --git a/Textures/Trees/coniferous-winter.dds b/Textures/Trees/coniferous-winter.dds
deleted file mode 100644
index ac0e59011..000000000
Binary files a/Textures/Trees/coniferous-winter.dds and /dev/null differ
diff --git a/Textures/Trees/coniferous-winter.png b/Textures/Trees/coniferous-winter.png
deleted file mode 100644
index f8fe6bd3c..000000000
Binary files a/Textures/Trees/coniferous-winter.png and /dev/null differ
diff --git a/Textures/Trees/coniferous.dds b/Textures/Trees/coniferous.dds
new file mode 100644
index 000000000..71e66fc0d
Binary files /dev/null and b/Textures/Trees/coniferous.dds differ
diff --git a/Textures/Trees/coniferous.png b/Textures/Trees/coniferous.png
new file mode 100644
index 000000000..90dfdeb9d
Binary files /dev/null and b/Textures/Trees/coniferous.png differ
diff --git a/Textures/Trees/deciduous-summer.dds b/Textures/Trees/deciduous-summer.dds
deleted file mode 100644
index 1fef152ca..000000000
Binary files a/Textures/Trees/deciduous-summer.dds and /dev/null differ
diff --git a/Textures/Trees/deciduous-summer.png b/Textures/Trees/deciduous-summer.png
deleted file mode 100644
index 161661ba9..000000000
Binary files a/Textures/Trees/deciduous-summer.png and /dev/null differ
diff --git a/Textures/Trees/deciduous-winter.dds b/Textures/Trees/deciduous-winter.dds
deleted file mode 100644
index 85de7e851..000000000
Binary files a/Textures/Trees/deciduous-winter.dds and /dev/null differ
diff --git a/Textures/Trees/deciduous-winter.png b/Textures/Trees/deciduous-winter.png
deleted file mode 100644
index a01d0e8d3..000000000
Binary files a/Textures/Trees/deciduous-winter.png and /dev/null differ
diff --git a/Textures/Trees/deciduous.dds b/Textures/Trees/deciduous.dds
new file mode 100644
index 000000000..0a0473916
Binary files /dev/null and b/Textures/Trees/deciduous.dds differ
diff --git a/Textures/Trees/deciduous.png b/Textures/Trees/deciduous.png
new file mode 100644
index 000000000..61f6120d3
Binary files /dev/null and b/Textures/Trees/deciduous.png differ
diff --git a/Textures/Trees/mixed-shrub-winter.dds b/Textures/Trees/mixed-shrub-winter.dds
deleted file mode 100644
index 66b828ed0..000000000
Binary files a/Textures/Trees/mixed-shrub-winter.dds and /dev/null differ
diff --git a/Textures/Trees/mixed-shrub-winter.png b/Textures/Trees/mixed-shrub-winter.png
deleted file mode 100644
index 6661d8195..000000000
Binary files a/Textures/Trees/mixed-shrub-winter.png and /dev/null differ
diff --git a/Textures/Trees/mixed-shrub.dds b/Textures/Trees/mixed-shrub.dds
index d10afc9c4..586d099bc 100644
Binary files a/Textures/Trees/mixed-shrub.dds and b/Textures/Trees/mixed-shrub.dds differ
diff --git a/Textures/Trees/mixed-shrub.png b/Textures/Trees/mixed-shrub.png
index 557c0bcc3..30cded1c2 100644
Binary files a/Textures/Trees/mixed-shrub.png and b/Textures/Trees/mixed-shrub.png differ
diff --git a/Textures/Trees/mixed-summer.dds b/Textures/Trees/mixed-summer.dds
deleted file mode 100644
index b2261e5fd..000000000
Binary files a/Textures/Trees/mixed-summer.dds and /dev/null differ
diff --git a/Textures/Trees/mixed-summer.png b/Textures/Trees/mixed-summer.png
deleted file mode 100644
index b7bbb4cd9..000000000
Binary files a/Textures/Trees/mixed-summer.png and /dev/null differ
diff --git a/Textures/Trees/mixed-winter.dds b/Textures/Trees/mixed-winter.dds
deleted file mode 100644
index 0e23a2f07..000000000
Binary files a/Textures/Trees/mixed-winter.dds and /dev/null differ
diff --git a/Textures/Trees/mixed-winter.png b/Textures/Trees/mixed-winter.png
deleted file mode 100644
index 2b3a52f6f..000000000
Binary files a/Textures/Trees/mixed-winter.png and /dev/null differ
diff --git a/Textures/Trees/mixed.dds b/Textures/Trees/mixed.dds
new file mode 100644
index 000000000..dd98eb9fb
Binary files /dev/null and b/Textures/Trees/mixed.dds differ
diff --git a/Textures/Trees/mixed.png b/Textures/Trees/mixed.png
new file mode 100644
index 000000000..97dc262cf
Binary files /dev/null and b/Textures/Trees/mixed.png differ
diff --git a/Textures/Trees/tropical-alt.dds b/Textures/Trees/tropical-alt.dds
new file mode 100644
index 000000000..e3f915738
Binary files /dev/null and b/Textures/Trees/tropical-alt.dds differ
diff --git a/Textures/Trees/tropical-alt.png b/Textures/Trees/tropical-alt.png
new file mode 100644
index 000000000..7f9a33d2b
Binary files /dev/null and b/Textures/Trees/tropical-alt.png differ
diff --git a/Textures/Trees/tropical-summer.dds b/Textures/Trees/tropical-summer.dds
deleted file mode 100644
index 877e90cfd..000000000
Binary files a/Textures/Trees/tropical-summer.dds and /dev/null differ
diff --git a/Textures/Trees/tropical-summer.png b/Textures/Trees/tropical-summer.png
deleted file mode 100644
index 9fdfe0549..000000000
Binary files a/Textures/Trees/tropical-summer.png and /dev/null differ
diff --git a/Textures/Trees/tropical.dds b/Textures/Trees/tropical.dds
new file mode 100644
index 000000000..acc9936f1
Binary files /dev/null and b/Textures/Trees/tropical.dds differ
diff --git a/Textures/Trees/tropical.png b/Textures/Trees/tropical.png
new file mode 100644
index 000000000..6625f2a7b
Binary files /dev/null and b/Textures/Trees/tropical.png differ