sync

Seth Alves committed 11 years ago

Commit fea8d841 parent ad858372 files · +19 −12Browse files

Showing the changes to libraries/physics/src/EntityMotionState.cpp (1 of 2 files). Show all

Unified · Split

libraries/physics/src/EntityMotionState.cpp+11−6

 }
 bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
-    if (getShouldClaimSimulationOwnership()) {
-        return true;
-    }
     bool baseResult = this->ObjectMotionState::shouldSendUpdate(simulationFrame);
     if (!baseResult) {
         return false;
     }
+    if (getShouldClaimSimulationOwnership()) {
+        qDebug() << "shouldSendUpdate due to claiming ownership";
+        return true;
+    }
     auto nodeList = DependencyManager::get<NodeList>();
     const QUuid& myNodeID = nodeList->getSessionUUID();
     const QUuid& simulatorID = _entity->getSimulatorID();
             setShouldClaimSimulationOwnership(false);
         } else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) {
             // we are the simulator and the entity has stopped.  give up "simulator" status
-            // _entity->setSimulatorID(QUuid());
+            _entity->setSimulatorID(QUuid());
+            properties.setSimulatorID(QUuid());
+        } else if (simulatorID == myNodeID && !_body->isActive()) {
+            // it's not active.  don't keep simulation ownership.
+            _entity->setSimulatorID(QUuid());
             properties.setSimulatorID(QUuid());
         }
                 qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()...";
             #endif
-            qDebug() << "sending";
+                qDebug() << "sending" << _body->isActive() << (_entity->getSimulatorID() == myNodeID);
             entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties);
         } else {
             #ifdef WANT_DEBUG

sync

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code