From 4bd09fd9afbd7e45d216cd0f182dfc51a73cc2ea Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 11 Jan 2018 14:53:58 -0800
Subject: [PATCH] Corrected default values - for reading legacy content.

---
 libraries/entities/src/EntityTree.cpp        | 38 +++++++++-----------
 libraries/networking/src/udt/PacketHeaders.h |  2 +-
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index ae243623f6..50455ae6be 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -39,11 +39,9 @@
 #include "EntityEditFilters.h"
 #include "EntityDynamicFactoryInterface.h"
 
-
 static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50;
 const float EntityTree::DEFAULT_MAX_TMP_ENTITY_LIFETIME = 60 * 60; // 1 hour
 
-
 // combines the ray cast arguments into a single object
 class RayArgs {
 public:
@@ -2281,28 +2279,25 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             properties.setOwningAvatarID(myNodeID);
         }
 
-        // TEMPORARY fix for older content not containing these fields in the zones
-        if (properties.getType() == EntityTypes::EntityType::Zone) {
-            if (!entityMap.contains("keyLightMode")) {
-                properties.setKeyLightMode(COMPONENT_MODE_ENABLED);
+        // Fix for older content not containing these fields in the zones
+        int contentVersion = map["Version"].toInt();
+        bool needsConversion = (contentVersion < (int)EntityVersion::ZoneLightInheritModes);
+        if (needsConversion && (properties.getType() == EntityTypes::EntityType::Zone)) {
+            // The background should be enabled if the mode is skybox
+            // Note that if the values are default then they are not stored in the JSON file
+            if (entityMap.contains("backgroundMode") && (entityMap["backgroundMode"].toString() == "skybox")) {
+                properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
+            } else {
+                properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
             }
 
-            if (!entityMap.contains("skyboxMode")) {
-                if (entityMap.contains("backgroundMode") && (entityMap["backgroundMode"].toString() == "nothing")) {
-                    properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
-                } else {
-                    // Either the background mode field is missing (shouldn't happen) or the background mode is "skybox"
-                    properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
+            // The legacy version had no keylight/ambient modes - these are always on
+            properties.setKeyLightMode(COMPONENT_MODE_ENABLED);
+            properties.setAmbientLightMode(COMPONENT_MODE_ENABLED);
 
-                    // Copy the skybox URL if the ambient URL is empty, as this is the legacy behaviour
-                    if (properties.getAmbientLight().getAmbientURL() == "") {
-                        properties.getAmbientLight().setAmbientURL(properties.getSkybox().getURL());
-                    }
-                }
-            }
-
-            if (!entityMap.contains("ambientLightMode")) {
-                properties.setAmbientLightMode(COMPONENT_MODE_ENABLED);
+            // Copy the skybox URL if the ambient URL is empty, as this is the legacy behaviour
+            if (properties.getAmbientLight().getAmbientURL() == "") {
+                properties.getAmbientLight().setAmbientURL(properties.getSkybox().getURL());
             }
         }
 
@@ -2312,6 +2307,7 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             success = false;
         }
     }
+
     return success;
 }
 
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 7eafbbccf5..deddeb4153 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -202,7 +202,7 @@ enum class EntityVersion : PacketVersion {
     HazeEffect,
     StaticCertJsonVersionOne,
     OwnershipChallengeFix,
-    ZoneLightInheritModes,
+    ZoneLightInheritModes = 82,
     ZoneStageRemoved
 };