fly/fgdata
1
0
Fork 0
Code Activity

Compositor: Fixed render order of child effects

Browse source
This commit is contained in:
Fernando García Liñán 2019-10-30 20:12:55 +01:00
parent 1f637b3ad3
commit d1ab981110
34 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Compositor/Effects/agriculture.eff
View file

@ -278,7 +278,7 @@
</parameters> </parameters>
<!-- put techniques at a "high" index to allow derived effects to <!-- put techniques at a "high" index to allow derived effects to
insert their own techniques first. --> insert their own techniques first. -->
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/airfield.eff
View file

@ -37,7 +37,7 @@
<overlay_bias>0.0</overlay_bias> <overlay_bias>0.0</overlay_bias>
<overlay_alpha>1.0</overlay_alpha> <overlay_alpha>1.0</overlay_alpha>
</parameters> </parameters>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

6
Compositor/Effects/bowwave.eff
View file

@ -154,7 +154,7 @@
</sea_b> </sea_b>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="8"> <technique n="6">
<!-- FIXME: this technique number overlaps the one in model-default --> <!-- FIXME: this technique number overlaps the one in model-default -->
<predicate> <predicate>
<and> <and>
@ -219,7 +219,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -616,7 +616,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

10
Compositor/Effects/building.eff
View file

@ -146,7 +146,7 @@
</parameters> </parameters>
<!-- Atmospheric scattering technique with model shader--> <!-- Atmospheric scattering technique with model shader-->
<!-- Atmospheric scattering technique --> <!-- Atmospheric scattering technique -->
<technique n="7"> <technique n="4">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>
@ -338,7 +338,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="8"> <technique n="5">
<pass> <pass>
<material> <material>
<active>true</active> <active>true</active>
@ -401,7 +401,7 @@
</program> </program>
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="6">
<pass> <pass>
<material> <material>
<active>true</active> <active>true</active>
@ -464,7 +464,7 @@
</program> </program>
</pass> </pass>
</technique> </technique>
<technique n="18"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>
@ -578,7 +578,7 @@
</program> </program>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="17">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/chute.eff
View file

@ -9,7 +9,7 @@
<chute_bend>0.0</chute_bend> <chute_bend>0.0</chute_bend>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/cityLM.eff
View file

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<PropertyList> <PropertyList>
<name>Effects/cityLM</name> <name>Effects/cityLM</name>
<inherits-from>/Effects/model-combined-deferred</inherits-from> <inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters> <parameters>
<!-- Light Map --> <!-- Light Map -->
<lightmap-enabled type="int">1</lightmap-enabled> <lightmap-enabled type="int">1</lightmap-enabled>

2
Compositor/Effects/cliffs.eff
View file

@ -35,7 +35,7 @@
<grain-fade-power type="float">1.3</grain-fade-power> <grain-fade-power type="float">1.3</grain-fade-power>
<rock_strata>0</rock_strata>--> <rock_strata>0</rock_strata>-->
</parameters> </parameters>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/crop.eff
View file

@ -22,7 +22,7 @@
<use>/environment/snow-level-m</use> <use>/environment/snow-level-m</use>
</snow-level> </snow-level>
</parameters> </parameters>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

2
Compositor/Effects/dirt-runway.eff
View file

@ -42,7 +42,7 @@
<size_grain>30.0</size_grain> <size_grain>30.0</size_grain>
<grain_strength>1.0</grain_strength> <grain_strength>1.0</grain_strength>
</parameters> </parameters>
<technique n="19"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

4
Compositor/Effects/flutter.eff
View file

@ -46,7 +46,7 @@
</fogtype> </fogtype>
<!-- END fog include --> <!-- END fog include -->
</parameters> </parameters>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -262,7 +262,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/forest.eff
View file

@ -72,7 +72,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

2
Compositor/Effects/glacier.eff
View file

@ -72,7 +72,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

4
Compositor/Effects/glass.eff
View file

@ -89,7 +89,7 @@
</parameters> </parameters>
<!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise --> <!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise -->
<!-- Rembrandt technique of model-default comes at 10, so we insert before that --> <!-- Rembrandt technique of model-default comes at 10, so we insert before that -->
<technique n="9"> <technique n="7">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<depth> <depth>
@ -165,7 +165,7 @@
</texture-unit> </texture-unit>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/grass.eff
View file

@ -33,7 +33,7 @@
<use>/environment/aircraft-effects/wash-strength</use> <use>/environment/aircraft-effects/wash-strength</use>
</wash-strength> </wash-strength>
</parameters> </parameters>
<technique n="19"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/herbtundra.eff
View file

@ -72,7 +72,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

4
Compositor/Effects/hud.eff
View file

@ -93,7 +93,7 @@
</parameters> </parameters>
<!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise --> <!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise -->
<!-- Rembrandt technique of model-default comes at 10, so we insert before that --> <!-- Rembrandt technique of model-default comes at 10, so we insert before that -->
<technique n="9"> <technique n="7">
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<depth> <depth>
@ -169,7 +169,7 @@
</texture-unit> </texture-unit>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

4
Compositor/Effects/landmass.eff
View file

@ -44,7 +44,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="8"> <technique n="6">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -380,7 +380,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

2
Compositor/Effects/lfeat.eff
View file

@ -21,7 +21,7 @@
<transparent>true</transparent> <transparent>true</transparent>
<raise_vertex type="bool">true</raise_vertex> <raise_vertex type="bool">true</raise_vertex>
</parameters> </parameters>
<technique n="19"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<equal> <equal>

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

@ -7,7 +7,7 @@ and fallback to plain transparency when the model shader is disabled.
<name>Effects/model-combined-transparent</name> <name>Effects/model-combined-transparent</name>
<inherits-from>Effects/model-combined</inherits-from> <inherits-from>Effects/model-combined</inherits-from>
<!-- Rembrandt rendering --> <!-- Rembrandt rendering -->
<technique n="9"> <technique n="6">
<predicate> <predicate>
<and> <and>
<equal> <equal>

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

@ -305,7 +305,7 @@ please see Docs/README.model-combined.eff for documentation
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate>--> </generate>-->
<!-- Default rendering --> <!-- Default rendering -->
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -843,7 +843,7 @@ please see Docs/README.model-combined.eff for documentation
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/model-interior-display.eff
View file

@ -284,7 +284,7 @@
</uniform> </uniform>
</pass> </pass>
</technique>--> </technique>-->
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

4
Compositor/Effects/model-interior.eff
View file

@ -65,7 +65,7 @@
<ra-irradiance-map-type type="int">0</ra-irradiance-map-type> <ra-irradiance-map-type type="int">0</ra-irradiance-map-type>
<ra-irradiance-map-strength type="float">0.0</ra-irradiance-map-strength> <ra-irradiance-map-strength type="float">0.0</ra-irradiance-map-strength>
</parameters> </parameters>
<technique n="18"> <technique n="17">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>
@ -648,7 +648,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

4
Compositor/Effects/model-wingflex-organic.eff
View file

@ -294,7 +294,7 @@
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate>--> </generate>-->
<!-- Default rendering --> <!-- Default rendering -->
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -832,7 +832,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="18">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/road.eff
View file

@ -59,7 +59,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="19"> <technique n="17">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/rock.eff
View file

@ -35,7 +35,7 @@
<grain-fade-power type="float">1.3</grain-fade-power> <grain-fade-power type="float">1.3</grain-fade-power>
<rock_strata>0</rock_strata>--> <rock_strata>0</rock_strata>-->
</parameters> </parameters>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

4
Compositor/Effects/runway.eff
View file

@ -254,7 +254,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -548,7 +548,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

8
Compositor/Effects/schemes.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<scheme>
<name>als-shadow</name>
<fallback>Effects/shadow-pass</fallback>
</scheme>
</PropertyList>

4
Compositor/Effects/space-combined.eff
View file

@ -14,7 +14,7 @@
<geo_ambience type="float">0.0</geo_ambience> <geo_ambience type="float">0.0</geo_ambience>
<use_geo_light type="int">0</use_geo_light> <use_geo_light type="int">0</use_geo_light>
</parameters> </parameters>
<technique n="8"> <technique n="5">
<pass> <pass>
<program> <program>
<vertex-shader n="0">Shaders/ALS/space-ultra.vert</vertex-shader> <vertex-shader n="0">Shaders/ALS/space-ultra.vert</vertex-shader>
@ -950,7 +950,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="6">
<pass> <pass>
<program> <program>
<vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader> <vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader>

2
Compositor/Effects/space.eff
View file

@ -3,7 +3,7 @@
<PropertyList> <PropertyList>
<name>Effects/space</name> <name>Effects/space</name>
<inherits-from>Effects/model-default</inherits-from> <inherits-from>Effects/model-default</inherits-from>
<technique n="9"> <technique n="7">
<pass> <pass>
<program> <program>
<vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader> <vertex-shader n="0">Shaders/ALS/space-base.vert</vertex-shader>

2
Compositor/Effects/terrain-overlay.eff
View file

@ -33,7 +33,7 @@
<overlay_autumn_flag>0</overlay_autumn_flag> <overlay_autumn_flag>0</overlay_autumn_flag>
<overlay_secondary_flag>0</overlay_secondary_flag> <overlay_secondary_flag>0</overlay_secondary_flag>
</parameters> </parameters>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

2
Compositor/Effects/transition.eff
View file

@ -86,7 +86,7 @@ parameters :
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate>--> </generate>-->
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>

8
Compositor/Effects/urban.eff
View file

@ -48,7 +48,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="8"> <technique n="6">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -319,7 +319,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -533,7 +533,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="18"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>
@ -1387,7 +1387,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

6
Compositor/Effects/water-inland.eff
View file

@ -334,7 +334,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/water</property> <property>/sim/rendering/shaders/water</property>
@ -713,7 +713,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="18"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>
@ -1606,7 +1606,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>

8
Compositor/Effects/water.eff
View file

@ -334,7 +334,7 @@
<tangent type="int">6</tangent> <tangent type="int">6</tangent>
<binormal type="int">7</binormal> <binormal type="int">7</binormal>
</generate> </generate>
<technique n="8"> <technique n="6">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -772,7 +772,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="9"> <technique n="7">
<predicate> <predicate>
<and> <and>
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
@ -1167,7 +1167,7 @@
</uniform> </uniform>
</pass> </pass>
</technique> </technique>
<technique n="18"> <technique n="15">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>
@ -2040,7 +2040,7 @@
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
</technique> </technique>
<technique n="19"> <technique n="16">
<scheme>als-lighting</scheme> <scheme>als-lighting</scheme>
<predicate> <predicate>
<and> <and>