properly delete departing avatars

interface/src/avatar/Avatar.cpp

@@ -150,11 +150,12 @@ float Avatar::getLODDistance() const {
 void Avatar::animateScaleChanges(float deltaTime) {
     float currentScale = getUniformScale();
     if (currentScale != _targetScale) {
-        const float SCALE_ANIMATION_TIMESCALE = 1.0f;
-        float blendFactor = deltaTime / SCALE_ANIMATION_TIMESCALE;
-        float animatedScale = (1.0f - blendFactor) * currentScale + blendFactor * _targetScale;
-        const float CLOSE_ENOUGH = 0.05f;
-        if (fabsf(animatedScale - _targetScale) / _targetScale < CLOSE_ENOUGH) {
+        const float SCALE_ANIMATION_TIMESCALE = 0.5f;
+        float scaleVelocity = (_targetScale - currentScale) / SCALE_ANIMATION_TIMESCALE;
+        float animatedScale = currentScale + deltaTime * scaleVelocity;
+        const float MIN_SCALE_SPEED = 0.3f;
+        if (fabsf(scaleVelocity) < MIN_SCALE_SPEED) {
+            // close enough
             animatedScale = _targetScale;
         }
         setScale(glm::vec3(animatedScale)); // avatar scale is uniform
@@ -165,6 +166,9 @@ void Avatar::animateScaleChanges(float deltaTime) {
 void Avatar::simulate(float deltaTime) {
     PerformanceTimer perfTimer("simulate");
 
+    if (!isDead() && !_motionState) {
+        DependencyManager::get<AvatarManager>()->updateAvatarPhysicsShape(this);
+    }
     animateScaleChanges(deltaTime);
 
     // update the billboard render flag
@@ -1107,13 +1111,14 @@ void Avatar::computeShapeInfo(ShapeInfo& shapeInfo) {
     shapeInfo.setOffset(uniformScale * _skeletonModel.getBoundingCapsuleOffset());
 }
 
+void Avatar::setMotionState(AvatarMotionState* motionState) {
+    _motionState = motionState;
+}
+
 // virtual
 void Avatar::rebuildCollisionShape() {
     if (_motionState) {
         _motionState->addDirtyFlags(Simulation::DIRTY_SHAPE);
-    } else {
-        // adebug TODO: move most of updateAvatarPhysicsShape() to here
-        DependencyManager::get<AvatarManager>()->updateAvatarPhysicsShape(this);
     }
 }
 

interface/src/avatar/Avatar.h

@@ -157,7 +157,6 @@ public:
 
     virtual void computeShapeInfo(ShapeInfo& shapeInfo);
 
-    void setMotionState(AvatarMotionState* motionState) { _motionState = motionState; }
     AvatarMotionState* getMotionState() { return _motionState; }
 
     virtual void setPosition(const glm::vec3& position) override;
@@ -172,6 +171,10 @@ public slots:
     glm::quat getRightPalmRotation();
 
 protected:
+    friend class AvatarManager;
+
+    void setMotionState(AvatarMotionState* motionState);
+
     SkeletonModel _skeletonModel;
     glm::vec3 _skeletonOffset;
     QVector<Model*> _attachmentModels;

interface/src/avatar/AvatarManager.cpp

@@ -223,14 +223,14 @@ AvatarSharedPointer AvatarManager::newSharedAvatar() {
 AvatarSharedPointer AvatarManager::addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer) {
     auto newAvatar = AvatarHashMap::addAvatar(sessionUUID, mixerWeakPointer);
     auto rawRenderableAvatar = std::static_pointer_cast<Avatar>(newAvatar);
-    
+
     render::ScenePointer scene = qApp->getMain3DScene();
     render::PendingChanges pendingChanges;
     if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderAvatars()) {
         rawRenderableAvatar->addToScene(rawRenderableAvatar, scene, pendingChanges);
     }
     scene->enqueuePendingChanges(pendingChanges);
-    
+
     return newAvatar;
 }
 
@@ -251,7 +251,7 @@ void AvatarManager::removeAvatarMotionState(AvatarSharedPointer avatar) {
 // virtual
 void AvatarManager::removeAvatar(const QUuid& sessionUUID) {
     QWriteLocker locker(&_hashLock);
-    
+
     auto removedAvatar = _avatarHash.take(sessionUUID);
     if (removedAvatar) {
         handleRemovedAvatar(removedAvatar);
@@ -260,7 +260,8 @@ void AvatarManager::removeAvatar(const QUuid& sessionUUID) {
 
 void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar) {
     AvatarHashMap::handleRemovedAvatar(removedAvatar);
-    
+
+    removedAvatar->die();
     removeAvatarMotionState(removedAvatar);
     _avatarFades.push_back(removedAvatar);
 }
@@ -268,7 +269,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
 void AvatarManager::clearOtherAvatars() {
     // clear any avatars that came from an avatar-mixer
     QWriteLocker locker(&_hashLock);
-    
+
     AvatarHash::iterator avatarIterator =  _avatarHash.begin();
     while (avatarIterator != _avatarHash.end()) {
         auto avatar = std::static_pointer_cast<Avatar>(avatarIterator.value());
@@ -278,7 +279,7 @@ void AvatarManager::clearOtherAvatars() {
         } else {
             auto removedAvatar = avatarIterator.value();
             avatarIterator = _avatarHash.erase(avatarIterator);
-            
+
             handleRemovedAvatar(removedAvatar);
         }
     }
@@ -375,7 +376,6 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
 }
 
 void AvatarManager::updateAvatarPhysicsShape(Avatar* avatar) {
-    // adebug TODO: move most of this logic to MyAvatar class
     assert(!avatar->getMotionState());
 
     ShapeInfo shapeInfo;
@@ -414,6 +414,6 @@ AvatarSharedPointer AvatarManager::getAvatarBySessionID(const QUuid& sessionID)
     if (sessionID == _myAvatar->getSessionUUID()) {
         return _myAvatar;
     }
-    
+
     return findAvatar(sessionID);
 }

interface/src/avatar/AvatarManager.h

@@ -52,7 +52,7 @@ public:
         glm::vec3 color;
         glm::vec3 direction;
     };
-    
+
     Q_INVOKABLE void setLocalLights(const QVector<AvatarManager::LocalLight>& localLights);
     Q_INVOKABLE QVector<AvatarManager::LocalLight> getLocalLights() const;
     // Currently, your own avatar will be included as the null avatar id.
@@ -67,7 +67,7 @@ public:
     void handleCollisionEvents(const CollisionEvents& collisionEvents);
 
     void updateAvatarPhysicsShape(Avatar* avatar);
-    
+
     // Expose results and parameter-tuning operations to other systems, such as stats and javascript.
     Q_INVOKABLE float getRenderDistance() { return _renderDistance; }
     Q_INVOKABLE float getRenderDistanceInverseLowLimit() { return _renderDistanceController.getControlledValueLowLimit(); }
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE void setRenderDistanceKD(float newValue) { _renderDistanceController.setKD(newValue); }
     Q_INVOKABLE void setRenderDistanceInverseLowLimit(float newValue) { _renderDistanceController.setControlledValueLowLimit(newValue); }
     Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue);
-   
+
 public slots:
     void setShouldShowReceiveStats(bool shouldShowReceiveStats) { _shouldShowReceiveStats = shouldShowReceiveStats; }
     void updateAvatarRenderStatus(bool shouldRenderAvatars);
@@ -90,19 +90,19 @@ private:
     AvatarManager(const AvatarManager& other);
 
     void simulateAvatarFades(float deltaTime);
-    
+
     // virtual overrides
     virtual AvatarSharedPointer newSharedAvatar();
     virtual AvatarSharedPointer addAvatar(const QUuid& sessionUUID, const QWeakPointer<Node>& mixerWeakPointer);
     void removeAvatarMotionState(AvatarSharedPointer avatar);
-    
+
     virtual void removeAvatar(const QUuid& sessionUUID);
     virtual void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar);
-    
+
     QVector<AvatarSharedPointer> _avatarFades;
     std::shared_ptr<MyAvatar> _myAvatar;
     quint64 _lastSendAvatarDataTime = 0; // Controls MyAvatar send data rate.
-    
+
     QVector<AvatarManager::LocalLight> _localLights;
 
     bool _shouldShowReceiveStats = false;

libraries/avatars/src/AvatarData.h

@@ -342,6 +342,9 @@ public:
 
     glm::vec3 getClientGlobalPosition() { return _globalPosition; }
 
+    void die() { _isDead = true; }
+    bool isDead() const { return _isDead; }
+
 public slots:
     void sendAvatarDataPacket();
     void sendIdentityPacket();
@@ -413,6 +416,8 @@ protected:
     // updates about one avatar to another.
     glm::vec3 _globalPosition;
 
+    bool _isDead { false };
+
 private:
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
     static QUrl _defaultFullAvatarModelUrl;