From c7b73ff91b9f6b31eb09099ef12413ad2e81fad6 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Tue, 11 Jan 2022 21:38:38 +0000
Subject: [PATCH] WS30: Workaround for ALS Ultra road effect

The terrain-default Ultra (n=3) technique
fails for the WS30 line feature.  This change
simply disables it ahead of re-implementing the
traffic shader.
---
 Effects/ws30-railway.eff          | 20 ++++++++++++++++++++
 Effects/ws30-road-high.eff        | 20 ++++++++++++++++++++
 Effects/ws30-road-mid.eff         | 20 ++++++++++++++++++++
 Materials/base/materials-base.xml |  8 +++-----
 4 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 Effects/ws30-railway.eff
 create mode 100644 Effects/ws30-road-high.eff
 create mode 100644 Effects/ws30-road-mid.eff

diff --git a/Effects/ws30-railway.eff b/Effects/ws30-railway.eff
new file mode 100644
index 000000000..76b84d361
--- /dev/null
+++ b/Effects/ws30-railway.eff
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+	<name>Effects/ws30-railway</name>
+	<inherits-from>Effects/terrain-default</inherits-from>
+	<parameters>
+		<speed-factor>0.8</speed-factor>
+		<base-density>0.25</base-density>
+	</parameters>
+	<technique n="3">
+		<!-- Disable the ultra technique as it doesn't work in WS30-->
+		<predicate n="0">
+			<and>
+				<equal>
+					<value type="float">2.0</value>
+					<value type="float">1.0</value>
+				</equal>
+			</and>
+		</predicate>
+	</technique>
+</PropertyList>
diff --git a/Effects/ws30-road-high.eff b/Effects/ws30-road-high.eff
new file mode 100644
index 000000000..7bb73f0af
--- /dev/null
+++ b/Effects/ws30-road-high.eff
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+	<name>Effects/ws30-road-high</name>
+	<inherits-from>Effects/terrain-default</inherits-from>
+	<parameters>
+		<speed-factor>1.2</speed-factor>
+		<base-density>3.0</base-density>
+	</parameters>
+	<technique n="3">
+		<!-- Disable the ultra technique as it doesn't work in WS30-->
+		<predicate n="0">
+			<and>
+				<equal>
+					<value type="float">2.0</value>
+					<value type="float">1.0</value>
+				</equal>
+			</and>
+		</predicate>
+	</technique>
+</PropertyList>
diff --git a/Effects/ws30-road-mid.eff b/Effects/ws30-road-mid.eff
new file mode 100644
index 000000000..fd674458d
--- /dev/null
+++ b/Effects/ws30-road-mid.eff
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PropertyList>
+	<name>Effects/ws30-road-mid</name>
+	<inherits-from>Effects/terrain-default</inherits-from>
+	<parameters>
+		<speed-factor>0.8</speed-factor>
+		<base-density>0.25</base-density>
+	</parameters>
+	<technique n="3">
+		<!-- Disable the ultra technique as it doesn't work in WS30-->
+		<predicate n="0">
+			<and>
+				<equal>
+					<value type="float">2.0</value>
+					<value type="float">1.0</value>
+				</equal>
+			</and>
+		</predicate>
+	</technique>
+</PropertyList>
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index 46f00f5b7..76d12b3ab 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -635,8 +635,7 @@
 <material n="3002">
   <name>ws30Road</name>
   <texture>osm2city/roads.png</texture>
-  <effect>Effects/terrain-default</effect>
-  <!-- <effect>Effects/road-mid</effect> -->
+  <effect>Effects/ws30-road-mid</effect>
   <line-feature-tex-x0>0.25</line-feature-tex-x0>
   <line-feature-tex-x1>0.375</line-feature-tex-x1>
   <line-feature-offset-m>0.75</line-feature-offset-m>
@@ -664,8 +663,7 @@
 <material n="3003">
   <name>ws30Freeway</name>
   <texture>osm2city/roads.png</texture>
-  <effect>Effects/terrain-default</effect>
-  <!-- <effect>Effects/road-high</effect> -->
+  <effect>Effects/ws30-road-high</effect>
   <line-feature-tex-x0>0.625</line-feature-tex-x0>
   <line-feature-tex-x1>0.75</line-feature-tex-x1>
   <line-feature-offset-m>1.0</line-feature-offset-m>
@@ -727,7 +725,7 @@
 <material n="3005">
   <name>ws30Railway</name>
   <texture>osm2city/roads.png</texture>
-  <effect>Effects/terrain-default</effect>
+  <effect>Effects/ws30-railway</effect>
   <line-feature-tex-x0>0</line-feature-tex-x0>
   <line-feature-tex-x1>0.125</line-feature-tex-x1>
   <line-feature-offset-m>0.5</line-feature-offset-m>