From ff3c6f25090fef7b1ca814b13596c33b34b22176 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Sun, 30 Jan 2022 10:27:21 +0100
Subject: [PATCH] Fix ALS procedural light intensity_scale and add a Compositor
 light dim-factor for stobes. Amke pointlights non-directional for ALS

---
 Aircraft/Generic/pointlight.xml | 14 ++++++++------
 Aircraft/Generic/spotlight.xml  | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Aircraft/Generic/pointlight.xml b/Aircraft/Generic/pointlight.xml
index 3a11e7d2f..fbdc0df2c 100644
--- a/Aircraft/Generic/pointlight.xml
+++ b/Aircraft/Generic/pointlight.xml
@@ -26,9 +26,9 @@
    <b>1.0</b>
   </specular>
   <attenuation>
-   <c>1.3</c>
-   <l>1.5</l>
-   <q>4</q>
+   <c>1.0</c>
+   <l>0.7</l>
+   <q>1.1</q>
   </attenuation>
   <inner-angle>0.75</inner-angle>
   <outer-angle>0.85</outer-angle>
@@ -44,7 +44,7 @@
   <y-offset>0.175</y-offset>
   <z-offset>0.175</z-offset>
  </animation>
- 
+
  <animation>
   <type>dist-scale</type>
   <object-name>light</object-name>
@@ -78,6 +78,7 @@
  </animation>
 
  <effect>
+  <name>Effects/pointlight</name>
   <object-name>light</object-name>
   <inherits-from>Effects/procedural-light</inherits-from>
   <parameters>
@@ -90,11 +91,11 @@
    <light_color_center_r alias="/params/specular/r"/>
    <light_color_center_g alias="/params/specular/g"/>
    <light_color_center_b alias="/params/specular/b"/>
-   <intensity_scale alias="/params/power-source"/>
+   <intensity_scale>1.0</intensity_scale>
    <pointing_x alias="/params/direction/x"/>
    <pointing_y alias="/params/direction/y"/>
    <pointing_z alias="/params/direction/z"/>
-   <is_directional type="bool">true</is_directional>
+   <is_directional type="bool">false</is_directional>
    <is_strobe type="bool">false</is_strobe>
    <inner_angle alias="/params/inner-angle"/>
    <outer_angle alias="/params/outer-angle"/>
@@ -146,6 +147,7 @@
    <q alias="/params/attenuation/q"/>
   </attenuation>
   <range-m alias="/params/range-m"/>
+  <dim-factor><property alias="/params/power-source"/></dim-factor>
  </light>
 
 </PropertyList>
diff --git a/Aircraft/Generic/spotlight.xml b/Aircraft/Generic/spotlight.xml
index 5057d0be4..37343bcb2 100644
--- a/Aircraft/Generic/spotlight.xml
+++ b/Aircraft/Generic/spotlight.xml
@@ -26,9 +26,9 @@
    <b>1.0</b>
   </specular>
   <attenuation>
-   <c>1.3</c>
-   <l>1.5</l>
-   <q>4</q>
+   <c>1.0</c>
+   <l>0.7</l>
+   <q>1.1</q>
   </attenuation>
   <inner-angle>0.75</inner-angle>
   <outer-angle>0.85</outer-angle>
@@ -46,7 +46,7 @@
   <y-offset>0.175</y-offset>
   <z-offset>0.175</z-offset>
  </animation>
- 
+
  <animation>
   <type>dist-scale</type>
   <object-name>light</object-name>
@@ -80,6 +80,7 @@
  </animation>
 
  <effect>
+  <name>Effects/spotlight</name>
   <object-name>light</object-name>
   <inherits-from>Effects/procedural-light</inherits-from>
   <parameters>
@@ -92,7 +93,7 @@
    <light_color_center_r alias="/params/specular/r"/>
    <light_color_center_g alias="/params/specular/g"/>
    <light_color_center_b alias="/params/specular/b"/>
-   <intensity_scale alias="/params/power-source"/>
+   <intensity_scale>1.0</intensity_scale>
    <pointing_x alias="/params/direction/x"/>
    <pointing_y alias="/params/direction/y"/>
    <pointing_z alias="/params/direction/z"/>
@@ -150,6 +151,7 @@
   <spot-cutoff alias="/params/spot-cutoff"/>
   <spot-exponent alias="/params/spot-exponent"/>
   <range-m alias="/params/range-m"/>
+  <dim-factor><property alias="/params/power-source"/></dim-factor>
  </light>
 
 </PropertyList>