Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 19:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
Seth Alves 2015-04-24 13:10:38 -07:00
parent a27f8f3f10
commit 902e84c711
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/physics/src/EntityMotionState.cpp
View file

@ -211,7 +211,7 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
const QUuid& myNodeID = nodeList->getSessionUUID();
const QUuid& simulatorID = _entity->getSimulatorID();
if (simulatorID != myNodeID && !simulatorID.isNull()) {
if (simulatorID != myNodeID /* && !simulatorID.isNull() */) {
// some other Node owns the simulating of this, so don't broadcast the results of local simulation.
return false;
}
@ -300,12 +300,12 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
// }
if (getShouldClaimSimulationOwnership()) {
_entity->setSimulatorID(myNodeID);
// _entity->setSimulatorID(myNodeID);
properties.setSimulatorID(myNodeID);
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());
}