fly/fgdata
1
0
Fork 0
Code Activity

Effects/model-combined fix missing porperty check in Rembrandt case, fix shader order

Browse source 
IAR80: use the new model-combined-deferred
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-03-31 17:13:28 +03:00
parent d43770ab58
commit edb789a684
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Effects/model-combined.eff
View file

@ -152,6 +152,7 @@ please see Docs/README.model-combined.eff for documentation
<technique n="8"> <technique n="8">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property>
<property>/sim/rendering/rembrandt</property> <property>/sim/rendering/rembrandt</property>
<or> <or>
<less-equal> <less-equal>
@ -371,8 +372,8 @@ please see Docs/README.model-combined.eff for documentation
<program> <program>
<!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> --> <!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
<vertex-shader n="1">Shaders/ubershader.vert</vertex-shader> <vertex-shader n="1">Shaders/ubershader.vert</vertex-shader>
<fragment-shader n="1">Shaders/include_fog.frag</fragment-shader> <fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<fragment-shader n="0">Shaders/ubershader.frag</fragment-shader> <fragment-shader n="1">Shaders/ubershader.frag</fragment-shader>
<!--<attribute> <!--<attribute>
<name>tangent</name> <name>tangent</name>
<index>6</index> <index>6</index>
@ -756,7 +757,6 @@ please see Docs/README.model-combined.eff for documentation
<!-- Default rendering --> <!-- Default rendering -->
<technique n="9"> <technique n="9">
<!-- FIXME: this technique number overlaps the one in model-default -->
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/model</property> <property>/sim/rendering/shaders/model</property>
@ -976,7 +976,7 @@ please see Docs/README.model-combined.eff for documentation
</vertex-program-two-side> </vertex-program-two-side>
<program> <program>
<!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> --> <!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> -->
<vertex-shader n="1">Shaders/ubershader.vert</vertex-shader> <vertex-shader n="1">Shaders/ubershader.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader> <fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<fragment-shader n="1">Shaders/ubershader.frag</fragment-shader> <fragment-shader n="1">Shaders/ubershader.frag</fragment-shader>