Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

set correct _bidPriority on first ownership update

Browse source
This commit is contained in:
Andrew Meadows 2018-03-29 13:59:42 -07:00
parent 5a5376c3d5
commit a924bd4eb0
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -710,6 +710,10 @@ uint8_t EntityMotionState::getSimulationPriority() const {
return _entity->getSimulationPriority(); return _entity->getSimulationPriority();
} }
void EntityMotionState::slaveBidPriority() {
upgradeBidPriority(_entity->getSimulationPriority());
}
// virtual // virtual
QUuid EntityMotionState::getSimulatorID() const { QUuid EntityMotionState::getSimulatorID() const {
assert(entityTreeIsLocked()); assert(entityTreeIsLocked());

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

@ -101,6 +101,10 @@ protected:
// changes _bidPriority only if priority is larger // changes _bidPriority only if priority is larger
void upgradeBidPriority(uint8_t priority); void upgradeBidPriority(uint8_t priority);
// upgradeBidPriority to value stored in _entity
void slaveBidPriority();
void clearObjectVelocities() const; void clearObjectVelocities() const;
#ifdef WANT_DEBUG_ENTITY_TREE_LOCKS #ifdef WANT_DEBUG_ENTITY_TREE_LOCKS

1
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -358,6 +358,7 @@ void PhysicalEntitySimulation::sendOwnershipBids(uint32_t numSubsteps) {
// in the EntityMotionState::_serverFoo variables (please see comments in EntityMotionState.h) // in the EntityMotionState::_serverFoo variables (please see comments in EntityMotionState.h)
// therefore we need to immediately send an update so that the values stored are what we're // therefore we need to immediately send an update so that the values stored are what we're
// "telling" the server rather than what we've been "hearing" from the server. // "telling" the server rather than what we've been "hearing" from the server.
_bids[i]->slaveBidPriority();
_bids[i]->sendUpdate(_entityPacketSender, numSubsteps); _bids[i]->sendUpdate(_entityPacketSender, numSubsteps);
addOwnership(_bids[i]); addOwnership(_bids[i]);