take entity-server clock-skew into account when handling action expiration times

interface/src/InterfaceActionFactory.cpp

@@ -66,6 +66,7 @@ EntityActionPointer InterfaceActionFactory::factoryBA(EntityItemPointer ownerEnt
     if (action) {
         action->deserialize(data);
         if (action->lifetimeIsOver()) {
+            qDebug() << "InterfaceActionFactory::factoryBA lifetimeIsOver during action creation";
             return nullptr;
         }
     }

interface/src/avatar/AvatarActionHold.cpp

@@ -243,7 +243,7 @@ QByteArray AvatarActionHold::serialize() const {
         dataStream << _linearTimeScale;
         dataStream << _hand;
 
-        dataStream << _expires;
+        dataStream << _expires + getEntityServerClockSkew();
         dataStream << _tag;
     });
 
@@ -276,6 +276,7 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
         dataStream >> _hand;
 
         dataStream >> _expires;
+        _expires -= getEntityServerClockSkew();
         dataStream >> _tag;
 
         #if WANT_DEBUG

libraries/entities/src/EntityItem.cpp

@@ -342,6 +342,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
                         "ERROR CASE...args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU";
         return 0;
     }
+    setSourceUUID(args.sourceUUID);
 
     args.entitiesPerPacket++;
 
@@ -1534,6 +1535,8 @@ bool EntityItem::addActionInternal(EntitySimulation* simulation, EntityActionPoi
     if (success) {
         _allActionsDataCache = newDataCache;
         _dirtyFlags |= Simulation::DIRTY_PHYSICS_ACTIVATION;
+    } else {
+        qDebug() << "EntityItem::addActionInternal -- serializeActions failed";
     }
     return success;
 }
@@ -1628,6 +1631,7 @@ void EntityItem::deserializeActionsInternal() {
     quint64 now = usecTimestampNow();
 
     if (!_element) {
+        qDebug() << "EntityItem::deserializeActionsInternal -- no _element";
         return;
     }
 
@@ -1670,6 +1674,8 @@ void EntityItem::deserializeActionsInternal() {
             if (action) {
                 entity->addActionInternal(simulation, action);
                 action->locallyAddedButNotYetReceived = false;
+            } else {
+                qDebug() << "EntityItem::deserializeActionsInternal -- action creation failed";
             }
         }
     }

libraries/entities/src/EntityItem.h

@@ -407,9 +407,12 @@ public:
     QVariantMap getActionArguments(const QUuid& actionID) const;
     void deserializeActions();
     void setActionDataDirty(bool value) const { _actionDataDirty = value; }
-    bool getActionDataDirty() const { return _actionDataDirty; }
     bool shouldSuppressLocationEdits() const;
 
+    void setSourceUUID(const QUuid& sourceUUID) { _sourceUUID = sourceUUID; }
+    const QUuid& getSourceUUID() const { return _sourceUUID; }
+    bool matchesSourceUUID(const QUuid& sourceUUID) const  { return _sourceUUID == sourceUUID; }
+
 protected:
 
     const QByteArray getActionDataInternal() const;
@@ -510,6 +513,8 @@ protected:
     // _previouslyDeletedActions is used to avoid an action being re-added due to server round-trip lag
     static quint64 _rememberDeletedActionTime;
     mutable QHash<QUuid, quint64> _previouslyDeletedActions;
+
+    QUuid _sourceUUID; /// the server node UUID we came from
 };
 
 #endif // hifi_EntityItem_h

libraries/physics/src/EntityMotionState.cpp

@@ -302,7 +302,7 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
         _serverPosition += dt * _serverVelocity;
     }
 
-    if (_serverActionData != _entity->getActionData() || _entity->getActionDataDirty()) {
+    if (_serverActionData != _entity->getActionData()) {
         setOutgoingPriority(SCRIPT_EDIT_SIMULATION_PRIORITY);
         return true;
     }

libraries/physics/src/ObjectAction.cpp

@@ -62,6 +62,22 @@ void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar delta
     updateActionWorker(deltaTimeStep);
 }
 
+int ObjectAction::getEntityServerClockSkew() {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    auto ownerEntity = _ownerEntity.lock();
+    if (!ownerEntity) {
+        return 0;
+    }
+
+    const QUuid& entityServerNodeID = ownerEntity->getSourceUUID();
+    auto entityServerNode = nodeList->nodeWithUUID(entityServerNodeID);
+    if (entityServerNode) {
+        return entityServerNode->getClockSkewUsec();
+    }
+    return 0;
+}
+
 bool ObjectAction::updateArguments(QVariantMap arguments) {
     bool somethingChanged = false;
 

libraries/physics/src/ObjectAction.h

@@ -50,6 +50,8 @@ public:
 
 protected:
 
+    int getEntityServerClockSkew();
+
     virtual btRigidBody* getRigidBody();
     virtual glm::vec3 getPosition();
     virtual void setPosition(glm::vec3 position);

libraries/physics/src/ObjectActionOffset.cpp

@@ -160,7 +160,7 @@ QByteArray ObjectActionOffset::serialize() const {
         dataStream << _linearDistance;
         dataStream << _linearTimeScale;
         dataStream << _positionalTargetSet;
-        dataStream << _expires;
+        dataStream << _expires + getEntityServerClockSkew();
         dataStream << _tag;
     });
 
@@ -190,6 +190,7 @@ void ObjectActionOffset::deserialize(QByteArray serializedArguments) {
         dataStream >> _linearTimeScale;
         dataStream >> _positionalTargetSet;
         dataStream >> _expires;
+        _expires -= getEntityServerClockSkew();
         dataStream >> _tag;
         _active = true;
     });

libraries/physics/src/ObjectActionSpring.cpp

@@ -198,7 +198,7 @@ QByteArray ObjectActionSpring::serialize() const {
         dataStream << _rotationalTarget;
         dataStream << _angularTimeScale;
         dataStream << _rotationalTargetSet;
-        dataStream << _expires;
+        dataStream << _expires + getEntityServerClockSkew();
         dataStream << _tag;
     });
 
@@ -233,6 +233,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) {
         dataStream >> _rotationalTargetSet;
 
         dataStream >> _expires;
+        _expires -= getEntityServerClockSkew();
         dataStream >> _tag;
 
         _active = true;