fly/fgdata
1
0
Fork 0
Code Activity

Tentative fix for random buildings red flickering in some cases

Browse source
This commit is contained in:
Emilian Huminiuc 2014-02-23 13:10:11 +01:00 committed by Christian Schmitt
parent 8b691f6e60
commit 745874315b
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Effects/model-combined-deferred.eff
View file

@ -242,8 +242,8 @@ the objects that use it, and replaces it with the default shader.
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
</vertex-program-two-side> </vertex-program-two-side>
<program> <program n="0">
<vertex-shader>Shaders/ubershader.vert</vertex-shader> <vertex-shader n="0">Shaders/ubershader.vert</vertex-shader>
<fragment-shader>Shaders/ubershader-gbuffer.frag</fragment-shader> <fragment-shader>Shaders/ubershader-gbuffer.frag</fragment-shader>
<fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader> <fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
<fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader> <fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader>

2
Effects/model-combined-transparent.eff
View file

@ -12,7 +12,7 @@ and fallback to plain transparency when the model shader is disabled.
<and> <and>
<equal> <equal>
<float-property>/sim/rendering/shaders/model</float-property> <float-property>/sim/rendering/shaders/model</float-property>
<value type="int">0</value> <value type="float">0.0</value>
</equal> </equal>
<or> <or>
<less-equal> <less-equal>

4
Effects/model-combined.eff
View file

@ -845,7 +845,7 @@ please see Docs/README.model-combined.eff for documentation
</or> </or>
</and> </and>
</predicate> </predicate>
<pass> <pass n="0">
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>
<active> <active>
@ -1041,7 +1041,7 @@ please see Docs/README.model-combined.eff for documentation
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
</vertex-program-two-side> </vertex-program-two-side>
<program> <program n="0">
<!-- <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>

14
Effects/model-default.eff
View file

@ -219,8 +219,8 @@
<vertex-program-two-side> <vertex-program-two-side>
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
</vertex-program-two-side> </vertex-program-two-side>
<program> <program n="0">
<vertex-shader>Shaders/deferred-gbuffer.vert</vertex-shader> <vertex-shader n="0">Shaders/deferred-gbuffer.vert</vertex-shader>
<fragment-shader>Shaders/deferred-gbuffer.frag</fragment-shader> <fragment-shader>Shaders/deferred-gbuffer.frag</fragment-shader>
<fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader> <fragment-shader>Shaders/gbuffer-functions.frag</fragment-shader>
<fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader> <fragment-shader>Shaders/gbuffer-encode.frag</fragment-shader>
@ -332,12 +332,10 @@
<vertex-program-two-side> <vertex-program-two-side>
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
</vertex-program-two-side> </vertex-program-two-side>
<program> <program n="0">
<!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> --> <!-- <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> --> <!--fog include-->
<!--fog include-->
<vertex-shader n="1">Shaders/default.vert</vertex-shader> <vertex-shader n="1">Shaders/default.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader> <fragment-shader n="0">Shaders/include_fog.frag</fragment-shader> <!--fog include-->
<!--fog include-->
<fragment-shader n="1">Shaders/default.frag</fragment-shader> <fragment-shader n="1">Shaders/default.frag</fragment-shader>
</program> </program>
<!-- BEGIN fog include --> <!-- BEGIN fog include -->
@ -398,7 +396,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="12"> <technique n="13">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>