fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2011-11-25 11:43:53 +01:00
commit 29d4e99ceb
3 changed files with 16 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Effects/cloud.eff
View file

@ -5,18 +5,15 @@
<texture n ="0">
</texture>
<range>
<use>/sim/rendering/clouds3d-vis-range</use>
<use>/sim/rendering/clouds3d-vis-range</use>
</range>
</parameters>
<technique n="10">
<predicate>
<and>
<property>/sim/rendering/shader-effects</property>
<less-equal>
<value type="float">1.0</value>
<shader-language/>
</less-equal>
</and>
<less-equal>
<value type="float">1.0</value>
<shader-language/>
</less-equal>
</predicate>
<pass n="0">
<!-- This is apparently not used, so maybe we'll blow it way soon. -->

3
Effects/tree.eff
View file

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

40
gui/dialogs/rendering.xml
View file

@ -197,14 +197,15 @@
<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>
<binding>
<command>reinit</command>
<subsystem>tile-manager</subsystem>
</binding>
</checkbox>
<checkbox>
@ -246,9 +247,6 @@
<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>
@ -262,19 +260,13 @@
<text>
<label>Cloud density</label>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-density</name>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<min>0</min>
<max>1.0</max>
@ -294,10 +286,7 @@
</slider>
<text>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<label>12345678</label>
<format>%.2f</format>
@ -312,19 +301,13 @@
<text>
<label>Cloud visibility range</label>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-vis-range</name>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<min>1000.0</min>
<max>45000.0</max>
@ -336,10 +319,7 @@
</slider>
<text>
<enable>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<label>12345678</label>
<format>%.fm</format>