experimenting

This commit is contained in:
Seth Alves 2015-04-22 13:03:59 -07:00
parent dc30ca0210
commit a6750eafd8

View file

@ -284,8 +284,8 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
QUuid simulatorID = _entity->getSimulatorID();
if (_entity->getShouldClaimSimulationOwnership()) {
_entity->setSimulatorID(myNodeID);
properties.setSimulatorID(myNodeID);
// _entity->setSimulatorID(myNodeID);
// properties.setSimulatorID(myNodeID);
_entity->setShouldClaimSimulationOwnership(false);
}
else if (simulatorID.isNull() && !(zeroSpeed && zeroSpin)) {
@ -294,8 +294,8 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
// properties.setSimulatorID(myNodeID);
} else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) {
// we are the simulator and the object has stopped. give up "simulator" status
_entity->setSimulatorID(QUuid());
properties.setSimulatorID(QUuid());
// _entity->setSimulatorID(QUuid());
// properties.setSimulatorID(QUuid());
}
// RELIABLE_SEND_HACK: count number of updates for entities at rest so we can stop sending them after some limit.