fly/fgdata
1
0
Fork 0
Code Activity

cleanup and optimization of dds terrain textures

Browse source 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-07-07 23:36:40 +03:00
parent 78a45dbd25
commit 786ab23d7c
8 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Effects/transition-base-grass-inverse.eff
View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from> <inherits-from>Effects/transition</inherits-from>
<parameters> <parameters>
<texture n="3"> <texture n="3">
<image>Textures.high/Terrain/grass12.dds</image> <image>Textures.high/Terrain/herbtundra.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>

60
Materials/dds/materials.xml
View file

@ -836,9 +836,9 @@
<name>Sclerophyllous</name> <name>Sclerophyllous</name>
<name>Heath</name> <name>Heath</name>
<texture>Terrain/shrub.dds</texture> <texture>Terrain/shrub.dds</texture>
<texture>Terrain/shrub1.dds</texture> <!--<texture>Terrain/shrub1.dds</texture>
<texture>Terrain/shrub2.dds</texture> <texture>Terrain/shrub2.dds</texture>
<texture>Terrain/shrub3.dds</texture> <texture>Terrain/shrub3.dds</texture>-->
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<diffuse> <diffuse>
@ -1158,7 +1158,7 @@
<name>Cemetery</name> <name>Cemetery</name>
<effect>Effects/transition-base-rock</effect> <effect>Effects/transition-base-rock</effect>
<texture>Terrain/grass10c.dds</texture> <texture>Terrain/grass10c.dds</texture>
<texture>Terrain/grass10b.dds</texture> <!-- <texture>Terrain/grass10b.dds</texture> -->
<xsize>500</xsize> <xsize>500</xsize>
<ysize>500</ysize> <ysize>500</ysize>
<light-coverage>4000000.0</light-coverage> <light-coverage>4000000.0</light-coverage>
@ -1193,8 +1193,8 @@
<name>HerbTundra</name> <name>HerbTundra</name>
<effect>Effects/transition-base-rock</effect> <effect>Effects/transition-base-rock</effect>
<texture>Terrain/herbtundra.dds</texture> <texture>Terrain/herbtundra.dds</texture>
<texture>Terrain/herbtundra2.dds</texture> <!-- <texture>Terrain/herbtundra2.dds</texture>
<texture>Terrain/herbtundra3.dds</texture> <texture>Terrain/herbtundra3.dds</texture>-->
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>4000000.0</light-coverage> <light-coverage>4000000.0</light-coverage>
@ -1251,7 +1251,7 @@
<name>Greenspace</name> <name>Greenspace</name>
<effect>Effects/transition-base-dirt</effect> <effect>Effects/transition-base-dirt</effect>
<texture>Terrain/grass10b.dds</texture> <texture>Terrain/grass10b.dds</texture>
<texture>Terrain/grass10c.dds</texture> <!-- <texture>Terrain/grass10c.dds</texture> -->
<xsize>250</xsize> <xsize>250</xsize>
<ysize>250</ysize> <ysize>250</ysize>
<light-coverage>4000000.0</light-coverage> <light-coverage>4000000.0</light-coverage>
@ -1286,12 +1286,14 @@
<name>MixedCropPastureCover</name> <name>MixedCropPastureCover</name>
<name>MixedCrop</name> <name>MixedCrop</name>
<name>ComplexCrop</name> <name>ComplexCrop</name>
<texture>Terrain/mixedcrop1.dds</texture> <texture>Terrain/countryside1.green.dds</texture>
<!-- <texture>Terrain/mixedcrop1.dds</texture>
<texture>Terrain/mixedcrop4.dds</texture> <texture>Terrain/mixedcrop4.dds</texture>
<texture>Terrain/mixedcrop3.dds</texture> <texture>Terrain/mixedcrop3.dds</texture>-->
<object-mask>Terrain/mixedcrop1.mask.png</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<!-- <object-mask>Terrain/mixedcrop1.mask.png</object-mask>
<object-mask>Terrain/mixedcrop4.mask.png</object-mask> <object-mask>Terrain/mixedcrop4.mask.png</object-mask>
<object-mask>Terrain/mixedcrop3.mask.png</object-mask> <object-mask>Terrain/mixedcrop3.mask.png</object-mask>-->
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -1301,7 +1303,7 @@
<bumpiness>0.7</bumpiness> <bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/> <object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage> <wood-coverage>2000.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>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>
@ -1323,12 +1325,14 @@
<name>Olives</name> <name>Olives</name>
<name>Vineyard</name> <name>Vineyard</name>
<name>Rice</name> <name>Rice</name>
<texture>Terrain/irrcrop1.dds</texture> <texture>Terrain/irrcrop.dds</texture>
<!--<texture>Terrain/irrcrop1.dds</texture>
<texture>Terrain/irrcrop2.dds</texture> <texture>Terrain/irrcrop2.dds</texture>
<texture>Terrain/irrcrop3.dds</texture> <texture>Terrain/irrcrop3.dds</texture>-->
<object-mask>Terrain/irrcrop1.mask.png</object-mask> <object-mask>Terrain/irrcrop-dds.mask.png</object-mask>
<!--<object-mask>Terrain/irrcrop1.mask.png</object-mask>
<object-mask>Terrain/irrcrop2.mask.png</object-mask> <object-mask>Terrain/irrcrop2.mask.png</object-mask>
<object-mask>Terrain/irrcrop3.mask.png</object-mask> <object-mask>Terrain/irrcrop3.mask.png</object-mask>-->
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -1338,7 +1342,7 @@
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group include="Materials/base/farm-buildings.xml"/> <object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>10000.0</wood-coverage> <wood-coverage>2000.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>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>
@ -1357,7 +1361,7 @@
<name>DryCropPastureCover</name> <name>DryCropPastureCover</name>
<name>DryCrop</name> <name>DryCrop</name>
<texture-set> <texture-set>
<texture>Terrain/countryside1.green.dds</texture> <texture>Terrain/uk_countryside1.dds</texture>
<texture n="4">Terrain.winter/countryside1.winter.dds</texture> <texture n="4">Terrain.winter/countryside1.winter.dds</texture>
</texture-set> </texture-set>
<!--<texture-set> <!--<texture-set>
@ -1373,9 +1377,9 @@
<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.png</object-mask> <object-mask>Terrain/countryside1.green.mask.png</object-mask>
<object-mask>Terrain/countryside2.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/countryside3.green.mask.png</object-mask>
<object-mask>Terrain/countryside4.green.mask.png</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>
@ -1385,7 +1389,7 @@
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<object-group include="Materials/base/farm-buildings.xml"/> <object-group include="Materials/base/farm-buildings.xml"/>
<wood-coverage>4000.0</wood-coverage> <wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/deciduous-summer.dds</tree-texture> <tree-texture>Trees/deciduous-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>
@ -1432,10 +1436,12 @@
<name>CropGrassCover</name> <name>CropGrassCover</name>
<name>CropGrass</name> <name>CropGrass</name>
<name>Grassland</name> <name>Grassland</name>
<texture>Terrain/cropgrass1.dds</texture> <texture>Terrain/cropgrass.dds</texture>
<texture>Terrain/cropgrass2.dds</texture> <!--<texture>Terrain/cropgrass1.dds</texture>
<xsize>1500</xsize> <texture>Terrain/cropgrass2.dds</texture>-->
<ysize>1500</ysize> <object-mask>Terrain/cropgrass-dds.mask.png</object-mask>
<xsize>1399</xsize>
<ysize>1399</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<diffuse> <diffuse>
<r>0.93</r> <r>0.93</r>
@ -1455,7 +1461,7 @@
<rolling-friction>0.1</rolling-friction> <rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness> <bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<wood-coverage>500000.0</wood-coverage> <wood-coverage>2000.0</wood-coverage>
<tree-texture>Trees/deciduous-summer.dds</tree-texture> <tree-texture>Trees/deciduous-summer.dds</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>
@ -1515,7 +1521,7 @@
<name>AgroForest</name> <name>AgroForest</name>
<effect>Effects/transition-base-dirt</effect> <effect>Effects/transition-base-dirt</effect>
<texture>Terrain/cropwood.dds</texture> <texture>Terrain/cropwood.dds</texture>
<object-mask>Terrain/cropwood.mask.png</object-mask> <object-mask>Terrain/cropwood-dds.mask.png</object-mask>
<xsize>1500</xsize> <xsize>1500</xsize>
<ysize>1500</ysize> <ysize>1500</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -1524,7 +1530,7 @@
<rolling-friction>0.6</rolling-friction> <rolling-friction>0.6</rolling-friction>
<bumpiness>0.7</bumpiness> <bumpiness>0.7</bumpiness>
<load-resistance>10</load-resistance> <load-resistance>10</load-resistance>
<wood-coverage>4000.0</wood-coverage> <wood-coverage>2000.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>
<tree-range-m alias="/params/forest/tree-range-m"/> <tree-range-m alias="/params/forest/tree-range-m"/>

BIN
Textures/Terrain/crop.dds
View file

Binary file not shown.

BIN
Textures/Terrain/cropgrass-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
Textures/Terrain/cropgrass.dds
View file

Binary file not shown.

BIN
Textures/Terrain/cropwood-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Textures/Terrain/forest.dds
View file

Binary file not shown.

BIN
Textures/Terrain/irrcrop-dds.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB