History

Initial pass at adding canRezAvatarEntities.

Kalila L committed 5 years ago

Commit 6b5cffa1 parent b1273a011 files · +96 −4Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−0
@@ -57,6 +57,7 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership · 56 unmodified lines
57 connect(nodeList.data(), &NodeList::canRezTmpCertifiedChanged, this, &EntityScriptingInterface::canRezTmpCertifiedChanged);57 connect(nodeList.data(), &NodeList::canRezTmpCertifiedChanged, this, &EntityScriptingInterface::canRezTmpCertifiedChanged);
58 connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);58 connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);
59 connect(nodeList.data(), &NodeList::canGetAndSetPrivateUserDataChanged, this, &EntityScriptingInterface::canGetAndSetPrivateUserDataChanged);59 connect(nodeList.data(), &NodeList::canGetAndSetPrivateUserDataChanged, this, &EntityScriptingInterface::canGetAndSetPrivateUserDataChanged);
60 connect(nodeList.data(), &NodeList::canRezAvatarEntitiesChanged, this, &EntityScriptingInterface::canRezAvatarEntitiesChanged);
60 61
61 auto& packetReceiver = nodeList->getPacketReceiver();62 auto& packetReceiver = nodeList->getPacketReceiver();
62 packetReceiver.registerListener(PacketType::EntityScriptCallMethod,63 packetReceiver.registerListener(PacketType::EntityScriptCallMethod,
@@ -114,6 +115,11 @@ bool EntityScriptingInterface::canGetAndSetPrivateUserData() { · 51 unmodified lines
114 return nodeList->getThisNodeCanGetAndSetPrivateUserData();115 return nodeList->getThisNodeCanGetAndSetPrivateUserData();
115}116}
116 117
118bool EntityScriptingInterface::canRezAvatarEntities() {
119 auto nodeList = DependencyManager::get<NodeList>();
120 return nodeList->getThisNodeCanRezAvatarEntities();
121}
122
117void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {123void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
118 if (_entityTree) {124 if (_entityTree) {
119 disconnect(_entityTree.get(), &EntityTree::addingEntityPointer, this, &EntityScriptingInterface::onAddingEntity);125 disconnect(_entityTree.get(), &EntityTree::addingEntityPointer, this, &EntityScriptingInterface::onAddingEntity);