fly/fgdata
1
0
Fork 0
Code Activity

Retire tree-density and wood-size from materials.xml. They have now been superseded by object masks.

Browse source
This commit is contained in:
Stuart Buchanan 2012-02-07 20:56:20 +00:00
parent 6918a999cf
commit de4cf84955
2 changed files with 45 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
materials-dds.xml
View file

@ -80,16 +80,9 @@ Properties currently used:
sub-entries: name, left (default: 0.0), right (default: 1.0) sub-entries: name, left (default: 0.0), right (default: 1.0)
(left and right describe the horizontal position in the texture.) (left and right describe the horizontal position in the texture.)
wood-coverage: The coverage of woods in m^2. A lower number means a wood-coverage: The coverage of trees in areas marked as woodland in
higher density of woods. A value of 0 indicates no woods. m^2. A lower number means a higher density of woods. A value of
0 indicates no woods.
wood-size: The average size of each wood in m^2. A lower number
means smaller individual woods. If not set, each wood is considered
to contain a single tree, causing even distribution.
tree-density: The area covered by each tree in the wood in m^2. A
lower number means denser individual woods. Ignored if wood-size
is not set.
tree-range-m: The range at which trees become visible. Note that this 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 is not absolute, as trees are loaded in blocks. A lower number means
@ -116,10 +109,7 @@ Properties currently used:
trees, which are then masked by the object-mask texture. Partial values 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 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, 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 it only has a 50% chance of being added.
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.
@ -3138,9 +3128,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.high/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures.high/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"/>
@ -3205,9 +3193,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.high/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures.high/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"/>
@ -3271,9 +3257,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.high/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures.high/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"/>
@ -3355,9 +3339,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>500000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures.high/Trees/mixed-winter.png</tree-texture> <tree-texture>Textures.high/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"/>

61
materials.xml
View file

@ -80,17 +80,10 @@ Properties currently used:
sub-entries: name, left (default: 0.0), right (default: 1.0) sub-entries: name, left (default: 0.0), right (default: 1.0)
(left and right describe the horizontal position in the texture.) (left and right describe the horizontal position in the texture.)
wood-coverage: The coverage of woods in m^2. A lower number means a wood-coverage: The coverage of trees in areas marked as woodland in
higher density of woods. A value of 0 indicates no woods. m^2. A lower number means a higher density of trees. A value of
0 indicates no woods.
wood-size: The average size of each wood in m^2. A lower number
means smaller individual woods. If not set, each wood is considered
to contain a single tree, causing even distribution.
tree-density: The area covered by each tree in the wood in m^2. A
lower number means denser individual woods. Ignored if wood-size
is not set.
tree-range-m: The range at which trees become visible. Note that this 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 is not absolute, as trees are loaded in blocks. A lower number means
trees will not become visible until you are closer. trees will not become visible until you are closer.
@ -116,10 +109,7 @@ Properties currently used:
trees, which are then masked by the object-mask texture. Partial values 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 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, 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 it only has a 50% chance of being added.
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.
@ -1197,7 +1187,6 @@ Shared parameters for various materials.
</object> </object>
</object-group> </object-group>
<wood-coverage>10000.0</wood-coverage> <wood-coverage>10000.0</wood-coverage>
<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"/>
@ -1700,6 +1689,7 @@ Shared parameters for various materials.
</condition> </condition>
<name>NaturalCrop</name> <name>NaturalCrop</name>
<texture>Terrain/naturalcrop1.png</texture> <texture>Terrain/naturalcrop1.png</texture>
<object-mask>Terrain/naturalcrop1.mask.png</object-mask>
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<solid>1</solid> <solid>1</solid>
@ -1708,9 +1698,21 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<wood-coverage>500000.0</wood-coverage> <object-group>
<wood-size>20000.0</wood-size> <range-m>5000</range-m>
<tree-density>5000.0</tree-density> <object>
<path>Models/Buildings/silo.ac</path>
<path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path>
<path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>10000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<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"/>
@ -1753,7 +1755,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>150000.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"/>
@ -2607,6 +2609,7 @@ Shared parameters for various materials.
</condition> </condition>
<name>NaturalCrop</name> <name>NaturalCrop</name>
<texture>Terrain.winter/naturalcrop1.png</texture> <texture>Terrain.winter/naturalcrop1.png</texture>
<object-mask>Terrain/naturalcrop1.mask.png</object-mask>
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<solid>1</solid> <solid>1</solid>
@ -2615,9 +2618,21 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness> <bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage> <light-coverage>2000000.0</light-coverage>
<wood-coverage>150000.0</wood-coverage> <object-group>
<wood-size>10000.0</wood-size> <range-m>5000</range-m>
<tree-density>5000.0</tree-density> <object>
<path>Models/Buildings/silo.ac</path>
<path>Models/Buildings/red-barn.ac</path>
<path>Models/Buildings/horse-stable.ac</path>
<path>Models/Buildings/cow-stable.ac</path>
<path>Models/Agriculture/farmhouse1.ac</path>
<path>Models/Agriculture/farmhouse2.ac</path>
<path>Models/Agriculture/farmhouse3.ac</path>
<coverage-m2>10000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<wood-coverage>10000.0</wood-coverage>
<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"/>
@ -2660,8 +2675,6 @@ Shared parameters for various materials.
<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>150000.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"/>