fix transition.eff copy paste failure, and enable the slider selectively under Rembrandt.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc
parent
145a759fb8
commit
876e3e11db
6 changed files with 77 additions and 69 deletions
|
|
@ -3,14 +3,14 @@
|
|||
<name>Effects/transition-base-dirt</name>
|
||||
<inherits-from>Effects/transition</inherits-from>
|
||||
<parameters>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/dirt3.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/dirt3.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
</parameters>
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
<name>Effects/transition-base-rock</name>
|
||||
<inherits-from>Effects/transition</inherits-from>
|
||||
<parameters>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/grass12.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">1.0</inverse>
|
||||
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/grass12.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">1.0</inverse>
|
||||
</parameters>
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -3,28 +3,28 @@
|
|||
<name>Effects/transition-base-grass-rock</name>
|
||||
<inherits-from>Effects/transition</inherits-from>
|
||||
<parameters>
|
||||
<texture n="2">
|
||||
<image>Textures.high/Terrain/grass10c.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/rock7.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="4">
|
||||
<image>Textures.high/Terrain.winter/mixedforest1c.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">2.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
<texture n="2">
|
||||
<image>Textures.high/Terrain/grass10c.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/rock7.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<texture n="4">
|
||||
<image>Textures.high/Terrain.winter/mixedforest1c.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">2.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
</parameters>
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
<name>Effects/transition-base-rock</name>
|
||||
<inherits-from>Effects/transition</inherits-from>
|
||||
<parameters>
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/rock7.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
|
||||
<texture n="3">
|
||||
<image>Textures.high/Terrain/rock7.dds</image>
|
||||
<filter>linear-mipmap-linear</filter>
|
||||
<wrap-s>repeat</wrap-s>
|
||||
<wrap-t>repeat</wrap-t>
|
||||
<internal-format>normalized</internal-format>
|
||||
</texture>
|
||||
<transitions type="float">1.0</transitions>
|
||||
<inverse type="float">0.0</inverse>
|
||||
</parameters>
|
||||
</PropertyList>
|
||||
|
|
|
|||
|
|
@ -94,10 +94,6 @@ parameters :
|
|||
<and>
|
||||
<property>/sim/rendering/shaders/transition</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>
|
||||
<less-equal>
|
||||
<value type="float">2.0</value>
|
||||
|
|
@ -394,6 +390,10 @@ parameters :
|
|||
<predicate>
|
||||
<and>
|
||||
<property>/sim/rendering/shaders/transition</property>
|
||||
<equal>
|
||||
<value type="float">0.0</value>
|
||||
<float-property>/sim/rendering/rembrandt/enabled</float-property>
|
||||
</equal>
|
||||
<or>
|
||||
<less-equal>
|
||||
<value type="float">2.0</value>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<halign>left</halign>
|
||||
<label>Generic</label>
|
||||
</text>
|
||||
|
||||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>Crop</label>
|
||||
|
|
@ -91,12 +91,18 @@
|
|||
<halign>left</halign>
|
||||
<label>Transition</label>
|
||||
<enable>
|
||||
<not>
|
||||
<property>/sim/rendering/rembrandt/enabled</property>
|
||||
</not>
|
||||
<or>
|
||||
<not>
|
||||
<property>/sim/rendering/rembrandt/enabled</property>
|
||||
</not>
|
||||
<equals>
|
||||
<property>/sim/rendering/materials-file</property>
|
||||
<value>Materials/dds/materials.xml</value>
|
||||
</equals>
|
||||
</or>
|
||||
</enable>
|
||||
</text>
|
||||
|
||||
|
||||
<text>
|
||||
<halign>left</halign>
|
||||
<label>Model</label>
|
||||
|
|
@ -130,7 +136,7 @@
|
|||
<object-name>generic</object-name>
|
||||
</binding>
|
||||
</slider>
|
||||
|
||||
|
||||
<slider>
|
||||
<name>crop</name>
|
||||
<enable>
|
||||
|
|
@ -191,9 +197,15 @@
|
|||
<slider>
|
||||
<name>transition</name>
|
||||
<enable>
|
||||
<not>
|
||||
<property>/sim/rendering/rembrandt/enabled</property>
|
||||
</not>
|
||||
<or>
|
||||
<not>
|
||||
<property>/sim/rendering/rembrandt/enabled</property>
|
||||
</not>
|
||||
<equals>
|
||||
<property>/sim/rendering/materials-file</property>
|
||||
<value>Materials/dds/materials.xml</value>
|
||||
</equals>
|
||||
</or>
|
||||
</enable>
|
||||
<min>0.0</min>
|
||||
<max>1.0</max>
|
||||
|
|
@ -252,7 +264,7 @@
|
|||
</group>
|
||||
|
||||
</group>
|
||||
|
||||
|
||||
<text>
|
||||
<label>Some shaders are disabled because</label>
|
||||
<color>
|
||||
|
|
@ -371,7 +383,7 @@
|
|||
</group>
|
||||
|
||||
<hrule/>
|
||||
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue