fly/fgdata
1
0
Fork 0
Code Activity

HDR: Fix WS 2.0 ocean tiles and remove hdr-geometry fallback Effect

Browse source
This commit is contained in:
Fernando García Liñán 2021-08-22 18:15:23 +02:00
parent b79d09d45f
commit 2443c5bce7
2 changed files with 28 additions and 6 deletions

2
Effects/schemes.xml
View file

@ -7,10 +7,12 @@
</scheme>
<!-- HDR -->
<!--
<scheme>
<name>hdr-geometry</name>
<fallback>Effects/Fallback/hdr-geometry</fallback>
</scheme>
-->
<scheme>
<name>hdr-shadow</name>
<fallback>Effects/Fallback/hdr-shadow</fallback>

32
Effects/terrain-default.eff
View file

@ -1680,10 +1680,16 @@
</pass>
</technique>
<technique n="139">
<scheme>hdr-envmap</scheme>
<!-- Just for ocean tiles. For actual terrain we use ws30.eff. -->
<technique n="109">
<scheme>hdr-geometry</scheme>
<pass>
<cull-face>back</cull-face>
<!-- Reverse floating point depth buffer -->
<depth>
<function>gequal</function>
<near>1.0</near>
<far>0.0</far>
</depth>
<texture-unit>
<unit>0</unit>
<type><use>texture[0]/type</use></type>
@ -1691,17 +1697,31 @@
<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>
<blend>0</blend>
<rendering-hint>opaque</rendering-hint>
<cull-face>back</cull-face>
<program>
<vertex-shader>Shaders/HDR/forward.vert</vertex-shader>
<fragment-shader>Shaders/HDR/forward.frag</fragment-shader>
<vertex-shader>Shaders/HDR/geometry.vert</vertex-shader>
<fragment-shader>Shaders/HDR/geometry.frag</fragment-shader>
<fragment-shader>Shaders/HDR/gbuffer-include.frag</fragment-shader>
</program>
<uniform>
<name>color_tex</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<uniform>
<name>color_mode</name>
<type>int</type>
<value>2</value>
<!-- AMBIENT_AND_DIFFUSE -->
</uniform>
<uniform>
<name>material_diffuse</name>
<type>float-vec4</type>
<value><use>material/diffuse</use></value>
</uniform>
</pass>
</technique>
</PropertyList>