addressing more requested changes

interface/src/avatar/AvatarManager.cpp

@@ -496,7 +496,6 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
     // it might not fire until after we create a new instance for the same remote avatar, which creates a race
     // on the creation of entities for that avatar instance and the deletion of entities for this instance
     avatar->removeAvatarEntitiesFromTree();
-    avatar->setIsFading(false);
     if (removalReason == KillAvatarReason::TheirAvatarEnteredYourBubble) {
         emit DependencyManager::get<UsersScriptingInterface>()->enteredIgnoreRadius();
 
@@ -518,7 +517,6 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
 
         workload::SpacePointer space = _space;
         transaction.transitionFinishedOperator(avatar->getRenderItemID(), [space, avatar]() {
-            avatar->setIsFading(false);
             const render::ScenePointer& scene = qApp->getMain3DScene();
             render::Transaction transaction;
             avatar->removeFromScene(avatar, scene, transaction);

libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp

@@ -677,7 +677,6 @@ void Avatar::fade(render::Transaction& transaction, render::Transition::Type typ
             transaction.addTransitionToItem(itemId, type, _renderItemID);
         }
     }
-    _isFading = true;
 }
 
 void Avatar::removeFromScene(AvatarSharedPointer self, const render::ScenePointer& scene, render::Transaction& transaction) {

libraries/avatars-renderer/src/avatars-renderer/Avatar.h

@@ -462,8 +462,6 @@ public:
 
     void fadeIn(render::ScenePointer scene);
     void fadeOut(render::Transaction& transaction, KillAvatarReason reason);
-    bool isFading() const { return _isFading; }
-    void setIsFading(bool isFading) { _isFading = isFading; }
 
     // JSDoc is in AvatarData.h.
     Q_INVOKABLE virtual float getEyeHeight() const override;
@@ -655,7 +653,6 @@ protected:
     bool _initialized { false };
     bool _isAnimatingScale { false };
     bool _mustFadeIn { false };
-    bool _isFading { false };
     bool _reconstructSoftEntitiesJointMap { false };
     float _modelScale { 1.0f };
 

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -1054,9 +1054,7 @@ void EntityTreeRenderer::fadeOutRenderable(const EntityRendererPointer& renderab
     render::Transaction transaction;
     auto scene = _viewState->getMain3DScene();
 
-    renderable->setIsFading(true);
     transaction.transitionFinishedOperator(renderable->getRenderItemID(), [scene, renderable]() {
-        renderable->setIsFading(false);
         render::Transaction transaction;
         renderable->removeFromScene(scene, transaction);
         scene->enqueueTransaction(transaction);

libraries/entities-renderer/src/EntityTreeRenderer.h

@@ -94,7 +94,6 @@ public:
     void reloadEntityScripts();
 
     void fadeOutRenderable(const EntityRendererPointer& renderable);
-    void removeFadedRenderables();
 
     // event handles which may generate entity related events
     QUuid mousePressEvent(QMouseEvent* event);

libraries/entities-renderer/src/RenderableEntityItem.cpp

@@ -418,6 +418,9 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa
         if (fading || _prevIsTransparent != transparent) {
             emit requestRenderUpdate();
         }
+        if (fading) {
+            _isFading = Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f;
+        }
 
         _prevIsTransparent = transparent;
 

libraries/entities-renderer/src/RenderableEntityItem.h

@@ -44,9 +44,6 @@ public:
     const EntityItemPointer& getEntity() const { return _entity; }
     const ItemID& getRenderItemID() const { return _renderItemID; }
 
-    bool getIsFading() { return _isFading; }
-    void setIsFading(bool isFading) { _isFading = isFading; }
-
     const SharedSoundPointer& getCollisionSound() { return _collisionSound; }
     void setCollisionSound(const SharedSoundPointer& sound) { _collisionSound = sound; }