From 8a2fd01e814d9017d13d3580dcf745f462f101df Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Mon, 31 Jul 2017 15:31:37 +0200
Subject: [PATCH] Added check on EntityItem::getEntitiesShouldFadeFunction and
 reactivated fade on model, voxels and polylines

---
 .../src/RenderableModelEntityItem.cpp                  | 10 +++++++---
 .../src/RenderablePolyLineEntityItem.cpp               |  6 ++++--
 .../src/RenderablePolyVoxEntityItem.cpp                | 10 +++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index d6f3ae3f5d..326f069f97 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -32,7 +32,7 @@
 #include "RenderableModelEntityItem.h"
 #include "RenderableEntityItem.h"
 
-//#define USE_FADE_EFFECT
+#define USE_FADE_EFFECT
 
 static CollisionRenderMeshCache collisionMeshCache;
 
@@ -248,7 +248,9 @@ bool RenderableModelEntityItem::addToScene(const EntityItemPointer& self, const
         _model->addToScene(scene, transaction, statusGetters);
 #ifdef USE_FADE_EFFECT
         if (!_hasTransitioned) {
-            transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+            if (EntityItem::getEntitiesShouldFadeFunction()()) {
+                transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+            }
             _hasTransitioned = true;
         }
 #endif
@@ -488,7 +490,9 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
 
 #ifdef USE_FADE_EFFECT
             if (!_hasTransitioned) {
-                transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+                if (EntityItem::getEntitiesShouldFadeFunction()()) {
+                    transaction.addTransitionToItem(_myMetaItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+                }
                 _hasTransitioned = true;
             }
 #endif
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 0071a03d51..5a79213219 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -17,7 +17,7 @@
 #include <PathUtils.h>
 #include <PerfStat.h>
 
-//#define USE_FADE_EFFECT
+#define USE_FADE_EFFECT
 #ifdef USE_FADE_EFFECT
 #   include <FadeEffect.h>
 #endif
@@ -249,7 +249,9 @@ bool RenderablePolyLineEntityItem::addToScene(const EntityItemPointer& self,
 
     transaction.resetItem(_myItem, renderPayload);
 #ifdef USE_FADE_EFFECT
-    transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+    if (EntityItem::getEntitiesShouldFadeFunction()()) {
+        transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+    }
 #endif
     updateMesh();
 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 3d6795ab8a..82ec57a136 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -20,7 +20,7 @@
 #include <model-networking/SimpleMeshProxy.h>
 #include "ModelScriptingInterface.h"
 
-//#define USE_FADE_EFFECT
+#define USE_FADE_EFFECT
 #ifdef USE_FADE_EFFECT
 #   include <FadeEffect.h>
 #endif
@@ -814,7 +814,9 @@ bool RenderablePolyVoxEntityItem::addToScene(const EntityItemPointer& self,
     transaction.resetItem(_myItem, renderPayload);
 #ifdef USE_FADE_EFFECT
     if (_mesh && _mesh->getIndexBuffer()._buffer) {
-        transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+        if (EntityItem::getEntitiesShouldFadeFunction()()) {
+            transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+        }
         _hasTransitioned = true;
     }
 #endif
@@ -1408,7 +1410,9 @@ void RenderablePolyVoxEntityItem::setMesh(model::MeshPointer mesh) {
     if (!_hasTransitioned) {
         render::Transaction transaction;
         render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-        transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+        if (EntityItem::getEntitiesShouldFadeFunction()()) {
+            transaction.addTransitionToItem(_myItem, render::Transition::ELEMENT_ENTER_DOMAIN);
+        }
         scene->enqueueTransaction(transaction);
         _hasTransitioned = true;
     }