fly/fgdata
1
0
Fork 0
Code Activity

Revert "countryside.mask convert to .dds. Flip png version to keep correct orientation"

Browse source 
This reverts commit beb89d56d0e02dd27316f6f68368394a6ff5c091.
This commit is contained in:
Emilian Huminiuc 2012-02-27 01:56:46 +02:00
parent 83df7f0f75
commit 90924a359d
6 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Materials/dds/materials.xml
View file

@ -901,7 +901,7 @@
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group include="Materials/base/urban-buildings.xml"/> <object-group include="Materials/base/urban-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<tree-texture>Trees/mixed-summer.png</tree-texture> <tree-texture>Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
@ -941,7 +941,7 @@
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group include="Materials/base/industrial-buildings.xml"/> <object-group include="Materials/base/industrial-buildings.xml"/>
</material> </material>
<material> <material>
@ -976,7 +976,7 @@
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group include="Materials/base/urban-buildings.xml"/> <object-group include="Materials/base/urban-buildings.xml"/>
<wood-coverage>25000.0</wood-coverage> <wood-coverage>25000.0</wood-coverage>
<tree-texture>Trees/mixed-summer.dds</tree-texture> <tree-texture>Trees/mixed-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
@ -996,7 +996,7 @@
<name>Town</name> <name>Town</name>
<name>SubUrban</name> <name>SubUrban</name>
<texture>Terrain/Town1.png</texture> <texture>Terrain/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask> <object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -1389,10 +1389,10 @@
<texture>Terrain/countryside4.green.dds</texture> <texture>Terrain/countryside4.green.dds</texture>
<texture n="4">Terrain.winter/countryside4.winter.dds</texture> <texture n="4">Terrain.winter/countryside4.winter.dds</texture>
</texture-set> </texture-set>
<object-mask>Terrain/countryside1.green.mask.dds</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.green.mask.dds</object-mask> <object-mask>Terrain/countryside2.green.mask.png</object-mask>
<object-mask>Terrain/countryside3.green.mask.dds</object-mask> <object-mask>Terrain/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.dds</object-mask> <object-mask>Terrain/countryside4.green.mask.png</object-mask>
<xsize>1800</xsize> <xsize>1800</xsize>
<ysize>1800</ysize> <ysize>1800</ysize>
<solid>1</solid> <solid>1</solid>
@ -1778,7 +1778,7 @@
<texture n="2">Terrain/city2-relief-light.png</texture> <texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set> </texture-set>
<object-mask>Terrain/city1.mask.png</object-mask> <object-mask>Terrain/city1.mask.png</object-mask>
<object-mask>Terrain/city2.mask.png</object-mask> <object-mask>Terrain/city2.mask.png</object-mask>
<object-mask>Terrain/city1.mask.png</object-mask> <object-mask>Terrain/city1.mask.png</object-mask>
<object-mask>Terrain/city2.mask.png</object-mask> <object-mask>Terrain/city2.mask.png</object-mask>
<xsize>1000</xsize> <xsize>1000</xsize>
@ -1790,7 +1790,7 @@
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group include="Materials/base/urban-buildings.xml"/> <object-group include="Materials/base/urban-buildings.xml"/>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>250000.0</wood-coverage>
<tree-texture>Trees/mixed-winter.png</tree-texture> <tree-texture>Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
@ -1823,7 +1823,7 @@
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group include="Materials/base/industrial-buildings.xml"/> <object-group include="Materials/base/industrial-buildings.xml"/>
</material> </material>
<material> <material>
@ -1836,7 +1836,7 @@
<name>Town</name> <name>Town</name>
<name>SubUrban</name> <name>SubUrban</name>
<texture>Terrain.winter/Town1.png</texture> <texture>Terrain.winter/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask> <object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -2172,10 +2172,10 @@
<texture >Terrain.winter/countryside2.winter.dds</texture> <texture >Terrain.winter/countryside2.winter.dds</texture>
<texture >Terrain.winter/countryside3.winter.dds</texture> <texture >Terrain.winter/countryside3.winter.dds</texture>
<texture >Terrain.winter/countryside3.winter.dds</texture> <texture >Terrain.winter/countryside3.winter.dds</texture>
<object-mask>Terrain/countryside1.green.mask.dds</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.green.mask.dds</object-mask> <object-mask>Terrain/countryside2.green.mask.png</object-mask>
<object-mask>Terrain/countryside3.green.mask.dds</object-mask> <object-mask>Terrain/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.dds</object-mask> <object-mask>Terrain/countryside4.green.mask.png</object-mask>
<xsize>1800</xsize> <xsize>1800</xsize>
<ysize>1800</ysize> <ysize>1800</ysize>
<solid>1</solid> <solid>1</solid>

BIN
Textures/Terrain/countryside1.green.mask.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
Textures/Terrain/countryside2.green.mask.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
Textures/Terrain/countryside3.green.mask.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
Textures/Terrain/countryside4.green.mask.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

26
materials-dds.xml
View file

@ -10,7 +10,7 @@ Shared parameters for various materials.
<forest> <forest>
<!-- Maximum distance from which a tree is visible --> <!-- Maximum distance from which a tree is visible -->
<tree-range-m>8000</tree-range-m> <tree-range-m>8000</tree-range-m>
</forest> </forest>
</params> </params>
<material> <material>
@ -1243,7 +1243,7 @@ Shared parameters for various materials.
<b>0.02</b> <b>0.02</b>
<a>1.0</a> <a>1.0</a>
</emissive> </emissive>
<object-group> <object-group>
<range-m>10000</range-m> <range-m>10000</range-m>
<object> <object>
<path>Models/Buildings/factory.ac</path> <path>Models/Buildings/factory.ac</path>
@ -1585,7 +1585,7 @@ Shared parameters for various materials.
<name>Town</name> <name>Town</name>
<name>SubUrban</name> <name>SubUrban</name>
<texture>Terrain/Town1.png</texture> <texture>Terrain/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask> <object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -2065,10 +2065,10 @@ Shared parameters for various materials.
<texture>Terrain/countryside4.green.dds</texture> <texture>Terrain/countryside4.green.dds</texture>
<texture n="4">Terrain.winter/countryside4.winter.dds</texture> <texture n="4">Terrain.winter/countryside4.winter.dds</texture>
</texture-set> </texture-set>
<object-mask>Terrain/countryside1.green.mask.dds</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.green.mask.dds</object-mask> <object-mask>Terrain/countryside2.green.mask.png</object-mask>
<object-mask>Terrain/countryside3.green.mask.dds</object-mask> <object-mask>Terrain/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.dds</object-mask> <object-mask>Terrain/countryside4.green.mask.png</object-mask>
<xsize>1800</xsize> <xsize>1800</xsize>
<ysize>1800</ysize> <ysize>1800</ysize>
<solid>1</solid> <solid>1</solid>
@ -2499,7 +2499,7 @@ Shared parameters for various materials.
<texture n="2">Terrain/city2-relief-light.png</texture> <texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set> </texture-set>
<object-mask>Terrain/city1.mask.png</object-mask> <object-mask>Terrain/city1.mask.png</object-mask>
<object-mask>Terrain/city2.mask.png</object-mask> <object-mask>Terrain/city2.mask.png</object-mask>
<!-- <!--
<texture-set> <texture-set>
<texture>Terrain/city3.png</texture> <texture>Terrain/city3.png</texture>
@ -2677,7 +2677,7 @@ Shared parameters for various materials.
<name>Town</name> <name>Town</name>
<name>SubUrban</name> <name>SubUrban</name>
<texture>Terrain.winter/Town1.png</texture> <texture>Terrain.winter/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask> <object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -3100,10 +3100,10 @@ Shared parameters for various materials.
<texture >Terrain.winter/countryside2.winter.dds</texture> <texture >Terrain.winter/countryside2.winter.dds</texture>
<texture >Terrain.winter/countryside3.winter.dds</texture> <texture >Terrain.winter/countryside3.winter.dds</texture>
<texture >Terrain.winter/countryside3.winter.dds</texture> <texture >Terrain.winter/countryside3.winter.dds</texture>
<object-mask>Terrain/countryside1.green.mask.dds</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.green.mask.dds</object-mask> <object-mask>Terrain/countryside2.green.mask.png</object-mask>
<object-mask>Terrain/countryside3.green.mask.dds</object-mask> <object-mask>Terrain/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.dds</object-mask> <object-mask>Terrain/countryside4.green.mask.png</object-mask>
<xsize>1800</xsize> <xsize>1800</xsize>
<ysize>1800</ysize> <ysize>1800</ysize>
<solid>1</solid> <solid>1</solid>