fly/fgdata
1
0
Fork 0
Code Activity

fix transition.eff copy paste failure, and enable the slider selectively under Rembrandt.

Browse source 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-06-30 14:51:18 +03:00
parent 145a759fb8
commit 876e3e11db
6 changed files with 77 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Effects/transition-base-dirt.eff
View file

@ -3,14 +3,14 @@
<name>Effects/transition-base-dirt</name> <name>Effects/transition-base-dirt</name>
<inherits-from>Effects/transition</inherits-from> <inherits-from>Effects/transition</inherits-from>
<parameters> <parameters>
<texture n="3"> <texture n="3">
<image>Textures.high/Terrain/dirt3.dds</image> <image>Textures.high/Terrain/dirt3.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<transitions type="float">1.0</transitions> <transitions type="float">1.0</transitions>
<inverse type="float">0.0</inverse> <inverse type="float">0.0</inverse>
</parameters> </parameters>
</PropertyList> </PropertyList>

20
Effects/transition-base-grass-inverse.eff
View file

@ -3,16 +3,14 @@
<name>Effects/transition-base-rock</name> <name>Effects/transition-base-rock</name>
<inherits-from>Effects/transition</inherits-from> <inherits-from>Effects/transition</inherits-from>
<parameters> <parameters>
<texture n="3"> <texture n="3">
<image>Textures.high/Terrain/grass12.dds</image> <image>Textures.high/Terrain/grass12.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<transitions type="float">1.0</transitions>
<transitions type="float">1.0</transitions> <inverse type="float">1.0</inverse>
<inverse type="float">1.0</inverse>
</parameters> </parameters>
</PropertyList> </PropertyList>

46
Effects/transition-base-grass-rock.eff
View file

@ -3,28 +3,28 @@
<name>Effects/transition-base-grass-rock</name> <name>Effects/transition-base-grass-rock</name>
<inherits-from>Effects/transition</inherits-from> <inherits-from>Effects/transition</inherits-from>
<parameters> <parameters>
<texture n="2"> <texture n="2">
<image>Textures.high/Terrain/grass10c.dds</image> <image>Textures.high/Terrain/grass10c.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<texture n="3"> <texture n="3">
<image>Textures.high/Terrain/rock7.dds</image> <image>Textures.high/Terrain/rock7.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<texture n="4"> <texture n="4">
<image>Textures.high/Terrain.winter/mixedforest1c.dds</image> <image>Textures.high/Terrain.winter/mixedforest1c.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<transitions type="float">2.0</transitions> <transitions type="float">2.0</transitions>
<inverse type="float">0.0</inverse> <inverse type="float">0.0</inverse>
</parameters> </parameters>
</PropertyList> </PropertyList>

20
Effects/transition-base-rock.eff
View file

@ -3,16 +3,14 @@
<name>Effects/transition-base-rock</name> <name>Effects/transition-base-rock</name>
<inherits-from>Effects/transition</inherits-from> <inherits-from>Effects/transition</inherits-from>
<parameters> <parameters>
<texture n="3"> <texture n="3">
<image>Textures.high/Terrain/rock7.dds</image> <image>Textures.high/Terrain/rock7.dds</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<transitions type="float">1.0</transitions>
<transitions type="float">1.0</transitions> <inverse type="float">0.0</inverse>
<inverse type="float">0.0</inverse>
</parameters> </parameters>
</PropertyList> </PropertyList>

8
Effects/transition.eff
View file

@ -94,10 +94,6 @@ parameters :
<and> <and>
<property>/sim/rendering/shaders/transition</property> <property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/rembrandt/enabled</property> <property>/sim/rendering/rembrandt/enabled</property>
<less-equal>
<value type="float">4.0</value>
<float-property>/sim/rendering/shaders/water</float-property>
</less-equal>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>
@ -394,6 +390,10 @@ parameters :
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/transition</property> <property>/sim/rendering/shaders/transition</property>
<equal>
<value type="float">0.0</value>
<float-property>/sim/rendering/rembrandt/enabled</float-property>
</equal>
<or> <or>
<less-equal> <less-equal>
<value type="float">2.0</value> <value type="float">2.0</value>

34
gui/dialogs/shaders.xml
View file

@ -56,7 +56,7 @@
<halign>left</halign> <halign>left</halign>
<label>Generic</label> <label>Generic</label>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Crop</label> <label>Crop</label>
@ -91,12 +91,18 @@
<halign>left</halign> <halign>left</halign>
<label>Transition</label> <label>Transition</label>
<enable> <enable>
<not> <or>
<property>/sim/rendering/rembrandt/enabled</property> <not>
</not> <property>/sim/rendering/rembrandt/enabled</property>
</not>
<equals>
<property>/sim/rendering/materials-file</property>
<value>Materials/dds/materials.xml</value>
</equals>
</or>
</enable> </enable>
</text> </text>
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>Model</label> <label>Model</label>
@ -130,7 +136,7 @@
<object-name>generic</object-name> <object-name>generic</object-name>
</binding> </binding>
</slider> </slider>
<slider> <slider>
<name>crop</name> <name>crop</name>
<enable> <enable>
@ -191,9 +197,15 @@
<slider> <slider>
<name>transition</name> <name>transition</name>
<enable> <enable>
<not> <or>
<property>/sim/rendering/rembrandt/enabled</property> <not>
</not> <property>/sim/rendering/rembrandt/enabled</property>
</not>
<equals>
<property>/sim/rendering/materials-file</property>
<value>Materials/dds/materials.xml</value>
</equals>
</or>
</enable> </enable>
<min>0.0</min> <min>0.0</min>
<max>1.0</max> <max>1.0</max>
@ -252,7 +264,7 @@
</group> </group>
</group> </group>
<text> <text>
<label>Some shaders are disabled because</label> <label>Some shaders are disabled because</label>
<color> <color>
@ -371,7 +383,7 @@
</group> </group>
<hrule/> <hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>