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

Update Entity::sendEntities to return new entity ids

Browse source
This commit is contained in:
Ryan Huffman 2015-03-05 12:34:05 -08:00
parent ef66182ce7
commit 2c68d56059
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities/src/EntityTree.cpp
View file

@ -1000,13 +1000,17 @@ void EntityTree::pruneTree() {
recurseTreeWithOperator(&theOperator); recurseTreeWithOperator(&theOperator);
} }
void EntityTree::sendEntities(EntityEditPacketSender* packetSender, EntityTree* localTree, float x, float y, float z) { QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSender, EntityTree* localTree, float x, float y, float z) {
SendEntitiesOperationArgs args; SendEntitiesOperationArgs args;
args.packetSender = packetSender; args.packetSender = packetSender;
args.localTree = localTree; args.localTree = localTree;
args.root = glm::vec3(x, y, z); args.root = glm::vec3(x, y, z);
QVector<EntityItemID> newEntityIDs;
args.newEntityIDs = &newEntityIDs;
recurseTreeWithOperation(sendEntitiesOperation, &args); recurseTreeWithOperation(sendEntitiesOperation, &args);
packetSender->releaseQueuedMessages(); packetSender->releaseQueuedMessages();
return newEntityIDs;
} }
bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData) { bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData) {
@ -1016,6 +1020,7 @@ bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData)
const QList<EntityItem*>& entities = entityTreeElement->getEntities(); const QList<EntityItem*>& entities = entityTreeElement->getEntities();
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
EntityItemID newID(NEW_ENTITY, EntityItemID::getNextCreatorTokenID(), false); EntityItemID newID(NEW_ENTITY, EntityItemID::getNextCreatorTokenID(), false);
args->newEntityIDs->append(newID);
EntityItemProperties properties = entities[i]->getProperties(); EntityItemProperties properties = entities[i]->getProperties();
properties.setPosition(properties.getPosition() + args->root); properties.setPosition(properties.getPosition() + args->root);
properties.markAllChanged(); // so the entire property set is considered new, since we're making a new entity properties.markAllChanged(); // so the entire property set is considered new, since we're making a new entity

3
libraries/entities/src/EntityTree.h
View file

@ -39,6 +39,7 @@ public:
glm::vec3 root; glm::vec3 root;
EntityTree* localTree; EntityTree* localTree;
EntityEditPacketSender* packetSender; EntityEditPacketSender* packetSender;
QVector<EntityItemID>* newEntityIDs;
}; };
@ -144,7 +145,7 @@ public:
virtual void dumpTree(); virtual void dumpTree();
virtual void pruneTree(); virtual void pruneTree();
void sendEntities(EntityEditPacketSender* packetSender, EntityTree* localTree, float x, float y, float z); QVector<EntityItemID> sendEntities(EntityEditPacketSender* packetSender, EntityTree* localTree, float x, float y, float z);
void entityChanged(EntityItem* entity); void entityChanged(EntityItem* entity);