Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -65,16 +65,19 @@ void setSimId(EntityItemProperties& propertiesWithSimID, EntityItem* entity) { · 64 unmodified lines | |||
| 65 | auto nodeList = DependencyManager::get<NodeList>(); | 65 | auto nodeList = DependencyManager::get<NodeList>(); |
| 66 | const QUuid myNodeID = nodeList->getSessionUUID(); | 66 | const QUuid myNodeID = nodeList->getSessionUUID(); |
| 67 | 67 | ||
| 68 | // if this entity has non-zero physics/simulation related values, claim simulation ownership | 68 | // // if this entity has non-zero physics/simulation related values, claim simulation ownership |
| 69 | if (propertiesWithSimID.velocityChanged() || | 69 | // if (propertiesWithSimID.velocityChanged() || |
| 70 | propertiesWithSimID.rotationChanged() || | 70 | // propertiesWithSimID.rotationChanged() || |
| 71 | propertiesWithSimID.containsPositionChange()) { | 71 | // propertiesWithSimID.containsPositionChange()) { |
| 72 | propertiesWithSimID.setSimulatorID(myNodeID); | 72 | // propertiesWithSimID.setSimulatorID(myNodeID); |
| 73 | entity->setSimulatorID(myNodeID); | 73 | // entity->setSimulatorID(myNodeID); |
| 74 | } else if (entity->getSimulatorID() == myNodeID) { | 74 | // } else if (entity->getSimulatorID() == myNodeID) { |
| 75 | propertiesWithSimID.setSimulatorID(QUuid()); // give up simulation ownership | 75 | // propertiesWithSimID.setSimulatorID(QUuid()); // give up simulation ownership |
| 76 | entity->setSimulatorID(QUuid()); | 76 | // entity->setSimulatorID(QUuid()); |
| 77 | } | 77 | // } |
| 78 | |||
| 79 | propertiesWithSimID.setSimulatorID(myNodeID); | ||
| 80 | entity->setSimulatorID(myNodeID); | ||
| 78 | } | 81 | } |
| 79 | 82 | ||
| 80 | 83 | ||