fly/fgdata
1
0
Fork 0
Code Activity

Remove reliance of 3d clouds on /sim/rendering/shader-effects

Browse source
This commit is contained in:
Stuart Buchanan 2011-11-24 22:30:36 +00:00
parent 6fc8b10667
commit cc58f7e32e
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Effects/cloud.eff
View file

@ -11,7 +11,6 @@
<technique n="10"> <technique n="10">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shader-effects</property>
<less-equal> <less-equal>
<value type="float">1.0</value> <value type="float">1.0</value>
<shader-language/> <shader-language/>

33
gui/dialogs/rendering.xml
View file

@ -247,9 +247,6 @@
<halign>left</halign> <halign>left</halign>
<label>3D clouds</label> <label>3D clouds</label>
<name>3d-clouds</name> <name>3d-clouds</name>
<enable>
<property>/sim/rendering/shader-effects</property>
</enable>
<property>/sim/rendering/clouds3d-enable</property> <property>/sim/rendering/clouds3d-enable</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -263,19 +260,13 @@
<text> <text>
<label>Cloud density</label> <label>Cloud density</label>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</property>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
</text> </text>
<slider> <slider>
<name>cloud-density</name> <name>cloud-density</name>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</property>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<min>0</min> <min>0</min>
<max>1.0</max> <max>1.0</max>
@ -295,10 +286,7 @@
</slider> </slider>
<text> <text>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</property>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<label>12345678</label> <label>12345678</label>
<format>%.2f</format> <format>%.2f</format>
@ -313,19 +301,13 @@
<text> <text>
<label>Cloud visibility range</label> <label>Cloud visibility range</label>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</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> <name>cloud-vis-range</name>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</property>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<min>1000.0</min> <min>1000.0</min>
<max>45000.0</max> <max>45000.0</max>
@ -337,10 +319,7 @@
</slider> </slider>
<text> <text>
<enable> <enable>
<and> <property>/sim/rendering/clouds3d-enable</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>