1
0
Fork 0

Issue 181: add object-name to all rendering options. Rename snow level to snow line. Snow dependant on crop, landmass or urban shaders.

This commit is contained in:
Gijs de Rooy 2010-12-26 19:26:05 +01:00
parent 2504a4d9fb
commit 72f0ea1fea

View file

@ -40,7 +40,11 @@
<text> <text>
<halign>left</halign> <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> </text>
<group> <group>
@ -122,18 +126,22 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Particles (smoke, dust, spray)</label> <label>Particles (smoke, dust, spray)</label>
<name>particles</name>
<property>/sim/rendering/particles</property> <property>/sim/rendering/particles</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>particles</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Precipitation</label> <label>Precipitation</label>
<name>precipitation</name>
<property>/sim/rendering/precipitation-gui-enable</property> <property>/sim/rendering/precipitation-gui-enable</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>precipitation</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -162,12 +170,14 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Random vegetation</label> <label>Random vegetation</label>
<name>random-vegetation</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>random-vegetation</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -198,12 +208,14 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>3D clouds</label> <label>3D clouds</label>
<name>3d-clouds</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/clouds3d-enable</property> <property>/sim/rendering/clouds3d-enable</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>3d-clouds</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -239,23 +251,34 @@
<text> <text>
<label>Cloud visibility range</label> <label>Cloud visibility range</label>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
</text> </text>
<slider> <slider>
<name>cloud-vis-range</name>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<min>100.0</min> <min>100.0</min>
<max>20000.0</max> <max>20000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property> <property>/sim/rendering/clouds3d-vis-range</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>cloud-vis-range</object-name>
</binding> </binding>
</slider> </slider>
<text> <text>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<label>12345678</label> <label>12345678</label>
<format>%.fm</format> <format>%.fm</format>
@ -290,9 +313,11 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Material shaders</label> <label>Material shaders</label>
<name>material-shaders</name>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>material-shaders</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -303,72 +328,84 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Crop texture</label> <label>Crop texture</label>
<name>crop-texture</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/crop-shader</property> <property>/sim/rendering/crop-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>crop-texture</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Landmass effects</label> <label>Landmass effects</label>
<name>landmass-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/landmass-shader</property> <property>/sim/rendering/landmass-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>landmass-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Water reflection</label> <label>Water reflection</label>
<name>water-reflection</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/water-shader</property> <property>/sim/rendering/water-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>water-reflection</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Urban effects</label> <label>Urban effects</label>
<name>urban-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/urban-shader</property> <property>/sim/rendering/urban-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>urban-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Transition effects</label> <label>Transition effects</label>
<name>transition-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/transition-shader</property> <property>/sim/rendering/transition-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>transition-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Persistent contrails</label> <label>Persistent contrails</label>
<name>persistent-contrails</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/contrail-shader</property> <property>/sim/rendering/contrail-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>persistent-contrails</object-name>
</binding> </binding>
</checkbox> </checkbox>
</group> </group>
@ -377,15 +414,29 @@
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<text> <text>
<label>Snow Level</label> <label>Snow line</label>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <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> </enable>
</text> </text>
<slider> <slider>
<name>snow-level</name> <name>snow-level</name>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <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> </enable>
<min>0.0</min> <min>0.0</min>
<max>5000.0</max> <max>5000.0</max>
@ -397,7 +448,14 @@
</slider> </slider>
<text> <text>
<enable> <enable>
<and>
<property>/sim/rendering/shader-effects</property> <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> </enable>
<label>12345678</label> <label>12345678</label>
<format>%.fm</format> <format>%.fm</format>
@ -416,6 +474,7 @@
</enable> </enable>
</text> </text>
<slider> <slider>
<name>quality-level</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
@ -425,6 +484,7 @@
<property>/sim/rendering/quality-level</property> <property>/sim/rendering/quality-level</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>quality-level</object-name>
</binding> </binding>
</slider> </slider>
<text> <text>