Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-24 10:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

if an entity is being moved and has no sim-id, set sim-id to local node-id. if it has a sim-id, and it's not the same as the local node's, don't broadcast the change

Browse source
This commit is contained in:
Seth Alves 2015-04-13 12:25:44 -07:00
parent e2af93db5f
commit eace91e833
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,12 +179,41 @@ float EntityMotionState::computeMass(const ShapeInfo& shapeInfo) const {
return _entity->computeMass();
}
void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {
qDebug() << "-------------------------------------------";
qDebug() << "EntityMotionState::sendUpdate" << _type << _motionType << _isKinematic;
bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
bool baseResult = this->ObjectMotionState::shouldSendUpdate(simulationFrame);
if (!baseResult) {
return false;
}
auto nodeList = DependencyManager::get<NodeList>();
QString myNodeID = nodeList->getSessionUUID().toString();
QString simulatorID = _entity->getSimulatorID();
if (simulatorID.isEmpty() && _body->isActive()) {
// The object is moving and nobody thinks they own the motion. set this Node as the simulator
_entity->setSimulatorID(myNodeID);
simulatorID = myNodeID;
} else if (simulatorID == myNodeID && !_body->isActive()) {
// we are the simulator and the object has stopped. give up "simulator" status
_entity->setSimulatorID("");
simulatorID = "";
}
if (simulatorID != myNodeID) {
// some other Node is simulating this, so don't broadcast our computations.
qDebug() << "EntityMotionState::shouldSendUpdate baseResult=" << baseResult << "but"
<< simulatorID << "!=" << myNodeID;
return false;
}
qDebug() << "EntityMotionState::shouldSendUpdate baseResult=" << baseResult;
return baseResult;
}
void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame) {
if (!_entity->isKnownID()) {
return; // never update entities that are unknown
}
@ -218,6 +247,12 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
}
_sentMoving = ! (zeroSpeed && zeroSpin);
qDebug() << "-------------------------------------------";
qDebug() << "EntityMotionState::sendUpdate" << _sentMoving << _body->isActive();
} else {
_sentVelocity = _sentAngularVelocity = glm::vec3(0.0f);
_sentMoving = false;

1
libraries/physics/src/EntityMotionState.h
View file

@ -56,6 +56,7 @@ public:
virtual void computeShapeInfo(ShapeInfo& shapeInfo);
virtual float computeMass(const ShapeInfo& shapeInfo) const;
virtual bool shouldSendUpdate(uint32_t simulationFrame);
virtual void sendUpdate(OctreeEditPacketSender* packetSender, uint32_t frame);
virtual uint32_t getIncomingDirtyFlags() const;