fly/fgdata
1
0
Fork 0
Code Activity

Use the new Gray-Alpha texture for water depth information for inland water too

Browse source
This commit is contained in:
Erik Hofman 2021-05-07 15:24:47 +02:00
parent 055ce55be4
commit e741d069ab
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Effects/water-inland.eff
View file

@ -52,13 +52,21 @@
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<texture n="7"> <texture n="7">
<image>Textures/Globe/ocean_depth_1.jpg</image> <image>Textures/Globe/ocean_depth_1.png</image>
<type>2d</type> <type>2d</type>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<texture n="8">
<image>Textures/Globe/globe_colors.jpg</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<texture n="10"> <texture n="10">
<image>Textures/Terrain/packice-overlay.png</image> <image>Textures/Terrain/packice-overlay.png</image>
<type>2d</type> <type>2d</type>
@ -408,6 +416,28 @@
<use>texture[10]/internal-format</use> <use>texture[10]/internal-format</use>
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<texture-unit>
<unit>8</unit>
<image>
<use>texture[8]/image</use>
</image>
<type>
<use>texture[8]/type</use>
</type>
<filter>
<use>texture[8]/filter</use>
</filter>
<wrap-s>
<use>texture[8]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[8]/wrap-t</use>
</wrap-t>
<internal-format>
<use>texture[8]/internal-format</use>
</internal-format>
</texture-unit>
<program> <program>
<vertex-shader>Shaders/water-ALS.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
@ -1188,6 +1218,11 @@
<type>sampler-2d</type> <type>sampler-2d</type>
<value type="int">6</value> <value type="int">6</value>
</uniform> </uniform>
<uniform>
<name>water_colormap</name>
<type>sampler-2d</type>
<value type="int">8</value>
</uniform>
<!-- normalmap is .dds--> <!-- normalmap is .dds-->
<uniform> <uniform>
<name>normalmap_dds</name> <name>normalmap_dds</name>