From d76a2c1add5b7be59460bfd45a11d734db64d5c1 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 12 Sep 2018 15:31:03 -0700
Subject: [PATCH 1/2] disable interstitial by default and fix crash

---
 interface/src/Application.cpp        |  4 +++-
 interface/src/octree/SafeLanding.cpp | 30 +++++++++++++++++++++-------
 scripts/defaultScripts.js            |  5 ++++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 77e2cb3211..ec2288e402 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3498,7 +3498,9 @@ bool Application::isServerlessMode() const {
 }
 
 void Application::setIsInterstitialMode(bool interstitialMode) {
-    if (_interstitialMode != interstitialMode) {
+    Settings settings;
+    bool enableInterstitial = settings.value("enableIntersitialMode", false).toBool();
+    if (_interstitialMode != interstitialMode && enableInterstitial) {
         _interstitialMode = interstitialMode;
 
         DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp
index 9785e0ba95..8b3f1ab7e4 100644
--- a/interface/src/octree/SafeLanding.cpp
+++ b/interface/src/octree/SafeLanding.cpp
@@ -66,13 +66,18 @@ void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
         Locker lock(_lock);
         EntityItemPointer entity = _entityTree->findEntityByID(entityID);
 
-        _trackedEntities.emplace(entityID, entity);
-        int trackedEntityCount = (int)_trackedEntities.size();
+        if (entity) {
 
-        if (trackedEntityCount > _maxTrackedEntityCount) {
-            _maxTrackedEntityCount = trackedEntityCount;
+            _trackedEntities.emplace(entityID, entity);
+            int trackedEntityCount = (int)_trackedEntities.size();
+
+            if (trackedEntityCount > _maxTrackedEntityCount) {
+                _maxTrackedEntityCount = trackedEntityCount;
+            }
+            qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName();
         }
-        qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName();
+    } else {
+        qCDebug(interfaceapp) << "Safe Landing: Null Entity: " << entityID;
     }
 }
 
@@ -146,7 +151,7 @@ bool isEntityPhysicsReady(const EntityItemPointer& entity) {
             bool hasAABox;
             entity->getAABox(hasAABox);
             if (hasAABox && downloadedCollisionTypes.count(modelEntity->getShapeType()) != 0) {
-                return entity->isReadyToComputeShape();
+                return (!entity->shouldBePhysical() || entity->isReadyToComputeShape());
             }
         }
     }
@@ -156,12 +161,23 @@ bool isEntityPhysicsReady(const EntityItemPointer& entity) {
 
 bool SafeLanding::isEntityLoadingComplete() {
     Locker lock(_lock);
+
+
     auto entityTree = qApp->getEntities();
     auto entityMapIter = _trackedEntities.begin();
 
     while (entityMapIter != _trackedEntities.end()) {
         auto entity = entityMapIter->second;
-        bool isVisuallyReady = (entity->isVisuallyReady() || !entityTree->renderableForEntityId(entityMapIter->first));
+
+        bool isVisuallyReady = true;
+
+        Settings settings;
+        bool enableInterstitial = settings.value("enableIntersitialMode", false).toBool();
+
+        if (enableInterstitial) {
+            bool isVisuallyReady = (entity->isVisuallyReady() || !entityTree->renderableForEntityId(entityMapIter->first));
+        }
+
         if (isEntityPhysicsReady(entity) && isVisuallyReady) {
             entityMapIter = _trackedEntities.erase(entityMapIter);
         } else {
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 31510831c8..aaf5ca7260 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -35,10 +35,13 @@ var DEFAULT_SCRIPTS_COMBINED = [
 ];
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
-    "system/interstitialPage.js"
     //"system/chat.js"
 ];
 
+if (Settings.getValue("enableInterstitialMode", false)) {
+    DEFAULT_SCRIPTS_SEPARATE.push("system/interstitialPage.js");
+}
+
 // add a menu item for debugging
 var MENU_CATEGORY = "Developer";
 var MENU_ITEM = "Debug defaultScripts.js";

From dca34c7cbe6800cc45017453ecc8c66b6b264b4f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Thu, 13 Sep 2018 08:32:47 -0700
Subject: [PATCH 2/2] remove warning for GCC

---
 interface/src/octree/SafeLanding.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp
index 8b3f1ab7e4..5d4ebe9853 100644
--- a/interface/src/octree/SafeLanding.cpp
+++ b/interface/src/octree/SafeLanding.cpp
@@ -175,7 +175,7 @@ bool SafeLanding::isEntityLoadingComplete() {
         bool enableInterstitial = settings.value("enableIntersitialMode", false).toBool();
 
         if (enableInterstitial) {
-            bool isVisuallyReady = (entity->isVisuallyReady() || !entityTree->renderableForEntityId(entityMapIter->first));
+            isVisuallyReady = (entity->isVisuallyReady() || !entityTree->renderableForEntityId(entityMapIter->first));
         }
 
         if (isEntityPhysicsReady(entity) && isVisuallyReady) {