Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 06:53:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

accept simulation release from entity-server

Browse source
This commit is contained in:
Andrew Meadows 2015-06-15 10:58:14 -07:00
parent d0ac3e4514
commit 7c793c6397
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities/src/EntityItem.cpp
View file

@ -124,6 +124,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
requestedProperties += PROP_USER_DATA; requestedProperties += PROP_USER_DATA;
requestedProperties += PROP_MARKETPLACE_ID; requestedProperties += PROP_MARKETPLACE_ID;
requestedProperties += PROP_NAME; requestedProperties += PROP_NAME;
requestedProperties += PROP_SIMULATOR_PRIORITY;
requestedProperties += PROP_SIMULATOR_ID; requestedProperties += PROP_SIMULATOR_ID;
requestedProperties += PROP_HREF; requestedProperties += PROP_HREF;
requestedProperties += PROP_DESCRIPTION; requestedProperties += PROP_DESCRIPTION;
@ -599,16 +600,17 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
if (_simulatorID == nodeList->getSessionUUID()) { if (_simulatorID == nodeList->getSessionUUID()) {
// we think we're the simulation owner but entity-server says otherwise // we think we're the simulation owner but entity-server says otherwise
// we relenquish ownership iff the incoming priority is greater than or equal to ours // we relenquish ownership only if we don't have MAX_SIMULATOR_PRIORITY
// AND we don't have max priority if (_simulatorPriority != MAX_SIMULATOR_PRIORITY) {
if (priority >= _simulatorPriority && _simulatorPriority != MAX_SIMULATOR_PRIORITY) {
// we're losing simulation ownership // we're losing simulation ownership
_simulatorID = id; _simulatorID = id;
_simulatorPriority = priority; _simulatorPriority = priority;
_dirtyFlags |= EntityItem::DIRTY_SIMULATOR_ID;
} }
} else { } else {
_simulatorID = id; _simulatorID = id;
_simulatorPriority = priority; _simulatorPriority = priority;
_dirtyFlags |= EntityItem::DIRTY_SIMULATOR_ID;
} }
} else if (priority != _simulatorPriority) { } else if (priority != _simulatorPriority) {
// priority is changing but simulatorID is not. // priority is changing but simulatorID is not.
@ -967,8 +969,8 @@ EntityItemProperties EntityItem::getProperties() const {
COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionsWillMove, getCollisionsWillMove); COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionsWillMove, getCollisionsWillMove);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(locked, getLocked); COPY_ENTITY_PROPERTY_TO_PROPERTIES(locked, getLocked);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(userData, getUserData); COPY_ENTITY_PROPERTY_TO_PROPERTIES(userData, getUserData);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(simulatorID, getSimulatorID);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(simulatorPriority, getSimulatorPriority); COPY_ENTITY_PROPERTY_TO_PROPERTIES(simulatorPriority, getSimulatorPriority);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(simulatorID, getSimulatorID);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(marketplaceID, getMarketplaceID); COPY_ENTITY_PROPERTY_TO_PROPERTIES(marketplaceID, getMarketplaceID);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName); COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref); COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref);

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

@ -101,7 +101,7 @@ void EntityMotionState::handleEasyChanges(uint32_t flags) {
if (flags & EntityItem::DIRTY_SIMULATOR_ID) { if (flags & EntityItem::DIRTY_SIMULATOR_ID) {
_loopsSinceOwnershipBid = 0; _loopsSinceOwnershipBid = 0;
_loopsWithoutOwner = 0; _loopsWithoutOwner = 0;
_candidateForOwnership = 0; _candidateForOwnership = false;
if (_entity->getSimulatorID().isNull() if (_entity->getSimulatorID().isNull()
&& !_entity->isMoving() && !_entity->isMoving()
&& _body->isActive()) { && _body->isActive()) {