fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of gitorious.org:fg/fgdata

Browse source
This commit is contained in:
Frederic Bouvier 2012-02-06 00:37:11 +01:00
commit bbfb599885
30 changed files with 640 additions and 619 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Textures/Terrain/Town1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
Textures/Terrain/city1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
Textures/Terrain/city2.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
Textures/Terrain/cropgrass1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
Textures/Terrain/cropgrass2.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 91 KiB

BIN
Textures/Terrain/cropgrass3.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 92 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

BIN
Textures/Terrain/drycrop1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
Textures/Terrain/drycrop2.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
Textures/Terrain/drycrop3.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
Textures/Terrain/drycrop4.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
Textures/Terrain/golfcourse1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 88 KiB

BIN
Textures/Terrain/irrcrop1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 88 KiB

BIN
Textures/Terrain/irrcrop2.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
Textures/Terrain/irrcrop3.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
Textures/Terrain/mixedcrop1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 152 KiB

BIN
Textures/Terrain/mixedcrop2.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
Textures/Terrain/mixedcrop3.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
Textures/Terrain/mixedcrop3b.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Textures/Terrain/mixedcrop4.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
Textures/Terrain/naturalcrop1.mask.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

24
gui/dialogs/rendering.xml
View file

@ -199,6 +199,30 @@
</binding> </binding>
</checkbox> </checkbox>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text>
<label>Vegetation density</label>
</text>
<slider>
<name>vegetation-density</name>
<min>0</min>
<max>10.0</max>
<property>/sim/rendering/vegetation-density</property>
<binding>
<command>dialog-apply</command>
<object-name>vegetation-density</object-name>
</binding>
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<live>true</live>
<property>/sim/rendering/vegetation-density</property>
</text>
</group>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Animated jetways</label> <label>Animated jetways</label>

666
materials-dds.xml
View file

File diff suppressed because it is too large Load diff

562
materials.xml
View file

@ -109,6 +109,18 @@ Properties currently used:
effect - The name of an effect to inherit from. The default is effect - The name of an effect to inherit from. The default is
Effects/terrain-default. Effects/terrain-default.
object-mask: png file used as a mask for trees (green channel), buildings
(blue channel) and building rotation (red channel). Note that this is
used as a mask on the coverage-m2 and wood-coverage values. I.e. the
wood-coverage value is used to determine the placement of a number of
trees, which are then masked by the object-mask texture. Partial values
are randomly checked against, so a green value of 128 (0.5) means that
if the wood-coverage indicates that a tree is located at that point,
it only has a 50% chance of being added. Finally, note that if an
object-mask is defined, the tree-density and wood-size values are ignored,
and trees are placed evenly using theh wood-coverage value and
masked.
ambient, diffuse, specular, emissive, and shininess are copied into the ambient, diffuse, specular, emissive, and shininess are copied into the
parameter section of the effect created for this material. parameter section of the effect created for this material.
************************************************************************ ************************************************************************
@ -1120,6 +1132,8 @@ Shared parameters for various materials.
<texture>Terrain/city2.png</texture> <texture>Terrain/city2.png</texture>
<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/city2.mask.png</object-mask>
<!-- <!--
<texture-set> <texture-set>
<texture>Terrain/city3.png</texture> <texture>Terrain/city3.png</texture>
@ -1135,60 +1149,54 @@ 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/oil-tanks.ac</path> <path>Models/Buildings/factory.ac</path>
<coverage-m2>10000000</coverage-m2> <coverage-m2>40000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/big-apartment.ac</path> <path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2> <coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Residential/cube-apartment.ac</path> <path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path> <path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path> <path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>1000000</coverage-m2> <coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Commercial/small-glass-office-building.ac</path> <path>Models/Commercial/small-glass-office-building.ac</path>
<path>Models/Buildings/medium-glass-office-building.ac</path> <path>Models/Buildings/medium-glass-office-building.ac</path>
<path>Models/Buildings/small-modern-office.ac</path> <path>Models/Buildings/small-modern-office.ac</path>
<path>Models/Buildings/small-office.ac</path> <path>Models/Buildings/small-office.ac</path>
<coverage-m2>500000</coverage-m2> <coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/big-church.ac</path> <path>Models/Buildings/big-church.ac</path>
<coverage-m2>5000000</coverage-m2> <coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/brick-school.ac</path> <path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path> <path>Models/Buildings/bank-building.ac</path>
<coverage-m2>4000000</coverage-m2> <coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/water-tower.ac</path> <path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2> <coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> </object-group>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density> <tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties> <tree-varieties>8</tree-varieties>
@ -1207,6 +1215,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>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -1216,38 +1225,36 @@ 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/water-tower.ac</path> <path>Models/Buildings/water-tower.ac</path>
<path>Models/Buildings/oil-tanks.ac</path> <path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>20000000</coverage-m2> <coverage-m2>2000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/big-church.ac</path> <path>Models/Buildings/big-church.ac</path>
<path>Models/Buildings/brick-school.ac</path> <path>Models/Buildings/brick-school.ac</path>
<coverage-m2>200000</coverage-m2> <coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/shop.ac</path> <path>Models/Buildings/shop.ac</path>
<path>Models/Buildings/hosshop.ac</path> <path>Models/Buildings/hosshop.ac</path>
<path>Models/Buildings/weapshop.ac</path> <path>Models/Buildings/weapshop.ac</path>
<coverage-m2>400000</coverage-m2> <coverage-m2>20000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Residential/germanvillagehouse1.ac</path> <path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Residential/MontHse1Grey_White.ac</path> <path>Models/Residential/MontHse1Grey_White.ac</path>
<path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path> <path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path>
<coverage-m2>30000</coverage-m2> <coverage-m2>5000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
</object-group> </object-group>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>5000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</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"/>
@ -1505,6 +1512,9 @@ Shared parameters for various materials.
<texture>Terrain/mixedcrop1.png</texture> <texture>Terrain/mixedcrop1.png</texture>
<texture>Terrain/mixedcrop4.png</texture> <texture>Terrain/mixedcrop4.png</texture>
<texture>Terrain/mixedcrop3.png</texture> <texture>Terrain/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> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -1514,22 +1524,18 @@ Shared parameters for various materials.
<bumpiness>0.7</bumpiness> <bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -1547,9 +1553,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>1000000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>4000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</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"/>
@ -1574,6 +1578,9 @@ Shared parameters for various materials.
<texture>Terrain/irrcrop1.png</texture> <texture>Terrain/irrcrop1.png</texture>
<texture>Terrain/irrcrop2.png</texture> <texture>Terrain/irrcrop2.png</texture>
<texture>Terrain/irrcrop3.png</texture> <texture>Terrain/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> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -1583,22 +1590,18 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -1616,7 +1619,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>500000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</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"/>
@ -1638,6 +1641,10 @@ Shared parameters for various materials.
<texture>Terrain/drycrop2.png</texture> <texture>Terrain/drycrop2.png</texture>
<texture>Terrain/drycrop3.png</texture> <texture>Terrain/drycrop3.png</texture>
<texture>Terrain/drycrop4.png</texture> <texture>Terrain/drycrop4.png</texture>
<object-mask>Terrain/drycrop1.mask.png</object-mask>
<object-mask>Terrain/drycrop2.mask.png</object-mask>
<object-mask>Terrain/drycrop3.mask.png</object-mask>
<object-mask>Terrain/drycrop4.mask.png</object-mask>
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<solid>1</solid> <solid>1</solid>
@ -1647,22 +1654,18 @@ Shared parameters for various materials.
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -1680,9 +1683,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>500000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</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"/>
@ -1769,6 +1770,7 @@ Shared parameters for various materials.
</condition> </condition>
<name>GolfCourse</name> <name>GolfCourse</name>
<texture>Terrain/golfcourse1.png</texture> <texture>Terrain/golfcourse1.png</texture>
<object-mask>Terrain/golfcourse1.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>
@ -1790,7 +1792,7 @@ Shared parameters for various materials.
<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>5000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture> <tree-texture>Textures/Trees/mixed-summer.png</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"/>
@ -1810,6 +1812,7 @@ Shared parameters for various materials.
<name>AgroForest</name> <name>AgroForest</name>
<effect>Effects/landmass</effect> <effect>Effects/landmass</effect>
<texture>Terrain/cropwood.png</texture> <texture>Terrain/cropwood.png</texture>
<object-mask>Terrain/cropwood.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>
@ -2039,6 +2042,8 @@ Shared parameters for various materials.
<texture>Terrain/city2.png</texture> <texture>Terrain/city2.png</texture>
<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/city2.mask.png</object-mask>
<!-- <!--
<texture-set> <texture-set>
<texture>Terrain/city3.png</texture> <texture>Terrain/city3.png</texture>
@ -2055,60 +2060,58 @@ Shared parameters for various materials.
<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/oil-tanks.ac</path> <path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2> <coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/big-apartment.ac</path> <path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2> <coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/factory.ac</path> <path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2> <coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
</object-group> </object-group>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Residential/cube-apartment.ac</path> <path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path> <path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path> <path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>1000000</coverage-m2> <coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Commercial/small-glass-office-building.ac</path> <path>Models/Commercial/small-glass-office-building.ac</path>
<path>Models/Buildings/medium-glass-office-building.ac</path> <path>Models/Buildings/medium-glass-office-building.ac</path>
<path>Models/Buildings/small-modern-office.ac</path> <path>Models/Buildings/small-modern-office.ac</path>
<path>Models/Buildings/small-office.ac</path> <path>Models/Buildings/small-office.ac</path>
<coverage-m2>500000</coverage-m2> <coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/big-church.ac</path> <path>Models/Buildings/big-church.ac</path>
<coverage-m2>5000000</coverage-m2> <coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/brick-school.ac</path> <path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path> <path>Models/Buildings/bank-building.ac</path>
<coverage-m2>4000000</coverage-m2> <coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>mask</heading-type>
</object> </object>
<object> <object>
<path>Models/Buildings/water-tower.ac</path> <path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2> <coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> </object-group>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2126,6 +2129,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>
<xsize>1024</xsize> <xsize>1024</xsize>
<ysize>1024</ysize> <ysize>1024</ysize>
<light-coverage>100000.0</light-coverage> <light-coverage>100000.0</light-coverage>
@ -2135,47 +2139,36 @@ 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/oil-tanks.ac</path> <path>Models/Buildings/water-tower.ac</path>
<coverage-m2>20000000</coverage-m2> <path>Models/Buildings/oil-tanks.ac</path>
<heading-type>random</heading-type> <coverage-m2>2000000</coverage-m2>
</object> <heading-type>random</heading-type>
<object> </object>
<path>Models/Buildings/big-church.ac</path> <object>
<coverage-m2>900000</coverage-m2> <path>Models/Buildings/big-church.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/brick-school.ac</path>
</object> <coverage-m2>100000</coverage-m2>
<object> <heading-type>mask</heading-type>
<path>Models/Buildings/shop.ac</path> </object>
<coverage-m2>400000</coverage-m2> <object>
<heading-type>random</heading-type> <path>Models/Buildings/shop.ac</path>
</object> <path>Models/Buildings/hosshop.ac</path>
<object> <path>Models/Buildings/weapshop.ac</path>
<path>Models/Buildings/hosshop.ac</path> <coverage-m2>20000</coverage-m2>
<coverage-m2>750000</coverage-m2> <heading-type>mask</heading-type>
<heading-type>random</heading-type> </object>
</object> <object>
<object> <path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Buildings/weapshop.ac</path> <path>Models/Residential/MontHse1Grey_White.ac</path>
<coverage-m2>400000</coverage-m2> <path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path>
<heading-type>random</heading-type> <coverage-m2>5000</coverage-m2>
</object> <heading-type>mask</heading-type>
<object> </object>
<path>Models/Buildings/brick-school.ac</path>
<coverage-m2>2850000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<wood-coverage>250000.0</wood-coverage> <wood-coverage>5000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2428,6 +2421,9 @@ Shared parameters for various materials.
<texture>Terrain.winter/mixedcrop1.png</texture> <texture>Terrain.winter/mixedcrop1.png</texture>
<texture>Terrain.winter/mixedcrop4.png</texture> <texture>Terrain.winter/mixedcrop4.png</texture>
<texture>Terrain.winter/mixedcrop3.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> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -2437,22 +2433,18 @@ Shared parameters for various materials.
<bumpiness>0.7</bumpiness> <bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -2470,9 +2462,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>1000000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>4000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2496,6 +2486,9 @@ Shared parameters for various materials.
<texture>Terrain.winter/irrcrop1.png</texture> <texture>Terrain.winter/irrcrop1.png</texture>
<texture>Terrain.winter/irrcrop2.png</texture> <texture>Terrain.winter/irrcrop2.png</texture>
<texture>Terrain.winter/irrcrop3.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> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
@ -2505,22 +2498,18 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -2538,9 +2527,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>150000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2561,6 +2548,10 @@ Shared parameters for various materials.
<texture>Terrain.winter/drycrop2.png</texture> <texture>Terrain.winter/drycrop2.png</texture>
<texture>Terrain.winter/drycrop3.png</texture> <texture>Terrain.winter/drycrop3.png</texture>
<texture>Terrain.winter/drycrop4.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> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<solid>1</solid> <solid>1</solid>
@ -2570,22 +2561,18 @@ Shared parameters for various materials.
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<object-group> <object-group>
<range-m>5000</range-m> <range-m>5000</range-m>
<object> <object>
<path>Models/Buildings/silo.ac</path> <path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2> <path>Models/Buildings/red-barn.ac</path>
<heading-type>random</heading-type> <path>Models/Buildings/horse-stable.ac</path>
</object> <path>Models/Buildings/cow-stable.ac</path>
<object> <path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Buildings/red-barn.ac</path> <path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Buildings/horse-stable.ac</path> <path>Models/Agriculture/farmhouse3.ac</path>
<path>Models/Buildings/cow-stable.ac</path> <coverage-m2>10000</coverage-m2>
<path>Models/Agriculture/farmhouse1.ac</path> <heading-type>mask</heading-type>
<path>Models/Agriculture/farmhouse2.ac</path> </object>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group> </object-group>
<!-- Disabled to avoid a tremendous osg performance penalty when <!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared deleting scenery tiles, caused by tens of thousands of shared
@ -2603,9 +2590,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type> <heading-type>random</heading-type>
</object> </object>
</object-group> --> </object-group> -->
<wood-coverage>150000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2693,6 +2678,7 @@ Shared parameters for various materials.
</condition> </condition>
<name>GolfCourse</name> <name>GolfCourse</name>
<texture>Terrain.winter/golfcourse.png</texture> <texture>Terrain.winter/golfcourse.png</texture>
<object-mask>Terrain/golfcourse1.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>
@ -2714,9 +2700,7 @@ Shared parameters for various materials.
<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>150000.0</wood-coverage> <wood-coverage>5000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures/Trees/mixed-winter.png</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"/>
@ -2732,8 +2716,10 @@ Shared parameters for various materials.
</equals> </equals>
</condition> </condition>
<name>CropWoodCover</name> <name>CropWoodCover</name>
<name>CropWood</name>
<name>AgroForest</name> <name>AgroForest</name>
<texture>Terrain.winter/cropwood.png</texture> <texture>Terrain.winter/cropwood.png</texture>
<object-mask>Terrain/cropwood.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>

7
preferences.xml
View file

@ -103,10 +103,9 @@ Started September 2000 by David Megginson, david@megginson.com
<ai-detailed type="double" userarchive="y">10000</ai-detailed> <ai-detailed type="double" userarchive="y">10000</ai-detailed>
<!-- ai-bare type="double" userarchive="y">10000</ai-bare --> <!-- ai-bare type="double" userarchive="y">10000</ai-bare -->
</static-lod> </static-lod>
<random-objects type="bool" <random-objects type="bool" userarchive="y">true</random-objects>
userarchive="y">true</random-objects> <random-vegetation type="bool" userarchive="y">true</random-vegetation>
<random-vegetation type="bool" <vegetation-density type="double" userarchive="y">1.0</vegetation-density>
userarchive="y">true</random-vegetation>
<horizon-effect type="bool" <horizon-effect type="bool"
userarchive="y">false</horizon-effect> userarchive="y">false</horizon-effect>
<point-sprites type="bool" <point-sprites type="bool"