From e741d069ab084af35b856465bc53e335834c15ac Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Fri, 7 May 2021 15:24:47 +0200
Subject: [PATCH] Use the new Gray-Alpha texture for water depth information
 for inland water too

---
 Effects/water-inland.eff | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff
index faf272815..bfa08013d 100644
--- a/Effects/water-inland.eff
+++ b/Effects/water-inland.eff
@@ -52,13 +52,21 @@
 			<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>
+                        <wrap-t>repeat</wrap-t>
+                        <internal-format>normalized</internal-format>
+                </texture>
 		<texture n="10">
 			<image>Textures/Terrain/packice-overlay.png</image>
 			<type>2d</type>
@@ -408,6 +416,28 @@
 					<use>texture[10]/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>
@@ -1188,6 +1218,11 @@
 				<type>sampler-2d</type>
 				<value type="int">6</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>