1
0
Fork 0

Merge branch 'Work' of D:\Git_New\fgdata

This commit is contained in:
Vivian Meazza 2012-02-07 20:27:20 +00:00
commit 6918a999cf
33 changed files with 842 additions and 667 deletions

View file

@ -0,0 +1,179 @@
<?xml version="1.0"?>
<!--
************************************************************************
* Bindings for Qware 4-axis, 12 buttons joystick.
*
* Axis 0 : Ailerons
* Axis 1 : Elevator
* Axis 2 : Throttle
* Axes 3 : Rudder trim
* Axes 6 : View left/right
* Axes 7 : View up/down
*
* Button 1 : Trigger
* Button 2 : PTT - Push To Talk (FGcom)
* Button 3 : Elevator trim down
* Button 4 : Zoom out
* Button 5 : Elevator trim up
* Button 4 : Zoom in
************************************************************************
-->
<PropertyList>
<name>5-Axis,12-Button with POV </name>
<axis n="0">
<desc>Aileron</desc>
<binding>
<command>property-scale</command>
<property>/controls/flight/aileron</property>
<power type="double">2</power>
</binding>
</axis>
<axis n="1">
<desc>Elevator</desc>
<binding>
<command>property-scale</command>
<property>/controls/flight/elevator</property>
<factor type="double">-1.0</factor>
<power type="double">2</power>
</binding>
</axis>
<axis n="2">
<desc>Throttle</desc>
<binding>
<command>nasal</command>
<script>controls.throttleAxis()</script>
</binding>
</axis>
<axis n="3">
<desc>Rudder</desc>
<binding>
<command>property-scale</command>
<property>/controls/flight/rudder</property>
<power type="double">2</power>
</binding>
</axis>
<axis n="6">
<desc>View (left/right)</desc>
<low>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/goal-heading-offset-deg</property>
<step type="double">1.0</step>
</binding>
</low>
<high>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/goal-heading-offset-deg</property>
<step type="double">-1.0</step>
</binding>
</high>
</axis>
<axis n="7">
<desc>View (up/down)</desc>
<low>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/goal-pitch-offset-deg</property>
<step type="double">-1.0</step>
</binding>
</low>
<high>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/goal-pitch-offset-deg</property>
<step type="double">1.0</step>
</binding>
</high>
</axis>
<!-- Button #1 -->
<button n="0">
<desc>Trigger</desc>
<binding>
<command>nasal</command>
<script>controls.trigger(1)</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>controls.trigger(0)</script>
</binding>
</mod-up>
</button>
<!-- Button #2 -->
<button n="1">
<desc>Push To Talk (FGCom)</desc>
<binding>
<command>nasal</command>
<script>controls.ptt(1)</script>
</binding>
<mod-up>
<binding>
<command>nasal</command>
<script>controls.ptt(0)</script>
</binding>
</mod-up>
</button>
<!-- Button #3 -->
<button n="2">
<desc>Elevator trim down</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>
<script>controls.elevatorTrim(-1)</script>
</binding>
</button>
<!-- Button #4 -->
<button n="3">
<desc>Zoom out</desc>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/field-of-view</property>
<step type="double">0.3</step>
<max>179</max>
</binding>
</button>
<!-- Button #5 -->
<button n="4">
<desc>Elevator trim up</desc>
<repeatable type="bool">true</repeatable>
<binding>
<command>nasal</command>
<script>controls.elevatorTrim(1)</script>
</binding>
</button>
<!-- Button #6 -->
<button n="5">
<desc>Zoom in</desc>
<repeatable>true</repeatable>
<binding>
<command>property-adjust</command>
<property>/sim/current-view/field-of-view</property>
<step type="double">-0.3</step>
<min>1</min>
</binding>
</button>
</PropertyList>

View file

@ -105,6 +105,7 @@ $Id$
<PropertyList>
<name>Saitek X52 Pro Flight Control System</name>
<name>Saitek X52 Pro Flight Controller</name>
<name>Saitek Saitek X52 Pro Flight Control System</name>
<!-- Custom section for storing some properties, based on Aviator.xml -->

View file

@ -175,9 +175,12 @@ void main (void)
if ( quality_level >= 3.0 ) {
linear_search_steps = 20;
}
vec3 normal = normalize(VNormal);
vec3 tangent = normalize(VTangent);
vec3 binormal = normalize(VBinormal);
vec3 ecPos3 = ecPosition.xyz / ecPosition.w;
vec3 V = normalize(ecPos3);
vec3 s = vec3(dot(V, VTangent), dot(V, VBinormal), dot(VNormal, -V));
vec3 s = vec3(dot(V, tangent), dot(V, binormal), dot(normal, -V));
vec2 ds = s.xy * depth_factor / s.z;
vec2 dp = gl_TexCoord[0].st - ds;
float d = ray_intersect(dp, ds);
@ -189,7 +192,7 @@ void main (void)
float emis = N.z;
N.z = sqrt(1.0 - min(1.0,dot(N.xy, N.xy)));
float Nz = N.z;
N = normalize(N.x * VTangent + N.y * VBinormal + N.z * VNormal);
N = normalize(N.x * tangent + N.y * binormal + N.z * normal);
vec3 l = gl_LightSource[0].position.xyz;
vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l));
@ -198,7 +201,7 @@ void main (void)
// Shadow
if ( quality_level >= 2.0 ) {
dp += ds * d;
vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) );
vec3 sl = normalize( vec3( dot( l, tangent ), dot( l, binormal ), dot( -l, normal ) ) );
ds = sl.xy * depth_factor / sl.z;
dp -= ds * d;
float dl = ray_intersect(dp, ds);
@ -237,11 +240,15 @@ void main (void)
finalColor *= ambient_light;
vec4 p = vec4( ecPos3 + tile_size * V * (d-1.0) * depth_factor / s.z, 1.0 );
vec4 iproj = gl_ProjectionMatrix * p;
iproj /= iproj.w;
finalColor.rgb = fog_Func(finalColor.rgb, fogType);
gl_FragColor = finalColor;
gl_FragDepth = (iproj.z+1.0)/2.0;
if (dot(normal,-V) > 0.017) {
vec4 iproj = gl_ProjectionMatrix * p;
iproj /= iproj.w;
gl_FragDepth = (iproj.z+1.0)/2.0;
} else {
gl_FragDepth = gl_FragCoord.z;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View file

@ -199,6 +199,30 @@
</binding>
</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>
<halign>left</halign>
<label>Animated jetways</label>
@ -432,9 +456,6 @@
<group>
<layout>hbox</layout>
<text>
<enable>
<property>/sim/rendering/shaders/quality-level</property>
</enable>
<label>Experimental effects</label>
<halign>left</halign>
<color>
@ -452,9 +473,6 @@
<layout>vbox</layout>
<checkbox>
<halign>left</halign>
<enable>
<property>/sim/rendering/shaders/quality-level</property>
</enable>
<label>Skydome scattering</label>
<name>skydome-scattering</name>
<property>/sim/rendering/shaders/skydome</property>
@ -471,19 +489,13 @@
<text>
<label>Mie factor</label>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
</text>
<slider>
<name>mie-factor</name>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<min>0.0</min>
<max>0.01</max>
@ -496,10 +508,7 @@
</slider>
<text>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<label>12345678</label>
<format>%.3f</format>
@ -514,19 +523,13 @@
<text>
<label>Rayleigh factor</label>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
</text>
<slider>
<name>rayleigh-factor</name>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<min>0.0</min>
<max>0.001</max>
@ -539,10 +542,7 @@
</slider>
<text>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<label>12345678</label>
<format>%.4f</format>
@ -557,19 +557,13 @@
<text>
<label>Density factor</label>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
</text>
<slider>
<name>density-factor</name>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<min>0.0</min>
<max>1.0</max>
@ -582,10 +576,7 @@
</slider>
<text>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/skydome</property>
</and>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<label>12345678</label>
<format>%.1f</format>

File diff suppressed because it is too large Load diff

View file

@ -109,6 +109,18 @@ Properties currently used:
effect - The name of an effect to inherit from. The default is
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
parameter section of the effect created for this material.
************************************************************************
@ -1120,6 +1132,8 @@ Shared parameters for various materials.
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<object-mask>Terrain/city1.mask.png</object-mask>
<object-mask>Terrain/city2.mask.png</object-mask>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
@ -1135,60 +1149,54 @@ Shared parameters for various materials.
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>40000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>1000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Commercial/small-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-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path>
<coverage-m2>4000000</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>
<range-m>5000</range-m>
<object>
<path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Commercial/small-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-office.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<wood-coverage>10000.0</wood-coverage>
<tree-density>2000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
@ -1207,6 +1215,7 @@ Shared parameters for various materials.
<name>Town</name>
<name>SubUrban</name>
<texture>Terrain/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize>
<ysize>1024</ysize>
<light-coverage>100000.0</light-coverage>
@ -1216,38 +1225,36 @@ Shared parameters for various materials.
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/water-tower.ac</path>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>20000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<path>Models/Buildings/brick-school.ac</path>
<coverage-m2>200000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/shop.ac</path>
<path>Models/Buildings/hosshop.ac</path>
<path>Models/Buildings/weapshop.ac</path>
<coverage-m2>400000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Residential/MontHse1Grey_White.ac</path>
<path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path>
<coverage-m2>30000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/water-tower.ac</path>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>2000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<path>Models/Buildings/brick-school.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/shop.ac</path>
<path>Models/Buildings/hosshop.ac</path>
<path>Models/Buildings/weapshop.ac</path>
<coverage-m2>20000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Residential/MontHse1Grey_White.ac</path>
<path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path>
<coverage-m2>5000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<wood-coverage>5000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/mixedcrop4.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>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1514,22 +1524,18 @@ Shared parameters for various materials.
<bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -1547,9 +1553,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>1000000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>4000.0</tree-density>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/irrcrop2.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>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1583,22 +1590,18 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -1616,7 +1619,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>500000.0</wood-coverage>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/drycrop3.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>
<ysize>2000</ysize>
<solid>1</solid>
@ -1647,22 +1654,18 @@ Shared parameters for various materials.
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -1680,9 +1683,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>500000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>5000.0</tree-density>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1769,6 +1770,7 @@ Shared parameters for various materials.
</condition>
<name>GolfCourse</name>
<texture>Terrain/golfcourse1.png</texture>
<object-mask>Terrain/golfcourse1.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -1790,7 +1792,7 @@ Shared parameters for various materials.
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
<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-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -1810,6 +1812,7 @@ Shared parameters for various materials.
<name>AgroForest</name>
<effect>Effects/landmass</effect>
<texture>Terrain/cropwood.png</texture>
<object-mask>Terrain/cropwood.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -2039,6 +2042,8 @@ Shared parameters for various materials.
<texture>Terrain/city2.png</texture>
<texture n="2">Terrain/city2-relief-light.png</texture>
</texture-set>
<object-mask>Terrain/city1.mask.png</object-mask>
<object-mask>Terrain/city2.mask.png</object-mask>
<!--
<texture-set>
<texture>Terrain/city3.png</texture>
@ -2055,60 +2060,58 @@ Shared parameters for various materials.
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-apartment.ac</path>
<coverage-m2>10000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/factory.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>1000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Commercial/small-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-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path>
<coverage-m2>4000000</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>
<range-m>5000</range-m>
<object>
<path>Models/Residential/cube-apartment.ac</path>
<path>Models/Residential/medium-apartment.ac</path>
<path>Models/Buildings/renovated-apartment.ac</path>
<coverage-m2>1000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Commercial/small-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-office.ac</path>
<coverage-m2>500000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/brick-school.ac</path>
<path>Models/Buildings/bank-building.ac</path>
<coverage-m2>4000000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/water-tower.ac</path>
<coverage-m2>100000000</coverage-m2>
<heading-type>random</heading-type>
</object>
</object-group>
<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-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -2126,6 +2129,7 @@ Shared parameters for various materials.
<name>Town</name>
<name>SubUrban</name>
<texture>Terrain.winter/Town1.png</texture>
<object-mask>Terrain/Town1.mask.png</object-mask>
<xsize>1024</xsize>
<ysize>1024</ysize>
<light-coverage>100000.0</light-coverage>
@ -2135,47 +2139,36 @@ Shared parameters for various materials.
<b>0.02</b>
<a>1.0</a>
</emissive>
<object-group>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>20000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<coverage-m2>900000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/shop.ac</path>
<coverage-m2>400000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/hosshop.ac</path>
<coverage-m2>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/weapshop.ac</path>
<coverage-m2>400000</coverage-m2>
<heading-type>random</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>
<range-m>10000</range-m>
<object>
<path>Models/Buildings/water-tower.ac</path>
<path>Models/Buildings/oil-tanks.ac</path>
<coverage-m2>2000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Buildings/big-church.ac</path>
<path>Models/Buildings/brick-school.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Buildings/shop.ac</path>
<path>Models/Buildings/hosshop.ac</path>
<path>Models/Buildings/weapshop.ac</path>
<coverage-m2>20000</coverage-m2>
<heading-type>mask</heading-type>
</object>
<object>
<path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Residential/MontHse1Grey_White.ac</path>
<path>Models/Residential/MontHse1Red_Tile_Yellow.ac</path>
<coverage-m2>5000</coverage-m2>
<heading-type>mask</heading-type>
</object>
</object-group>
<wood-coverage>250000.0</wood-coverage>
<wood-size>5000.0</wood-size>
<tree-density>2000.0</tree-density>
<wood-coverage>5000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/mixedcrop4.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>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -2437,22 +2433,18 @@ Shared parameters for various materials.
<bumpiness>0.7</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -2470,9 +2462,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>1000000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>4000.0</tree-density>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/irrcrop2.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>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -2505,22 +2498,18 @@ Shared parameters for various materials.
<bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -2538,9 +2527,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>150000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<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/drycrop3.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>
<ysize>2000</ysize>
<solid>1</solid>
@ -2570,22 +2561,18 @@ Shared parameters for various materials.
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<object-group>
<range-m>5000</range-m>
<object>
<path>Models/Buildings/silo.ac</path>
<coverage-m2>5000000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<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>750000</coverage-m2>
<heading-type>random</heading-type>
</object>
<range-m>5000</range-m>
<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>
<!-- Disabled to avoid a tremendous osg performance penalty when
deleting scenery tiles, caused by tens of thousands of shared
@ -2603,9 +2590,7 @@ Shared parameters for various materials.
<heading-type>random</heading-type>
</object>
</object-group> -->
<wood-coverage>150000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<wood-coverage>10000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -2693,6 +2678,7 @@ Shared parameters for various materials.
</condition>
<name>GolfCourse</name>
<texture>Terrain.winter/golfcourse.png</texture>
<object-mask>Terrain/golfcourse1.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
@ -2714,9 +2700,7 @@ Shared parameters for various materials.
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<wood-coverage>5000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
@ -2732,8 +2716,10 @@ Shared parameters for various materials.
</equals>
</condition>
<name>CropWoodCover</name>
<name>CropWood</name>
<name>AgroForest</name>
<texture>Terrain.winter/cropwood.png</texture>
<object-mask>Terrain/cropwood.mask.png</object-mask>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>

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-bare type="double" userarchive="y">10000</ai-bare -->
</static-lod>
<random-objects type="bool"
userarchive="y">true</random-objects>
<random-vegetation type="bool"
userarchive="y">true</random-vegetation>
<random-objects type="bool" userarchive="y">true</random-objects>
<random-vegetation type="bool" userarchive="y">true</random-vegetation>
<vegetation-density type="double" userarchive="y">1.0</vegetation-density>
<horizon-effect type="bool"
userarchive="y">false</horizon-effect>
<point-sprites type="bool"