From ffe873806511decbde35ba0a86343425528fc8ca Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sat, 6 Nov 2021 16:21:58 +0000
Subject: [PATCH] WS30: Correct phototexture coordinates

---
 Effects/ws30.eff | 103 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 99 insertions(+), 4 deletions(-)

diff --git a/Effects/ws30.eff b/Effects/ws30.eff
index 3df2880c5..09810a34c 100644
--- a/Effects/ws30.eff
+++ b/Effects/ws30.eff
@@ -193,7 +193,21 @@
   <technique n="4">
     <predicate>
       <and>
-        <property>/sim/rendering/photoscenery/enabled</property>
+        <and>
+          <property>/sim/rendering/photoscenery/enabled</property>
+        </and>
+        <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>
 
@@ -223,10 +237,91 @@
         <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>
-        <environment>
-          <mode>modulate</mode>
-        </environment>
       </texture-unit>
+      <program>
+        <vertex-shader>Shaders/include_fog.vert</vertex-shader>
+        <vertex-shader>Shaders/default.vert</vertex-shader>
+        <vertex-shader>Shaders/shadows-include.vert</vertex-shader>
+        <fragment-shader>Shaders/ws30-photo.frag</fragment-shader>
+        <fragment-shader>Shaders/include_fog.frag</fragment-shader>
+        <fragment-shader>Shaders/shadows-include.frag</fragment-shader>
+        <fragment-shader>Shaders/clustered-include.frag</fragment-shader>
+        <attribute>
+          <name>orthophotoTexCoord</name>
+          <index>14</index>
+        </attribute>
+      </program>
+      <uniform>
+        <name>visibility</name>
+        <type>float</type>
+        <value><use>visibility</use></value>
+      </uniform>
+      <uniform>
+        <name>avisibility</name>
+        <type>float</type>
+        <value><use>avisibility</use></value>
+      </uniform>
+      <uniform>
+        <name>hazeLayerAltitude</name>
+        <type>float</type>
+        <value><use>lthickness</use></value>
+      </uniform>
+      <uniform>
+        <name>scattering</name>
+        <type>float</type>
+        <value><use>scattering</use></value>
+      </uniform>
+      <uniform>
+        <name>terminator</name>
+        <type>float</type>
+        <value><use>terminator</use></value>
+      </uniform>
+      <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>colorMode</name>
+        <type>int</type>
+        <value>2</value>
+        <!-- AMBIENT_AND_DIFFUSE -->
+      </uniform>
+      <uniform>
+        <name>orthophotoTexture</name>
+        <type>sampler-2d</type>
+        <value type="int">15</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 -->
+      <depth>
+        <function>lequal</function>
+    <!--    <write-mask type="bool">false</write-mask> -->
+      </depth>
     </pass>
   </technique>