1
0
Fork 0

Simplify building.eff, fix lack of orthoTexCoord

This commit is contained in:
Stuart Buchanan 2021-04-25 21:36:02 +01:00
parent bde07c8862
commit 4db5d00c16

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PropertyList> <PropertyList>
<name>Effects/building</name> <name>Effects/building</name>
<inherits-from>Effects/model-combined-deferred</inherits-from> <inherits-from>Effects/model-combined</inherits-from>
<parameters> <parameters>
<texture n="0"> <texture n="0">
<type>2d</type> <type>2d</type>
@ -38,12 +38,7 @@
<use>/sim/time/sun-angle-rad</use> <use>/sim/time/sun-angle-rad</use>
</lightmap-factor> </lightmap-factor>
<lightmap-color type="vec3d" n="0"> 0.3 0.3 0.3 </lightmap-color> <lightmap-color type="vec3d" n="0"> 0.3 0.3 0.3 </lightmap-color>
<!--<lightmap-factor type="float" n="1">1.0</lightmap-factor>
<lightmap-color type="vec3d" n="1"> 1.0 1.0 1.0 </lightmap-color>
<lightmap-factor type="float" n="2">1.0</lightmap-factor>
<lightmap-color type="vec3d" n="2"> 1.0 1.0 1.0 </lightmap-color>
<lightmap-factor type="float" n="3">1.0</lightmap-factor>
<lightmap-color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap-color>-->
<!-- Reflection --> <!-- Reflection -->
<reflection-enabled type="int"> 1 </reflection-enabled> <reflection-enabled type="int"> 1 </reflection-enabled>
<reflect-map-enabled type="int"> 1 </reflect-map-enabled> <reflect-map-enabled type="int"> 1 </reflect-map-enabled>
@ -73,9 +68,6 @@
<snow-enabled>1</snow-enabled> <snow-enabled>1</snow-enabled>
<!--Ambient correction --> <!--Ambient correction -->
<ambient-correction type="float"> 0.0 </ambient-correction> <ambient-correction type="float"> 0.0 </ambient-correction>
<dirt-enabled type="int"> 0 </dirt-enabled>
<dirt-color type="vec3d"> 0.0 0.0 0.0 </dirt-color>
<dirt-factor type="float"> 0.0 </dirt-factor>
<material> <material>
<active>true</active> <active>true</active>
<color-mode-uniform>1</color-mode-uniform> <color-mode-uniform>1</color-mode-uniform>
@ -96,48 +88,11 @@
</blend> </blend>
<shade-model>flat</shade-model> <shade-model>flat</shade-model>
<cull-face>back</cull-face> <cull-face>back</cull-face>
<rendering-hint>opaque</rendering-hint>
<!-- fog include for atmospheric scattering-->
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<scattering><use>/rendering/scene/scattering</use></scattering>
<ground_scattering><use>/environment/surface/scattering</use></ground_scattering>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<overcast><use>/rendering/scene/overcast</use></overcast>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<snow_level><use>/environment/snow-level-m</use></snow_level>
<dust_cover_factor><use>/environment/surface/dust-cover-factor</use></dust_cover_factor>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<fogstructure><use>/environment/fog-structure</use></fogstructure>
<delta_T><use>/environment/surface/delta-T-structure</use></delta_T>
<!-- END fog include -->
<building-flag type="int">1</building-flag> <building-flag type="int">1</building-flag>
</parameters> </parameters>
<technique n="4"> <technique n="4">
<!-- Atmospheric scattering technique with model shader--> <!-- Atmospheric scattering technique with model shader-->
<predicate>
<and>
<property>/sim/rendering/shaders/skydome</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>
@ -184,33 +139,9 @@
<technique n="5"> <technique n="5">
<!-- Base Atmospheric scattering technique --> <!-- Base Atmospheric scattering technique -->
<predicate>
<and>
<property>/sim/rendering/shaders/skydome</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>
<program> <program>
<vertex-shader>Shaders/building-ALS.vert</vertex-shader> <vertex-shader n="0">Shaders/building-ALS.vert</vertex-shader>
<vertex-shader>Shaders/shadows-include.vert</vertex-shader>
<fragment-shader>Shaders/terrain-ALS-base.frag</fragment-shader>
<fragment-shader>Shaders/hazes.frag</fragment-shader>
<fragment-shader>Shaders/filters-ALS.frag</fragment-shader>
<fragment-shader>Shaders/noise.frag</fragment-shader>
<fragment-shader>Shaders/shadows-include.frag</fragment-shader>
<fragment-shader>Shaders/clustered-include.frag</fragment-shader>
<attribute> <attribute>
<name>instancePosition</name> <name>instancePosition</name>
<index>10</index> <index>10</index>
@ -233,17 +164,8 @@
<technique n="11"> <technique n="11">
<pass> <pass>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<program n="0"> <program n="0">
<vertex-shader n="1">Shaders/building-default.vert</vertex-shader> <vertex-shader n="1">Shaders/building-default.vert</vertex-shader>
<vertex-shader n="2">Shaders/shadows-include.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<!--fog include-->
<fragment-shader n="1">Shaders/default.frag</fragment-shader>
<fragment-shader n="2">Shaders/shadows-include.frag</fragment-shader>
<fragment-shader n="3">Shaders/clustered-include.frag</fragment-shader>
<attribute> <attribute>
<name>instancePosition</name> <name>instancePosition</name>
<index>10</index> <index>10</index>
@ -264,155 +186,4 @@
</pass> </pass>
</technique> </technique>
<technique n="12">
<pass>
<lighting>true</lighting>
<material>
<active>
<use>material/active</use>
</active>
<ambient>
<use>material/ambient</use>
</ambient>
<diffuse>
<use>material/diffuse</use>
</diffuse>
<specular>
<use>material/specular</use>
</specular>
<emissive>
<use>material/emissive</use>
</emissive>
<shininess>
<use>material/shininess</use>
</shininess>
<color-mode>off</color-mode>
</material>
<render-bin>
<bin-number>2</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<blend>
<active>
<use>blend/active</use>
</active>
<source>
<use>blend/source</use>
</source>
<destination>
<use>blend/destination</use>
</destination>
</blend>
<shade-model>
<use>shade-model</use>
</shade-model>
<cull-face>
<use>cull-face</use>
</cull-face>
<rendering-hint>
<use>rendering-hint</use>
</rendering-hint>
<texture-unit>
<!-- The texture unit is always active because the shaders expect
that. -->
<unit>0</unit>
<!-- If there is a texture, the type in the derived effect
will be "2d". -->
<type>
<use>texture[0]/type</use>
</type>
<image>
<use>texture[0]/image</use>
</image>
<filter>
<use>texture[0]/filter</use>
</filter>
<wrap-s>
<use>texture[0]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[0]/wrap-t</use>
</wrap-t>
<!--
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
-->
</texture-unit>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<program n="0">
<vertex-shader n="0">Shaders/building-default.vert</vertex-shader>
<vertex-shader n="1">Shaders/shadows-include.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<!--fog include-->
<fragment-shader n="1">Shaders/default.frag</fragment-shader>
<fragment-shader n="2">Shaders/shadows-include.frag</fragment-shader>
<fragment-shader n="3">Shaders/clustered-include.frag</fragment-shader>
<attribute>
<name>instancePosition</name>
<index>10</index>
</attribute>
<attribute>
<name>instanceScale</name>
<index>11</index>
</attribute>
<attribute>
<name>attrib1</name>
<index>12</index>
</attribute>
<attribute>
<name>attrib2</name>
<index>13</index>
</attribute>
</program>
<uniform>
<name>fogType</name>
<type>int</type>
<value>
<use>fogtype</use>
</value>
</uniform>
<uniform>
<name>texture</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<uniform>
<name>dataBuffer</name>
<type>sampler-1d</type>
<value type="int">1</value>
</uniform>
<uniform>
<name>colorMode</name>
<type>int</type>
<value>
<use>material/color-mode-uniform</use>
</value>
</uniform>
<!-- BEGIN shadows include -->
<uniform>
<name>shadow_tex</name>
<type>sampler-2d</type>
<value type="int">10</value>
</uniform>
<uniform>
<name>shadows_enabled</name>
<type>bool</type>
<value>
<use>shadows_enabled</use>
</value>
</uniform>
<uniform>
<name>sun_atlas_size</name>
<type>int</type>
<value>
<use>sun_atlas_size</use>
</value>
</uniform>
<!-- END shadows include -->
</pass>
</technique>
</PropertyList> </PropertyList>