Update OctreePacketProcessor to use QSharedPointer<NLPacket>

This commit is contained in:
Ryan Huffman 2015-07-10 08:45:21 -07:00
parent 976d14736d
commit 78ff6477bd
2 changed files with 8 additions and 8 deletions

View file

@ -26,28 +26,28 @@ OctreePacketProcessor::OctreePacketProcessor() {
} }
// TODO implement packet processing in PacketType-specific methods // TODO implement packet processing in PacketType-specific methods
void OctreePacketProcessor::handleEntityDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { void OctreePacketProcessor::handleEntityDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID()); SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID());
if (sendingNode) { if (sendingNode) {
processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));
} }
} }
void OctreePacketProcessor::handleEntityErasePacket(NLPacket& packet, HifiSockAddr senderSockAddr) { void OctreePacketProcessor::handleEntityErasePacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID()); SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID());
if (sendingNode) { if (sendingNode) {
processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));
} }
} }
void OctreePacketProcessor::handleOctreeStatsPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { void OctreePacketProcessor::handleOctreeStatsPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID()); SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID());
if (sendingNode) { if (sendingNode) {
processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));
} }
} }
void OctreePacketProcessor::handleEnvironmentDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr) { void OctreePacketProcessor::handleEnvironmentDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID()); SharedNodePointer sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(packet->getSourceID());
if (sendingNode) { if (sendingNode) {
processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader())); processPacket(sendingNode, QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));

View file

@ -30,9 +30,9 @@ protected:
virtual void processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet); virtual void processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet);
private slots: private slots:
void handleEntityDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr); void handleEntityDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleEntityErasePacket(NLPacket& packet, HifiSockAddr senderSockAddr); void handleEntityErasePacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleOctreeStatsPacket(NLPacket& packet, HifiSockAddr senderSockAddr); void handleOctreeStatsPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleEnvironmentDataPacket(NLPacket& packet, HifiSockAddr senderSockAddr); void handleEnvironmentDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
}; };
#endif // hifi_OctreePacketProcessor_h #endif // hifi_OctreePacketProcessor_h