fly/fgdata
1
0
Fork 0
Code Activity

Fix OSM2city buildings for Compositor using model shader

Browse source 
Previously osm2city buildings did not render under the
Compositor/ALS pipeline with /sim/rendering/shaders/model>0

Now it does.  Thanks to merspieler for assistance in
diagnosing the problem.
This commit is contained in:
Stuart Buchanan 2020-04-13 17:17:45 +01:00
parent d1386633e2
commit 1d877850b9
1 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Compositor/Effects/building.eff
View file

@ -115,28 +115,11 @@
<building-flag type="int">1</building-flag> <building-flag type="int">1</building-flag>
</parameters> </parameters>
<technique n="4"> <technique n="7">
<!-- Atmospheric scattering technique with model shader--> <!-- Atmospheric scattering technique with
<scheme>als-lighting</scheme> /sim/rendering/shaders/quality-level > 0
<predicate> /sim/rendering/shaders/model> 0
<and> -->
<property>/sim/rendering/shaders/quality-level</property>
<property>/sim/rendering/shaders/model</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
</and>
</predicate>
<pass> <pass>
<texture-unit n="4"> <texture-unit n="4">
<unit>4</unit> <unit>4</unit>
@ -183,21 +166,6 @@
<technique n="19"> <technique n="19">
<!-- Base Atmospheric scattering technique --> <!-- Base Atmospheric scattering technique -->
<scheme>als-lighting</scheme>
<predicate>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
</predicate>
<pass> <pass>
<program> <program>
<vertex-shader>Shaders/ALS/building-default.vert</vertex-shader> <vertex-shader>Shaders/ALS/building-default.vert</vertex-shader>
@ -226,8 +194,8 @@
</technique> </technique>
<technique n="7"> <technique n="4">
<!-- Model shader, quality > 0 --> <!-- Non-ALS. Model shader > 0 , quality > 0 -->
<pass> <pass>
<material> <material>
<active>true</active> <active>true</active>
@ -284,6 +252,7 @@
</technique> </technique>
<technique n="8"> <technique n="8">
<!-- Generic shaders, quality > 0 -->
<pass> <pass>
<vertex-program-two-side> <vertex-program-two-side>
<use>vertex-program-two-side</use> <use>vertex-program-two-side</use>
@ -314,6 +283,7 @@
</technique> </technique>
<technique n="9"> <technique n="9">
<!-- Fallback - no predicate -->
<pass> <pass>
<lighting>true</lighting> <lighting>true</lighting>
<material> <material>