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

Update EntityServer to use only 1 packet callback for all packet types

Browse source
This commit is contained in:
Ryan Huffman 2015-07-14 14:25:09 -07:00
parent f7c1eaf967
commit 921ee02414
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
assignment-client/src/entities/EntityServer.cpp
View file

@ -26,9 +26,9 @@ EntityServer::EntityServer(NLPacket& packet) :
_entitySimulation(NULL) _entitySimulation(NULL)
{ {
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerPacketListener(PacketType::EntityAdd, this, "handleEntityAddPacket"); packetReceiver.registerPacketListener(
packetReceiver.registerPacketListener(PacketType::EntityEdit, this, "handleEntityEditPacket"); { PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase },
packetReceiver.registerPacketListener(PacketType::EntityErase, this, "handleEntityErasePacket"); this, "handleEntityPacket");
} }
EntityServer::~EntityServer() { EntityServer::~EntityServer() {
@ -41,19 +41,7 @@ EntityServer::~EntityServer() {
tree->removeNewlyCreatedHook(this); tree->removeNewlyCreatedHook(this);
} }
void EntityServer::handleEntityAddPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) { void EntityServer::handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
}
}
void EntityServer::handleEntityEditPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
}
}
void EntityServer::handleEntityErasePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
if (_octreeInboundPacketProcessor) { if (_octreeInboundPacketProcessor) {
_octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode); _octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
} }

4
assignment-client/src/entities/EntityServer.h
View file

@ -50,9 +50,7 @@ protected:
virtual Octree* createTree(); virtual Octree* createTree();
private slots: private slots:
void handleEntityAddPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode); void handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
void handleEntityEditPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
void handleEntityErasePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
private: private:
EntitySimulation* _entitySimulation; EntitySimulation* _entitySimulation;