fly/fgdata
1
0
Fork 0
Code Activity

Bugfix for ALS effect indexing errors

Browse source
This commit is contained in:
Thorsten Renk 2015-08-10 09:36:20 +03:00
parent 93e314a02a
commit 6168bbebf8
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Effects/model-default.eff
View file

@ -103,10 +103,10 @@
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
</vertex-program-two-side> </vertex-program-two-side>
<program> <program>
<vertex-shader n="1">Shaders/generic-ALS-base.vert</vertex-shader> <vertex-shader>Shaders/generic-ALS-base.vert</vertex-shader>
<fragment-shader n="1">Shaders/model-ALS-base.frag</fragment-shader> <fragment-shader>Shaders/model-ALS-base.frag</fragment-shader>
<fragment-shader n="2">Shaders/hazes.frag</fragment-shader> <fragment-shader>Shaders/hazes.frag</fragment-shader>
<fragment-shader n="3">Shaders/secondary_lights.frag</fragment-shader> <fragment-shader>Shaders/secondary_lights.frag</fragment-shader>
</program> </program>
<uniform> <uniform>
<name>visibility</name> <name>visibility</name>

6
Effects/space.eff
View file

@ -7,10 +7,8 @@
<technique n="5"> <technique n="5">
<pass> <pass>
<program> <program>
<vertex-shader n="1">Shaders/space-ALS-base.vert</vertex-shader> <vertex-shader n="0">Shaders/space-ALS-base.vert</vertex-shader>
<fragment-shader n="1">Shaders/space-ALS-base.frag</fragment-shader> <fragment-shader n="0">Shaders/space-ALS-base.frag</fragment-shader>
<fragment-shader n="2">Shaders/hazes.frag</fragment-shader>
<fragment-shader n="3">Shaders/secondary_lights.frag</fragment-shader>
</program> </program>
</pass> </pass>

5
Effects/water-inland.eff
View file

@ -207,7 +207,7 @@
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="2"> <technique n="1">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
@ -876,7 +876,7 @@
</technique> </technique>
<technique n="3"> <technique n="2">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/skydome</property> <property>/sim/rendering/shaders/skydome</property>
@ -1059,6 +1059,7 @@
<program> <program>
<vertex-shader>Shaders/water-ALS.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/water-ALS-base.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-base.frag</fragment-shader>
<fragment-shader>Shaders/hazes.frag</fragment-shader>
</program> </program>
<!--<uniform> <!--<uniform>
<name>water_reflection</name> <name>water_reflection</name>