From a511a1d0204fb061c77c4edbea5f64904a3f6b2d Mon Sep 17 00:00:00 2001
From: timoore <timoore>
Date: Sat, 2 Feb 2008 23:10:08 +0000
Subject: [PATCH] Specification of random tree models and densities. From
 Stuart Buchanan.

---
 materials.xml | 103 ++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/materials.xml b/materials.xml
index 45e6a1499..d0c16acc2 100644
--- a/materials.xml
+++ b/materials.xml
@@ -79,6 +79,22 @@ Properties currently used:
   glyph: group that defines one letter/digit/symbol in a font texture
     subentries: name, left (default: 0.0), right (default: 1.0)
     (left and right describe the horizontal position in the texture.)
+    
+  tree-coverage: The coverage of trees in m^2. A lower number means a 
+    higher density of trees. A value of 0 indicates no trees.
+    
+  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. Multiple textures may be
+    defined, but currently each tile will only use one of them.
+    
+  tree-height-m: The average height of the trees cover. Actual tree height
+    will vary by +/- 20%.
+  
+  tree-width-m: The average width of the tree cover. Actual tree width
+    will vary by +/- 20%.
 ************************************************************************
 -->
 
@@ -90,9 +106,7 @@ Shared parameters for various materials.
 <params>
  <forest>
   <!-- Maximum distance from which a tree is visible -->
-  <tree-range-m>2000</tree-range-m>
-  <!-- Average number of square meters per tree with one type -->
-  <tree-coverage-m2>10000</tree-coverage-m2>
+  <tree-range-m>8000</tree-range-m>
  </forest>
 </params>
 
@@ -652,17 +666,14 @@ Shared parameters for various materials.
  <xsize>2000</xsize>
  <ysize>2000</ysize>
  <light-coverage>10000000.0</light-coverage>
+ <tree-coverage>4000.0</tree-coverage>
+ <tree-texture>Models/Trees/coniferous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/coniferous-tree2.rgb</tree-texture>
+ <tree-range-m alias="/params/forest/tree-range-m"/>
+ <tree-height-m>6.0</tree-height-m>
+ <tree-width-m>4.0</tree-width-m>
  <rolling-friction>1</rolling-friction>
  <bumpiness>1</bumpiness>
- <object-group>
-  <range-m alias="/params/forest/tree-range-m"/>
-  <object>
-   <path>Models/Trees/coniferous-tree.ac</path>
-   <path>Models/Trees/coniferous-tree3.ac</path>
-   <coverage-m2 alias="/params/forest/tree-coverage-m2"/>
-   <heading-type>billboard</heading-type>
-  </object>
- </object-group>
 </material>
 
 <material>
@@ -674,18 +685,14 @@ Shared parameters for various materials.
  <xsize>2000</xsize>
  <ysize>2000</ysize>
  <light-coverage>10000000.0</light-coverage>
+ <tree-coverage>4000.0</tree-coverage>
+ <tree-texture>Models/Trees/deciduous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/deciduous-tree2.rgb</tree-texture>
+ <tree-range-m alias="/params/forest/tree-range-m"/>
+ <tree-height-m>5.0</tree-height-m>
+ <tree-width-m>4.0</tree-width-m>
  <rolling-friction>1</rolling-friction>
  <bumpiness>0.85</bumpiness>
- <object-group>
-  <range-m alias="/params/forest/tree-range-m"/>
-  <object>
-   <path>Models/Trees/deciduous-tree.ac</path>
-   <path>Models/Trees/deciduous-tree2.ac</path>
-   <path>Models/Trees/deciduous-tree3.ac</path>
-   <coverage-m2 alias="/params/forest/tree-coverage-m2"/>
-   <heading-type>billboard</heading-type>
-  </object>
- </object-group>
 </material>
 
 <material>
@@ -696,21 +703,16 @@ Shared parameters for various materials.
  <xsize>2000</xsize>
  <ysize>2000</ysize>
  <light-coverage>5000000.0</light-coverage>
+ <tree-coverage>4000.0</tree-coverage>
+ <tree-texture>Models/Trees/deciduous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/deciduous-tree2.rgb</tree-texture>
+ <tree-texture>Models/Trees/coniferous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/coniferous-tree2.rgb</tree-texture>
+ <tree-range-m alias="/params/forest/tree-range-m"/>
+ <tree-height-m>5.0</tree-height-m>
+ <tree-width-m>4.0</tree-width-m>
  <rolling-friction>1</rolling-friction>
  <bumpiness>0.95</bumpiness>
- <object-group>
-  <range-m alias="/params/forest/tree-range-m"/>
-  <object>
-   <path>Models/Trees/deciduous-tree.ac</path>
-   <path>Models/Trees/deciduous-tree2.ac</path>
-   <path>Models/Trees/deciduous-tree3.ac</path>
-   <path>Models/Trees/coniferous-tree.ac</path>
-   <path>Models/Trees/coniferous-tree2.ac</path>
-   <path>Models/Trees/deciduous-tree3.ac</path>
-   <coverage-m2 alias="/params/forest/tree-coverage-m2"/>
-   <heading-type>billboard</heading-type>
-  </object>
- </object-group>
 </material>
 
 <material>
@@ -720,17 +722,14 @@ Shared parameters for various materials.
  <xsize>1000</xsize>
  <ysize>1000</ysize>
  <light-coverage>10000000.0</light-coverage>
+ <tree-coverage>4000.0</tree-coverage>
+ <tree-texture>Models/Trees/coniferous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/coniferous-tree2.rgb</tree-texture>
+ <tree-range-m alias="/params/forest/tree-range-m"/>
+ <tree-height-m>7.0</tree-height-m>
+ <tree-width-m>4.0</tree-width-m>
  <rolling-friction>1</rolling-friction>
  <bumpiness>1</bumpiness>
- <object-group>
-  <range-m alias="/params/forest/tree-range-m"/>
-  <object>
-   <path>Models/Trees/coniferous-tree.ac</path>
-   <path>Models/Trees/deciduous-tree3.ac</path>
-   <coverage-m2 alias="/params/forest/tree-coverage-m2"/>
-   <heading-type>billboard</heading-type>
-  </object>
- </object-group>
 </material>
 
 <material>
@@ -739,18 +738,14 @@ Shared parameters for various materials.
  <xsize>1000</xsize>
  <ysize>1000</ysize>
  <light-coverage>10000000.0</light-coverage>
+ <tree-coverage>4000.0</tree-coverage>
+ <tree-texture>Models/Trees/coniferous-tree.rgb</tree-texture>
+ <tree-texture>Models/Trees/coniferous-tree2.rgb</tree-texture>
+ <tree-range-m alias="/params/forest/tree-range-m"/>
+ <tree-height-m>5.0</tree-height-m>
+ <tree-width-m>4.0</tree-width-m>
  <rolling-friction>1</rolling-friction>
  <bumpiness>1</bumpiness>
- <object-group>
-  <range-m alias="/params/forest/tree-range-m"/>
-  <object>
-   <path>Models/Trees/deciduous-tree.ac</path>
-   <path>Models/Trees/deciduous-tree2.ac</path>
-   <path>Models/Trees/deciduous-tree3.ac</path>
-   <coverage-m2 alias="/params/forest/tree-coverage-m2"/>
-   <heading-type>billboard</heading-type>
-  </object>
- </object-group>
 </material>
 
 <material>