From 3afab3c1d3f96bded6508c68c6f26d56dcdeb1bd Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim@highfidelity.io>
Date: Thu, 5 Oct 2017 18:25:02 -0700
Subject: [PATCH] Keylight attenuation implemented.

---
 .../entities-renderer/src/RenderableZoneEntityItem.cpp    | 8 ++++++--
 scripts/system/html/entityProperties.html                 | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index 1987b48328..846935cc77 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -336,10 +336,14 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity)
 
     const auto& haze = editHaze();
 
-    uint32_t hazeMode = entity->getHazeMode();
-    haze->setHazeActive((hazeMode == HAZE_MODE_RANGE_ONLY) || (hazeMode == HAZE_MODE_RANGE_ALTITUDE));
+    const uint32_t hazeMode = entity->getHazeMode();
+    const bool isHazeActive = ((hazeMode == HAZE_MODE_RANGE_ONLY) || (hazeMode == HAZE_MODE_RANGE_ALTITUDE));
+    haze->setHazeActive(isHazeActive);
     haze->setAltitudeBased(hazeMode == HAZE_MODE_RANGE_ALTITUDE);
 
+    // Directional light attenuation is set whenever haze is active
+    haze->setDirectionaLightAttenuationActive(isHazeActive);
+
     haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange()));
     xColor hazeBlendInColor = _hazeProperties.getHazeBlendInColor();
     haze->setHazeColor(glm::vec3(hazeBlendInColor.red / 255.0, hazeBlendInColor.green / 255.0, hazeBlendInColor.blue / 255.0));
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index c2a2422860..7b4959f088 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -597,8 +597,10 @@
                  </fieldset>
                 <fieldset class="zone-group zone-section haze-section property gen fstuple">
                     <div class="tuple">
-                        <div><label>KeyLight Range Att.<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-range" min="5" max="10000" step="5"></div>
-                        <div><label>KeyLight Altitude Att.<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude" min="-1000" max="5000" step="1"></div>
+                        <div><label>KeyLight Attenuation Range<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-range" 
+                        min="5" max="1000000" step="5"></div>
+                        <div><label>Altitude<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude" 
+                        min="-1000" max="50000" step="10"></div>
                     </div>
                 </fieldset>
            </fieldset>