From 7dcdd8550ea29277498a9aaf02faa467577a8f6d Mon Sep 17 00:00:00 2001
From: Yves Tolosa-Joas <ian.tolosa@hotmail.com>
Date: Mon, 6 Aug 2018 19:41:34 +1000
Subject: [PATCH] Replaced Billboard Navigation Lights with Procedural

---
 AI/Aircraft/E70/ERJ170-main.xml          |  10 -
 AI/Aircraft/E70/ERJ175-main.xml          |  34 +--
 AI/Aircraft/E70/Lights/E70-NavLights.xml | 298 ++++++++---------------
 AI/Aircraft/E70/Lights/E75-NavLights.xml | 122 ++++++++++
 4 files changed, 238 insertions(+), 226 deletions(-)
 create mode 100644 AI/Aircraft/E70/Lights/E75-NavLights.xml

diff --git a/AI/Aircraft/E70/ERJ170-main.xml b/AI/Aircraft/E70/ERJ170-main.xml
index e1efa28b8..4a6c8564b 100644
--- a/AI/Aircraft/E70/ERJ170-main.xml
+++ b/AI/Aircraft/E70/ERJ170-main.xml
@@ -28,14 +28,4 @@
   <model>
     <path>Lights/E70-NavLights.xml</path>
   </model>
-  <!-- Enable Beacons and Strobes Pulse Behaviour -->
-  <nasal>
-    <load><![CDATA[
-        aircraft.light.new("/sim/model/Embraer/lighting/beacon", [0.7, 1.3]);
-        aircraft.light.new("/sim/model/Embraer/lighting/strobes", [0.02, 0.1, 0.02, 1.86]);
-        setprop("/sim/model/Embraer/lighting/beacon/enabled", 1);
-        setprop("/sim/model/Embraer/lighting/strobes/enabled", 1);
-      ]]></load>
-    <unload></unload>
-  </nasal>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/E70/ERJ175-main.xml b/AI/Aircraft/E70/ERJ175-main.xml
index dc6570ad9..3c2eb4283 100644
--- a/AI/Aircraft/E70/ERJ175-main.xml
+++ b/AI/Aircraft/E70/ERJ175-main.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
-
 <PropertyList>
- <description>Embraer Regional Jet 175</description>
- <author>Yves (Ian) Tolosa. Feb 2016 </author> 
- <path>Models/ERJ175.ac</path>
-  
-     <animation>
-		<type>select</type>
-		<object-name>Gear</object-name>
-		<condition>
-			<less-than>
-				<property>velocities/true-airspeed-kt</property>
-				<value>150</value>
-			</less-than>
-		</condition>
-	</animation>
-</PropertyList>
+  <description>Embraer Regional Jet 175</description>
+  <author>Ian(Yves) Tolosa. Feb 2016 </author>
+  <path>Models/ERJ175.ac</path>
+  <animation>
+    <type>select</type>
+    <object-name>Gear</object-name>
+    <condition>
+      <less-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>150</value>
+      </less-than>
+    </condition>
+  </animation>
+  <!-- Add Navigation Lights Objects -->
+  <model>
+    <path>Lights/E75-NavLights.xml</path>
+  </model>
+</PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/E70/Lights/E70-NavLights.xml b/AI/Aircraft/E70/Lights/E70-NavLights.xml
index e442bf43d..c47e509de 100644
--- a/AI/Aircraft/E70/Lights/E70-NavLights.xml
+++ b/AI/Aircraft/E70/Lights/E70-NavLights.xml
@@ -1,218 +1,104 @@
 <?xml version="1.0"?>
+<!-- Author Ian (Yves Tolosa) - AUG 2018 -->
 <PropertyList>
-  <!-- Load Lights Models -->
-  <path>../../../Lights/NavLights.xml</path>
-  <!-- Re-Position Static Light from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <offset-m>12.85</offset-m>
-    <axis>
-      <x> 1.93072</x>
-      <y> -12.3055</y>
-      <z> 3.1682</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <offset-m>12.85</offset-m>
-    <axis>
-      <x> 1.93072</x>
-      <y> 12.3055</y>
-      <z> 3.1682</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Static_White</object-name>
-    <offset-m>15.60</offset-m>
-    <axis>
-      <x> 15.1477</x>
-      <y> 0</y>
-      <z> 4.04033</z>
-    </axis>
-  </animation>
-  <!-- Re-Position Strobe Light from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Left_Wing_Strobe</object-name>
-    <offset-m>14.40</offset-m>
-    <axis>
-      <x> 4.16188</x>
-      <y> -12.9351</y>
-      <z> 4.62991</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Right_Wing_Strobe</object-name>
-    <offset-m>14.40</offset-m>
-    <axis>
-      <x> 4.16188</x>
-      <y> 12.9351</y>
-      <z> 4.62991</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Tail_Strobe</object-name>
-    <offset-m>16</offset-m>
-    <axis>
-      <x> 15.1477</x>
-      <y> 0</y>
-      <z> 4.04033</z>
-    </axis>
-  </animation>
-  <!-- Re-Position Beacons from 0,0,0 onto their final Position -->
-  <animation>
-    <type>translate</type>
-    <object-name>Top_Beacon_Red</object-name>
-    <offset-m>8.01</offset-m>
-    <axis>
-      <x> -6.3054</x>
-      <y> 0</y>
-      <z> 4.93849</z>
-    </axis>
-  </animation>
-  <animation>
-    <type>translate</type>
-    <object-name>Bottom_Beacon_Red</object-name>
-    <offset-m>1.76</offset-m>
-    <axis>
-      <x> -1.5305</x>
-      <y> 0</y>
-      <z> 0.863235</z>
-    </axis>
-  </animation>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>1.93072</x-m>
+      <y-m>12.3055</y-m>
+      <z-m>3.1682</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>1.93072</x-m>
+      <y-m>-12.3055</y-m>
+      <z-m>3.1682</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>15.1477</x-m>
+      <y-m>0</y-m>
+      <z-m>4.04033</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>4.16188</x-m>
+      <y-m>12.9351</y-m>
+      <z-m>4.62991</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>4.16188</x-m>
+      <y-m>-12.9351</y-m>
+      <z-m>4.62991</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>15.2</x-m>
+      <y-m>0</y-m>
+      <z-m>4.04033</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-6.3054</x-m>
+      <y-m>0</y-m>
+      <z-m>4.93849</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.5305</x-m>
+      <y-m>0</y-m>
+      <z-m>0.863235</z-m>
+    </offsets>
+  </model>
   <!-- Group Lights for Shared Animations -->
   <animation>
     <name>StaticGrouped</name>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <object-name>Tail_Static_White</object-name>
+    <object-name>nav-right</object-name>
+    <object-name>nav-left</object-name>
+    <object-name>nav-tail</object-name>
   </animation>
   <animation>
     <name>StrobeGrouped</name>
-    <object-name>Left_Wing_Strobe</object-name>
-    <object-name>Right_Wing_Strobe</object-name>
-    <object-name>Tail_Strobe</object-name>
+    <object-name>strobe-right</object-name>
+    <object-name>strobe-left</object-name>
+    <object-name>strobe-tail</object-name>
   </animation>
   <animation>
     <name>BeaconGrouped</name>
-    <object-name>Top_Beacon_Red</object-name>
-    <object-name>Bottom_Beacon_Red</object-name>
+    <object-name>beacon-top</object-name>
+    <object-name>beacon-bottom</object-name>
   </animation>
-  <!-- Do not compute or show transparent pixels when Rembrand is disabled -->
-  <animation>
-    <type>alpha-test</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <alpha-factor>0.4</alpha-factor>
-  </animation>
-  <!-- Make Navigation lights transparent when Rembrandt is enabled -->
-  <effect>
-    <inherits-from>Effects/model-transparent</inherits-from>
-    <condition>
-      <property>sim/rendering/rembrandt/enabled</property>
-    </condition>
-    <object-name>Left_Wing_Static_Red</object-name>
-    <object-name>Right_Wing_Static_Green</object-name>
-    <object-name>Tail_Static_White</object-name>
-  </effect>
-  <!-- Lights are Emissive -->
-  <animation>
-    <type>material</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <emission>
-      <red>1</red>
-      <green>1</green>
-      <blue>1</blue>
-    </emission>
-  </animation>
-  <!-- Lights always face viewer -->
-  <animation>
-    <type>billboard</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-    <spherical type="bool">true</spherical>
-  </animation>
-  <!-- Lights do not cast shadows -->
-  <animation>
-    <type>noshadow</type>
-    <object-name>StaticGrouped</object-name>
-    <object-name>StrobeGrouped</object-name>
-    <object-name>BeaconGrouped</object-name>
-  </animation>
-  <!-- Scale Static Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>StaticGrouped</object-name>
-    <factor>0.0002</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Scale Beacon Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>BeaconGrouped</object-name>
-    <factor>0.0002</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Scale Strobe Lights based on Distance from Viewer -->
-  <animation>
-    <type>dist-scale</type>
-    <object-name>StrobeGrouped</object-name>
-    <factor>0.0003</factor>
-    <offset>0.0</offset>
-    <min>0.1</min>
-    <max>40</max>
-  </animation>
-  <!-- Show Beacons when Aircraft is moving -->
-  <animation>
-    <type>select</type>
-    <object-name>BeaconGrouped</object-name>
-    <nopreview />
-    <condition>
-      <and>
-        <property>/sim/model/Embraer/lighting/beacon/state</property>
-        <greater-than>
-          <property>transponder-id</property>
-          <value type="string">0</value>
-        </greater-than>
-        <equals>
-          <property>valid</property>
-          <value type="bool">true</value>
-        </equals>
-      </and>
-    </condition>
-  </animation>
-  <!-- Show Strobes when Aircraft on runway or airborne -->
-  <animation>
-    <type>select</type>
-    <object-name>StrobeGrouped</object-name>
-    <nopreview />
-    <condition>
-      <and>
-        <property>/sim/model/Embraer/lighting/strobes/state</property>
-        <greater-than>
-          <property>velocities/true-airspeed-kt</property>
-          <value>40</value>
-        </greater-than>
-      </and>
-    </condition>
-  </animation>
-  <!-- Show Static Lights when aircraft is moving -->
+  <!-- Show Static Lights & Beacons when aircraft is moving -->
   <animation>
     <type>select</type>
     <object-name>StaticGrouped</object-name>
+    <object-name>BeaconGrouped</object-name>
     <nopreview />
     <condition>
       <greater-than>
@@ -221,4 +107,16 @@
       </greater-than>
     </condition>
   </animation>
+  <!-- Show Strobes when Aircraft on runway or airborne -->
+  <animation>
+    <type>select</type>
+    <object-name>StrobeGrouped</object-name>
+    <nopreview />
+    <condition>
+      <greater-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>40</value>
+      </greater-than>
+    </condition>
+  </animation>
 </PropertyList>
\ No newline at end of file
diff --git a/AI/Aircraft/E70/Lights/E75-NavLights.xml b/AI/Aircraft/E70/Lights/E75-NavLights.xml
new file mode 100644
index 000000000..751f01adb
--- /dev/null
+++ b/AI/Aircraft/E70/Lights/E75-NavLights.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!-- Author Ian (Yves Tolosa) - AUG 2018 -->
+<PropertyList>
+  <!-- Position ALS Navigation Lights -->
+  <model>
+    <name>nav-right</name>
+    <path>AI/Lights/procedural_light_nav_right.xml</path>
+    <offsets>
+      <x-m>1.90381</x-m>
+      <y-m>12.2143</y-m>
+      <z-m>3.12482</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-left</name>
+    <path>AI/Lights/procedural_light_nav_left.xml</path>
+    <offsets>
+      <x-m>1.90381</x-m>
+      <y-m>-12.2143</y-m>
+      <z-m>3.12482</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>nav-tail</name>
+    <path>AI/Lights/procedural_light_nav_tail.xml</path>
+    <offsets>
+      <x-m>16.2</x-m>
+      <y-m>0</y-m>
+      <z-m>3.88447</z-m>
+    </offsets>
+  </model>
+  <!-- Position ALS Strobes -->
+  <model>
+    <name>strobe-right</name>
+    <path>AI/Lights/procedural_light_strobe_right.xml</path>
+    <offsets>
+      <x-m>4.1969</x-m>
+      <y-m>12.9351</y-m>
+      <z-m>4.57857</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-left</name>
+    <path>AI/Lights/procedural_light_strobe_left.xml</path>
+    <offsets>
+      <x-m>4.1969</x-m>
+      <y-m>-12.9351</y-m>
+      <z-m>4.57857</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>strobe-tail</name>
+    <path>AI/Lights/procedural_light_strobe_tail.xml</path>
+    <offsets>
+      <x-m>17</x-m>
+      <y-m>0</y-m>
+      <z-m>3.88447</z-m>
+    </offsets>
+  </model>
+  <!-- Position Beacons -->
+  <model>
+    <name>beacon-top</name>
+    <path>AI/Lights/procedural_light_beacon_top.xml</path>
+    <offsets>
+      <x-m>-6.3054</x-m>
+      <y-m>0</y-m>
+      <z-m>4.93849</z-m>
+    </offsets>
+  </model>
+  <model>
+    <name>beacon-bottom</name>
+    <path>AI/Lights/procedural_light_beacon_bottom.xml</path>
+    <offsets>
+      <x-m>-1.5305</x-m>
+      <y-m>0</y-m>
+      <z-m>0.863235</z-m>
+    </offsets>
+  </model>
+  <!-- Group Lights for Shared Animations -->
+  <animation>
+    <name>StaticGrouped</name>
+    <object-name>nav-right</object-name>
+    <object-name>nav-left</object-name>
+    <object-name>nav-tail</object-name>
+  </animation>
+  <animation>
+    <name>StrobeGrouped</name>
+    <object-name>strobe-right</object-name>
+    <object-name>strobe-left</object-name>
+    <object-name>strobe-tail</object-name>
+  </animation>
+  <animation>
+    <name>BeaconGrouped</name>
+    <object-name>beacon-top</object-name>
+    <object-name>beacon-bottom</object-name>
+  </animation>
+  <!-- Show Static Lights & Beacons when aircraft is moving -->
+  <animation>
+    <type>select</type>
+    <object-name>StaticGrouped</object-name>
+    <object-name>BeaconGrouped</object-name>
+    <nopreview />
+    <condition>
+      <greater-than>
+        <property>transponder-id</property>
+        <value type="string">0</value>
+      </greater-than>
+    </condition>
+  </animation>
+  <!-- Show Strobes when Aircraft on runway or airborne -->
+  <animation>
+    <type>select</type>
+    <object-name>StrobeGrouped</object-name>
+    <nopreview />
+    <condition>
+      <greater-than>
+        <property>velocities/true-airspeed-kt</property>
+        <value>40</value>
+      </greater-than>
+    </condition>
+  </animation>
+</PropertyList>
\ No newline at end of file