From 3f82e9147b5ea2a6e7ea3d9519e27821a2fed6d0 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 22 Dec 2017 16:30:19 -0800
Subject: [PATCH] Change keylight/ambient mode default from "enabled" to
 "inherit"

---
 .../entities-renderer/src/RenderableZoneEntityItem.h |  4 ++--
 libraries/entities/src/EntityItemProperties.h        |  4 ++--
 libraries/entities/src/ZoneEntityItem.h              | 12 ++++--------
 scripts/system/html/entityProperties.html            |  8 ++++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.h b/libraries/entities-renderer/src/RenderableZoneEntityItem.h
index fe3f1a2a14..437aea8d0f 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.h
@@ -88,8 +88,8 @@ private:
 
     BackgroundMode _backgroundMode{ BACKGROUND_MODE_INHERIT };
     ComponentMode _hazeMode { COMPONENT_MODE_INHERIT };
-    ComponentMode _keyLightMode { COMPONENT_MODE_ENABLED };
-    ComponentMode _ambientLightMode { COMPONENT_MODE_ENABLED };
+    ComponentMode _keyLightMode { COMPONENT_MODE_INHERIT };
+    ComponentMode _ambientLightMode { COMPONENT_MODE_INHERIT };
 
     indexed_container::Index _sunIndex{ LightStage::INVALID_INDEX };
     indexed_container::Index _shadowIndex{ LightStage::INVALID_INDEX };
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index e924ab3f94..c5dbb99d69 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -180,8 +180,8 @@ public:
     DEFINE_PROPERTY_GROUP(Stage, stage, StagePropertyGroup);
 
     DEFINE_PROPERTY_REF_ENUM(PROP_HAZE_MODE, HazeMode, hazeMode, uint32_t, (uint32_t)COMPONENT_MODE_INHERIT);
-    DEFINE_PROPERTY_REF_ENUM(PROP_KEY_LIGHT_MODE, KeyLightMode, keyLightMode, uint32_t, (uint32_t)COMPONENT_MODE_ENABLED);
-    DEFINE_PROPERTY_REF_ENUM(PROP_AMBIENT_LIGHT_MODE, AmbientLightMode, ambientLightMode, uint32_t, (uint32_t)COMPONENT_MODE_ENABLED);
+    DEFINE_PROPERTY_REF_ENUM(PROP_KEY_LIGHT_MODE, KeyLightMode, keyLightMode, uint32_t, (uint32_t)COMPONENT_MODE_INHERIT);
+    DEFINE_PROPERTY_REF_ENUM(PROP_AMBIENT_LIGHT_MODE, AmbientLightMode, ambientLightMode, uint32_t, (uint32_t)COMPONENT_MODE_INHERIT);
 
     DEFINE_PROPERTY_GROUP(Skybox, skybox, SkyboxPropertyGroup);
     DEFINE_PROPERTY_GROUP(Haze, haze, HazePropertyGroup);
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index 6a94d5c63b..a020fa90ba 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -118,20 +118,16 @@ public:
     static const bool DEFAULT_GHOSTING_ALLOWED;
     static const QString DEFAULT_FILTER_URL;
 
-    static const uint32_t DEFAULT_HAZE_MODE{ (uint32_t)COMPONENT_MODE_INHERIT };
-    static const uint32_t DEFAULT_KEY_LIGHT_MODE{ (uint32_t)COMPONENT_MODE_ENABLED };    // so as not to change previous behaviour 
-    static const uint32_t DEFAULT_AMBIENT_LIGHT_MODE{ (uint32_t)COMPONENT_MODE_ENABLED };
-
 protected:
     KeyLightPropertyGroup _keyLightProperties;
 
     ShapeType _shapeType = DEFAULT_SHAPE_TYPE;
     QString _compoundShapeURL;
 
-    BackgroundMode _backgroundMode = BACKGROUND_MODE_INHERIT;
-    uint32_t _hazeMode{ DEFAULT_HAZE_MODE };
-    uint32_t _keyLightMode{ DEFAULT_KEY_LIGHT_MODE };
-    uint32_t _ambientLightMode{ DEFAULT_AMBIENT_LIGHT_MODE };
+    BackgroundMode _backgroundMode { BACKGROUND_MODE_INHERIT };
+    uint32_t _hazeMode { COMPONENT_MODE_INHERIT };
+    uint32_t _keyLightMode { COMPONENT_MODE_INHERIT };
+    uint32_t _ambientLightMode { COMPONENT_MODE_INHERIT };
 
     SkyboxPropertyGroup _skyboxProperties;
     HazePropertyGroup _hazeProperties;
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index bc98dcc25f..c914ec34d4 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -512,9 +512,9 @@
                     <label>Key Light</label>
                 </div>
                 <form>
-                    <input type="radio" name="keyLightMode" value="inherit" id="property-zone-key-light-mode-inherit"> Inherit
+                    <input type="radio" name="keyLightMode" value="inherit" id="property-zone-key-light-mode-inherit" checked> Inherit
                     <input type="radio" name="keyLightMode" value="disabled" id="property-zone-key-light-mode-disabled"> Off
-                    <input type="radio" name="keyLightMode" value="enabled" id="property-zone-key-light-mode-enabled" checked> On
+                    <input type="radio" name="keyLightMode" value="enabled" id="property-zone-key-light-mode-enabled"> On
                 </form>
                 <div class="zone-section keylight-section zone-group property rgb">
                     <div class="color-picker" id="property-zone-key-light-color"></div>
@@ -540,9 +540,9 @@
                     <label>Ambient Light</label>
                 </div>
                 <form>
-                    <input type="radio" name="ambientLightMode" value="inherit" id="property-zone-ambient-light-mode-inherit"> Inherit
+                    <input type="radio" name="ambientLightMode" value="inherit" id="property-zone-ambient-light-mode-inherit" checked> Inherit
                     <input type="radio" name="ambientLightMode" value="disabled" id="property-zone-ambient-light-mode-disabled"> Off
-                    <input type="radio" name="ambientLightMode" value="enabled" id="property-zone-ambient-light-mode-enabled" checked> On
+                    <input type="radio" name="ambientLightMode" value="enabled" id="property-zone-ambient-light-mode-enabled"> On
                 </form>
                 <div class="zone-group zone-section ambient-section property number">
                     <label>Ambient intensity</label>