Merge branch 'master' of git://gitorious.org/fg/fgdata
This commit is contained in:
Stuart Buchanan
commit
eac038d4ad
1 changed files with 74 additions and 12 deletions
|
|
@ -40,7 +40,11 @@
|
|||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>"Material shaders" must be enabled for certain options</label>
|
||||
<label>"Material shaders" must be enabled for most options.</label>
|
||||
</text>
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>Snow is dependant on crop, landmass and urban shaders.</label>
|
||||
</text>
|
||||
|
||||
<group>
|
||||
|
|
@ -122,18 +126,22 @@
|
|||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Particles (smoke, dust, spray)</label>
|
||||
<name>particles</name>
|
||||
<property>/sim/rendering/particles</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>particles</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Precipitation</label>
|
||||
<name>precipitation</name>
|
||||
<property>/sim/rendering/precipitation-gui-enable</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>precipitation</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
|
|
@ -162,12 +170,14 @@
|
|||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Random vegetation</label>
|
||||
<name>random-vegetation</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/random-vegetation</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>random-vegetation</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
|
|
@ -198,12 +208,14 @@
|
|||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>3D clouds</label>
|
||||
<name>3d-clouds</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/clouds3d-enable</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>3d-clouds</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
|
|
@ -239,23 +251,34 @@
|
|||
<text>
|
||||
<label>Cloud visibility range</label>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<property>/sim/rendering/clouds3d-enable</property>
|
||||
</and>
|
||||
</enable>
|
||||
</text>
|
||||
<slider>
|
||||
<name>cloud-vis-range</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<property>/sim/rendering/clouds3d-enable</property>
|
||||
</and>
|
||||
</enable>
|
||||
<min>100.0</min>
|
||||
<max>20000.0</max>
|
||||
<property>/sim/rendering/clouds3d-vis-range</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>cloud-vis-range</object-name>
|
||||
</binding>
|
||||
</slider>
|
||||
<text>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<property>/sim/rendering/clouds3d-enable</property>
|
||||
</and>
|
||||
</enable>
|
||||
<label>12345678</label>
|
||||
<format>%.fm</format>
|
||||
|
|
@ -290,9 +313,11 @@
|
|||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Material shaders</label>
|
||||
<name>material-shaders</name>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>material-shaders</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
|
|
@ -303,72 +328,84 @@
|
|||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Crop texture</label>
|
||||
<name>crop-texture</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/crop-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>crop-texture</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Landmass effects</label>
|
||||
<name>landmass-effects</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/landmass-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>landmass-effects</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Water reflection</label>
|
||||
<name>water-reflection</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/water-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>water-reflection</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Urban effects</label>
|
||||
<name>urban-effects</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/urban-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>urban-effects</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Transition effects</label>
|
||||
<name>transition-effects</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/transition-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>transition-effects</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Persistent contrails</label>
|
||||
<name>persistent-contrails</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
<property>/sim/rendering/contrail-shader</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>persistent-contrails</object-name>
|
||||
</binding>
|
||||
</checkbox>
|
||||
</group>
|
||||
|
|
@ -377,25 +414,48 @@
|
|||
<layout>hbox</layout>
|
||||
<halign>right</halign>
|
||||
<text>
|
||||
<label>Snow Level</label>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<label>Snow line</label>
|
||||
<enable>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<or>
|
||||
<property>/sim/rendering/crop-shader</property>
|
||||
<property>/sim/rendering/landmass-shader</property>
|
||||
<property>/sim/rendering/urban-shader</property>
|
||||
</or>
|
||||
</and>
|
||||
</enable>
|
||||
</text>
|
||||
</text>
|
||||
<slider>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<name>snow-level</name>
|
||||
<enable>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<or>
|
||||
<property>/sim/rendering/crop-shader</property>
|
||||
<property>/sim/rendering/landmass-shader</property>
|
||||
<property>/sim/rendering/urban-shader</property>
|
||||
</or>
|
||||
</and>
|
||||
</enable>
|
||||
<min>0.0</min>
|
||||
<max>5000.0</max>
|
||||
<property>/sim/rendering/snow-level-m</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>snow-level</object-name>
|
||||
</binding>
|
||||
</slider>
|
||||
<text>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<enable>
|
||||
<and>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
<or>
|
||||
<property>/sim/rendering/crop-shader</property>
|
||||
<property>/sim/rendering/landmass-shader</property>
|
||||
<property>/sim/rendering/urban-shader</property>
|
||||
</or>
|
||||
</and>
|
||||
</enable>
|
||||
<label>12345678</label>
|
||||
<format>%.fm</format>
|
||||
|
|
@ -414,6 +474,7 @@
|
|||
</enable>
|
||||
</text>
|
||||
<slider>
|
||||
<name>quality-level</name>
|
||||
<enable>
|
||||
<property>/sim/rendering/shader-effects</property>
|
||||
</enable>
|
||||
|
|
@ -423,6 +484,7 @@
|
|||
<property>/sim/rendering/quality-level</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
<object-name>quality-level</object-name>
|
||||
</binding>
|
||||
</slider>
|
||||
<text>
|
||||
|
|
|
|||
Loading…
Reference in a new issue