Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 188 files). Show all
Unified · Split
| @@ -94,8 +94,6 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership · 93 unmodified lines | |||
| 94 | connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged); | 94 | connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged); |
| 95 | connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged); | 95 | connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged); |
| 96 | connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged); | 96 | connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged); |
| 97 | connect(nodeList.data(), &NodeList::canRezCertifiedChanged, this, &EntityScriptingInterface::canRezCertifiedChanged); | ||
| 98 | connect(nodeList.data(), &NodeList::canRezTmpCertifiedChanged, this, &EntityScriptingInterface::canRezTmpCertifiedChanged); | ||
| 99 | connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged); | 97 | connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged); |
| 100 | connect(nodeList.data(), &NodeList::canGetAndSetPrivateUserDataChanged, this, &EntityScriptingInterface::canGetAndSetPrivateUserDataChanged); | 98 | connect(nodeList.data(), &NodeList::canGetAndSetPrivateUserDataChanged, this, &EntityScriptingInterface::canGetAndSetPrivateUserDataChanged); |
| 101 | connect(nodeList.data(), &NodeList::canRezAvatarEntitiesChanged, this, &EntityScriptingInterface::canRezAvatarEntitiesChanged); | 99 | connect(nodeList.data(), &NodeList::canRezAvatarEntitiesChanged, this, &EntityScriptingInterface::canRezAvatarEntitiesChanged); |
| @@ -273,16 +271,6 @@ bool EntityScriptingInterface::canRezTmp() { · 171 unmodified lines | |||
| 273 | return nodeList->getThisNodeCanRezTmp(); | 271 | return nodeList->getThisNodeCanRezTmp(); |
| 274 | } | 272 | } |
| 275 | 273 | ||
| 276 | bool EntityScriptingInterface::canRezCertified() { | ||
| 277 | auto nodeList = DependencyManager::get<NodeList>(); | ||
| 278 | return nodeList->getThisNodeCanRezCertified(); | ||
| 279 | } | ||
| 280 | |||
| 281 | bool EntityScriptingInterface::canRezTmpCertified() { | ||
| 282 | auto nodeList = DependencyManager::get<NodeList>(); | ||
| 283 | return nodeList->getThisNodeCanRezTmpCertified(); | ||
| 284 | } | ||
| 285 | |||
| 286 | bool EntityScriptingInterface::canWriteAssets() { | 274 | bool EntityScriptingInterface::canWriteAssets() { |
| 287 | auto nodeList = DependencyManager::get<NodeList>(); | 275 | auto nodeList = DependencyManager::get<NodeList>(); |
| 288 | return nodeList->getThisNodeCanWriteAssets(); | 276 | return nodeList->getThisNodeCanWriteAssets(); |
| @@ -2531,32 +2519,6 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI · 2242 unmodified lines | |||
| 2531 | return result; | 2519 | return result; |
| 2532 | } | 2520 | } |
| 2533 | 2521 | ||
| 2534 | QString EntityScriptingInterface::getStaticCertificateJSON(const QUuid& entityID) { | ||
| 2535 | QByteArray result; | ||
| 2536 | if (_entityTree) { | ||
| 2537 | _entityTree->withReadLock([&] { | ||
| 2538 | EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID)); | ||
| 2539 | if (entity) { | ||
| 2540 | result = entity->getProperties().getStaticCertificateJSON(); | ||
| 2541 | } | ||
| 2542 | }); | ||
| 2543 | } | ||
| 2544 | return result; | ||
| 2545 | } | ||
| 2546 | |||
| 2547 | bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& entityID) { | ||
| 2548 | bool result = false; | ||
| 2549 | if (_entityTree) { | ||
| 2550 | _entityTree->withReadLock([&] { | ||
| 2551 | EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID)); | ||
| 2552 | if (entity) { | ||
| 2553 | result = entity->getProperties().verifyStaticCertificateProperties(); | ||
| 2554 | } | ||
| 2555 | }); | ||
| 2556 | } | ||
| 2557 | return result; | ||
| 2558 | } | ||
| 2559 | |||
| 2560 | const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QString& propertyName) const { | 2522 | const EntityPropertyInfo EntityScriptingInterface::getPropertyInfo(const QString& propertyName) const { |
| 2561 | EntityPropertyInfo propertyInfo; | 2523 | EntityPropertyInfo propertyInfo; |
| 2562 | EntityItemProperties::getPropertyInfo(propertyName, propertyInfo); | 2524 | EntityItemProperties::getPropertyInfo(propertyName, propertyInfo); |