From 9eff34426f9ad92d1743a1403e6ded665f1eac66 Mon Sep 17 00:00:00 2001
From: Thorsten Renk <thorsten@science-and-fiction.org>
Date: Fri, 1 Sep 2017 13:01:21 +0300
Subject: [PATCH] Carriers use procedural deck lights with ALS

---
 .../Nimitz/Models/centre-line-light.xml       | 16 ++++++++++++++
 .../Nimitz/Models/deck-edge-light.xml         | 22 +++++++++++++++++++
 .../Geometry/Nimitz/Models/end-line-light.xml | 21 ++++++++++++++++++
 .../Nimitz/Models/light-drop-line.xml         | 21 ++++++++++++++++++
 .../Nimitz/Models/threshold-light.xml         | 21 ++++++++++++++++++
 5 files changed, 101 insertions(+)

diff --git a/Models/Geometry/Nimitz/Models/centre-line-light.xml b/Models/Geometry/Nimitz/Models/centre-line-light.xml
index 3ddac79f7..6fefda05a 100644
--- a/Models/Geometry/Nimitz/Models/centre-line-light.xml
+++ b/Models/Geometry/Nimitz/Models/centre-line-light.xml
@@ -54,4 +54,20 @@
 		<max-m>5000</max-m>
 	</animation>-->
 
+	<!-- ALS procedural light -->
+	 <model>
+	   	<path>Models/Geometry/Nimitz/Models/center-line-light-proc.xml</path>
+	    	<condition>
+			<and>
+			<property>controls/lighting/deck-lights</property>
+			<property>/sim/rendering/shaders/skydome</property>
+			</and>
+	    	</condition>
+	    	<offsets>
+	      		<x-m>0.000</x-m>
+	      		<y-m>-0.150</y-m>
+	      		<z-m>0.000</z-m>
+	    	</offsets>
+	 </model>
+
 </PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/deck-edge-light.xml b/Models/Geometry/Nimitz/Models/deck-edge-light.xml
index ca0cc0afc..3f772dd0e 100644
--- a/Models/Geometry/Nimitz/Models/deck-edge-light.xml
+++ b/Models/Geometry/Nimitz/Models/deck-edge-light.xml
@@ -12,7 +12,12 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
+			<and>
 			<property>controls/lighting/deck-lights</property>
+			<not>
+				<property>/sim/rendering/shaders/skydome</property>
+			</not>
+			</and>
 		</condition>
 	</animation>
 
@@ -32,4 +37,21 @@
 		<enable-hot type="bool">false</enable-hot>
 		<max-m>3000</max-m>
 	</animation>
+
+	<!-- ALS procedural light -->
+	 <model>
+	   	<path>Models/Geometry/Nimitz/Models/deck-edge-light-proc.xml</path>
+	    	<condition>
+			<and>
+			<property>controls/lighting/deck-lights</property>
+			<property>/sim/rendering/shaders/skydome</property>
+			</and>
+	    	</condition>
+	    	<offsets>
+	      		<x-m>0.000</x-m>
+	      		<y-m>-0.150</y-m>
+	      		<z-m>0.000</z-m>
+	    	</offsets>
+	 </model>
+
 </PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/end-line-light.xml b/Models/Geometry/Nimitz/Models/end-line-light.xml
index da2dd6b84..8a451b7e9 100644
--- a/Models/Geometry/Nimitz/Models/end-line-light.xml
+++ b/Models/Geometry/Nimitz/Models/end-line-light.xml
@@ -18,7 +18,12 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
+			<and>
 			<property>controls/lighting/deck-lights</property>
+			<not>
+				<property>/sim/rendering/shaders/skydome</property>
+			</not>
+			</and>
 		</condition>
 	</animation>
 
@@ -50,4 +55,20 @@
 		<max-m>5000</max-m>
 	</animation>-->
 
+	<!-- ALS procedural light -->
+	 <model>
+	   	<path>Models/Geometry/Nimitz/Models/end-line-light-proc.xml</path>
+	    	<condition>
+			<and>
+			<property>controls/lighting/deck-lights</property>
+			<property>/sim/rendering/shaders/skydome</property>
+			</and>
+	    	</condition>
+	    	<offsets>
+	      		<x-m>0.000</x-m>
+	      		<y-m>-0.150</y-m>
+	      		<z-m>0.000</z-m>
+	    	</offsets>
+	 </model>
+
 </PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/light-drop-line.xml b/Models/Geometry/Nimitz/Models/light-drop-line.xml
index 590197ed6..8870a2870 100644
--- a/Models/Geometry/Nimitz/Models/light-drop-line.xml
+++ b/Models/Geometry/Nimitz/Models/light-drop-line.xml
@@ -17,7 +17,12 @@
 		<type>select</type>
 		<object-name>RedLight</object-name>
 		<condition>
+			<and>
 			<property>controls/lighting/deck-lights</property>
+			<not>
+				<property>/sim/rendering/shaders/skydome</property>
+			</not>
+			</and>
 		</condition>
 	</animation>
 
@@ -49,4 +54,20 @@
 		<max-m>5000</max-m>
 	</animation>-->
 
+	<!-- ALS procedural light -->
+	 <model>
+	   	<path>Models/Geometry/Nimitz/Models/end-line-light-proc.xml</path>
+	    	<condition>
+			<and>
+			<property>controls/lighting/deck-lights</property>
+			<property>/sim/rendering/shaders/skydome</property>
+			</and>
+	    	</condition>
+	    	<offsets>
+	      		<x-m>0.000</x-m>
+	      		<y-m>-0.150</y-m>
+	      		<z-m>0.000</z-m>
+	    	</offsets>
+	 </model>
+
 </PropertyList>
diff --git a/Models/Geometry/Nimitz/Models/threshold-light.xml b/Models/Geometry/Nimitz/Models/threshold-light.xml
index 5c1d99ef3..5586104b0 100644
--- a/Models/Geometry/Nimitz/Models/threshold-light.xml
+++ b/Models/Geometry/Nimitz/Models/threshold-light.xml
@@ -18,7 +18,12 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
+			<and>
 			<property>controls/lighting/deck-lights</property>
+			<not>
+				<property>/sim/rendering/shaders/skydome</property>
+			</not>
+			</and>
 		</condition>
 	</animation>
 
@@ -50,4 +55,20 @@
 		<max-m>5000</max-m>
 	</animation>-->
 
+	<!-- ALS procedural light -->
+	 <model>
+	   	<path>Models/Geometry/Nimitz/Models/threshold-light-proc.xml</path>
+	    	<condition>
+			<and>
+			<property>controls/lighting/deck-lights</property>
+			<property>/sim/rendering/shaders/skydome</property>
+			</and>
+	    	</condition>
+	    	<offsets>
+	      		<x-m>0.000</x-m>
+	      		<y-m>-0.150</y-m>
+	      		<z-m>0.000</z-m>
+	    	</offsets>
+	 </model>
+
 </PropertyList>