History

cleanup access to sessionID

Andrew Meadows committed 8 years ago

Commit 21654ba1 parent f63610a1 file · +7 −12Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+7−12
@@ -242,13 +242,12 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 241 unmodified lines
242242 _activityTracking.addedEntityCount++;
243243
244244 auto nodeList = DependencyManager::get<NodeList>();
245− auto sessionID = nodeList->getSessionUUID();
245+ const auto sessionID = nodeList->getSessionUUID();
246246
247247 EntityItemProperties propertiesWithSimID = properties;
248248 if (clientOnly) {
249− const QUuid myNodeID = sessionID;
250249 propertiesWithSimID.setClientOnly(clientOnly);
251− propertiesWithSimID.setOwningAvatarID(myNodeID);
250+ propertiesWithSimID.setOwningAvatarID(sessionID);
252251 }
253252
254253 propertiesWithSimID.setLastEditedBy(sessionID);
@@ -530,8 +529,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 275 unmodified lines
530529
531530 _activityTracking.editedEntityCount++;
532531
533− auto nodeList = DependencyManager::get<NodeList>();
534− auto sessionID = nodeList->getSessionUUID();
532+ const auto sessionID = DependencyManager::get<NodeList>()->getSessionUUID();
535533
536534 EntityItemProperties properties = scriptSideProperties;
537535 properties.setLastEditedBy(sessionID);
@@ -550,7 +548,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 12 unmodified lines
550548 return;
551549 }
552550
553− if (entity->getClientOnly() && entity->getOwningAvatarID() != nodeList->getSessionUUID()) {
551+ if (entity->getClientOnly() && entity->getOwningAvatarID() != sessionID) {
554552 // don't edit other avatar's avatarEntities
555553 return;
556554 }
@@ -600,10 +598,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 43 unmodified lines
600598 bool hasTransformOrVelocityChanges = properties.hasTransformOrVelocityChanges();
601599 bool hasPhysicsChanges = properties.hasMiscPhysicsChanges() || hasTransformOrVelocityChanges;
602600 if (_bidOnSimulationOwnership && hasPhysicsChanges) {
603− auto nodeList = DependencyManager::get<NodeList>();
604− const QUuid myNodeID = nodeList->getSessionUUID();
605−
606− if (entity->getSimulatorID() == myNodeID) {
601+ if (entity->getSimulatorID() == sessionID) {
607602 // we think we already own the simulation, so make sure to send the full transform and all velocities
608603 if (hasTransformOrVelocityChanges) {
609604 entity->getTransformAndVelocityProperties(properties);
@@ -618,11 +613,11 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 8 unmodified lines
618613
619614 if (entity->getSimulationPriority() < SCRIPT_POKE_SIMULATION_PRIORITY) {
620615 // we re-assert our simulation ownership at a higher priority
621− properties.setSimulationOwner(myNodeID, SCRIPT_POKE_SIMULATION_PRIORITY);
616+ properties.setSimulationOwner(sessionID, SCRIPT_POKE_SIMULATION_PRIORITY);
622617 }
623618 } else {
624619 // we make a bid for simulation ownership
625− properties.setSimulationOwner(myNodeID, SCRIPT_POKE_SIMULATION_PRIORITY);
620+ properties.setSimulationOwner(sessionID, SCRIPT_POKE_SIMULATION_PRIORITY);
626621 entity->setScriptSimulationPriority(SCRIPT_POKE_SIMULATION_PRIORITY);
627622 }
628623 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t