1
0
Fork 0

Also use the new Gray-Alpha texture for water depth information for ws30 water too.

This commit is contained in:
Erik Hofman 2021-05-07 15:39:48 +02:00
parent e741d069ab
commit 5abacfbaf4

View file

@ -51,7 +51,15 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="7">
<image>Textures/Globe/ocean_depth_1.jpg</image>
<image>Textures/Globe/ocean_depth_1.png</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="8">
<image>Textures/Globe/globe_colors.jpg</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -1038,6 +1046,11 @@
<type>sampler-2d</type>
<value type="int">7</value>
</uniform>
<uniform>
<name>water_colormap</name>
<type>sampler-2d</type>
<value type="int">8</value>
</uniform>
<!-- normalmap is .dds-->
<uniform>
<name>normalmap_dds</name>
@ -1390,6 +1403,27 @@
<use>texture[6]/internal-format</use>
</internal-format>
</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>
<vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/include_fog.frag</fragment-shader>