Showing the changes to libraries/physics/src/EntityMotionState.cpp (1 of 1 file). Show all
Unified · Split
| @@ -290,12 +290,12 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ · 289 unmodified lines | |||
| 290 | } | 290 | } |
| 291 | else if (simulatorID.isNull() && !(zeroSpeed && zeroSpin)) { | 291 | else if (simulatorID.isNull() && !(zeroSpeed && zeroSpin)) { |
| 292 | // The object is moving and nobody thinks they own the motion. set this Node as the simulator | 292 | // The object is moving and nobody thinks they own the motion. set this Node as the simulator |
| 293 | _entity->setSimulatorID(myNodeID); | 293 | // _entity->setSimulatorID(myNodeID); |
| 294 | properties.setSimulatorID(myNodeID); | 294 | // properties.setSimulatorID(myNodeID); |
| 295 | } else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) { | 295 | } else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) { |
| 296 | // we are the simulator and the object has stopped. give up "simulator" status | 296 | // we are the simulator and the object has stopped. give up "simulator" status |
| 297 | // _entity->setSimulatorID(QUuid()); | 297 | _entity->setSimulatorID(QUuid()); |
| 298 | // properties.setSimulatorID(QUuid()); | 298 | properties.setSimulatorID(QUuid()); |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | // RELIABLE_SEND_HACK: count number of updates for entities at rest so we can stop sending them after some limit. | 301 | // RELIABLE_SEND_HACK: count number of updates for entities at rest so we can stop sending them after some limit. |