From 74940a2132529a8f748a2ac21f74de59cd2aaa23 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 8 Jul 2015 10:18:11 -0700 Subject: [PATCH] replace lingering PacketTypes in old format --- assignment-client/src/Agent.cpp | 22 +++++----- assignment-client/src/AssignmentClient.cpp | 8 ++-- .../src/AssignmentClientMonitor.cpp | 2 +- assignment-client/src/audio/AudioMixer.cpp | 14 +++--- .../src/audio/AudioMixerClientData.cpp | 10 ++--- .../src/audio/AvatarAudioStream.cpp | 4 +- assignment-client/src/avatars/AvatarMixer.cpp | 12 ++--- .../src/entities/EntityNodeData.h | 2 +- assignment-client/src/entities/EntityServer.h | 4 +- assignment-client/src/octree/OctreeServer.cpp | 4 +- .../octree/OctreeServerDatagramProcessor.cpp | 2 +- domain-server/src/DomainServer.cpp | 30 ++++++------- ice-server/src/IceServer.cpp | 4 +- interface/src/Application.cpp | 2 +- interface/src/DatagramProcessor.cpp | 44 +++++++++---------- interface/src/avatar/MyAvatar.cpp | 2 +- .../src/octree/OctreePacketProcessor.cpp | 8 ++-- libraries/audio/src/InboundAudioStream.cpp | 4 +- libraries/avatars/src/AvatarData.cpp | 6 +-- libraries/avatars/src/AvatarHashMap.cpp | 8 ++-- .../src/EntityTreeRenderer.h | 4 +- .../entities/src/EntityEditPacketSender.cpp | 4 +- .../entities/src/EntityScriptingInterface.cpp | 12 ++--- libraries/entities/src/EntityTree.cpp | 22 +++++----- libraries/entities/src/EntityTree.h | 4 +- .../entities/src/EntityTreeHeadlessViewer.h | 4 +- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/NodeList.cpp | 2 +- libraries/octree/src/EditPacketBuffer.cpp | 2 +- libraries/octree/src/JurisdictionListener.cpp | 2 +- libraries/octree/src/JurisdictionListener.h | 6 +-- libraries/octree/src/JurisdictionMap.cpp | 4 +- libraries/octree/src/JurisdictionSender.cpp | 2 +- libraries/octree/src/JurisdictionSender.h | 2 +- libraries/octree/src/Octree.cpp | 2 +- libraries/octree/src/Octree.h | 2 +- .../octree/src/OctreeEditPacketSender.cpp | 6 +-- libraries/physics/src/EntityMotionState.cpp | 2 +- libraries/script-engine/src/ScriptEngine.cpp | 6 +-- 39 files changed, 141 insertions(+), 141 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index b53a58c5c0..0cf5b4b7d5 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -58,7 +58,7 @@ void Agent::readPendingDatagrams() { if (nodeList->packetVersionAndHashMatch(receivedPacket)) { PacketType::Value datagramPacketType = packetTypeForPacket(receivedPacket); - if (datagramPacketType == PacketTypeJurisdiction) { + if (datagramPacketType == PacketType::Jurisdiction) { int headerBytes = numBytesForPacketHeader(receivedPacket); SharedNodePointer matchedNode = nodeList->sendingNodeForPacket(receivedPacket); @@ -73,9 +73,9 @@ void Agent::readPendingDatagrams() { } } - } else if (datagramPacketType == PacketTypeOctreeStats - || datagramPacketType == PacketTypeEntityData - || datagramPacketType == PacketTypeEntityErase + } else if (datagramPacketType == PacketType::OctreeStats + || datagramPacketType == PacketType::EntityData + || datagramPacketType == PacketType::EntityErase ) { // Make sure our Node and NodeList knows we've heard from this node. SharedNodePointer sourceNode = nodeList->sendingNodeForPacket(receivedPacket); @@ -84,7 +84,7 @@ void Agent::readPendingDatagrams() { QByteArray mutablePacket = receivedPacket; int messageLength = mutablePacket.size(); - if (datagramPacketType == PacketTypeOctreeStats) { + if (datagramPacketType == PacketType::OctreeStats) { int statsMessageLength = OctreeHeadlessViewer::parseOctreeStats(mutablePacket, sourceNode); if (messageLength > statsMessageLength) { @@ -103,11 +103,11 @@ void Agent::readPendingDatagrams() { datagramPacketType = packetTypeForPacket(mutablePacket); } // fall through to piggyback message - if (datagramPacketType == PacketTypeEntityData || datagramPacketType == PacketTypeEntityErase) { + if (datagramPacketType == PacketType::EntityData || datagramPacketType == PacketType::EntityErase) { _entityViewer.processDatagram(mutablePacket, sourceNode); } - } else if (datagramPacketType == PacketTypeMixedAudio || datagramPacketType == PacketTypeSilentAudioFrame) { + } else if (datagramPacketType == PacketType::MixedAudio || datagramPacketType == PacketType::SilentAudioFrame) { _receivedAudioStream.parseData(receivedPacket); @@ -118,10 +118,10 @@ void Agent::readPendingDatagrams() { // let this continue through to the NodeList so it updates last heard timestamp // for the sending audio mixer DependencyManager::get()->processNodeData(senderSockAddr, receivedPacket); - } else if (datagramPacketType == PacketTypeBulkAvatarData - || datagramPacketType == PacketTypeAvatarIdentity - || datagramPacketType == PacketTypeAvatarBillboard - || datagramPacketType == PacketTypeKillAvatar) { + } else if (datagramPacketType == PacketType::BulkAvatarData + || datagramPacketType == PacketType::AvatarIdentity + || datagramPacketType == PacketType::AvatarBillboard + || datagramPacketType == PacketType::KillAvatar) { // let the avatar hash map process it DependencyManager::get()->processAvatarMixerDatagram(receivedPacket, nodeList->sendingNodeForPacket(receivedPacket)); diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index b503f59156..fd9e4f4f71 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -218,9 +218,9 @@ void AssignmentClient::readPendingDatagrams() { senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer()); if (nodeList->packetVersionAndHashMatch(receivedPacket)) { - if (packetTypeForPacket(receivedPacket) == PacketTypeCreateAssignment) { + if (packetTypeForPacket(receivedPacket) == PacketType::CreateAssignment) { - qDebug() << "Received a PacketTypeCreateAssignment - attempting to unpack."; + qDebug() << "Received a PacketType::CreateAssignment - attempting to unpack."; // construct the deployed assignment from the packet data _currentAssignment = AssignmentFactory::unpackAssignment(receivedPacket); @@ -271,10 +271,10 @@ void AssignmentClient::readPendingDatagrams() { } else { qDebug() << "Received an assignment that could not be unpacked. Re-requesting."; } - } else if (packetTypeForPacket(receivedPacket) == PacketTypeStopNode) { + } else if (packetTypeForPacket(receivedPacket) == PacketType::StopNode) { if (senderSockAddr.getAddress() == QHostAddress::LocalHost || senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) { - qDebug() << "AssignmentClientMonitor at" << senderSockAddr << "requested stop via PacketTypeStopNode."; + qDebug() << "AssignmentClientMonitor at" << senderSockAddr << "requested stop via PacketType::StopNode."; QCoreApplication::quit(); } else { diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index 3331e81a18..7dabde54d6 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -214,7 +214,7 @@ void AssignmentClientMonitor::readPendingDatagrams() { senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer()); if (nodeList->packetVersionAndHashMatch(receivedPacket)) { - if (packetTypeForPacket(receivedPacket) == PacketTypeNodeJsonStats) { + if (packetTypeForPacket(receivedPacket) == PacketType::NodeJsonStats) { QUuid packetUUID = uuidFromPacketHeader(receivedPacket); SharedNodePointer matchingNode = nodeList->sendingNodeForPacket(receivedPacket); if (!matchingNode) { diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index f73735ddb5..bc69374b57 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -540,18 +540,18 @@ void AudioMixer::readPendingDatagram(const QByteArray& receivedPacket, const Hif if (nodeList->packetVersionAndHashMatch(receivedPacket)) { // pull any new audio data from nodes off of the network stack PacketType::Value mixerPacketType = packetTypeForPacket(receivedPacket); - if (mixerPacketType == PacketTypeMicrophoneAudioNoEcho - || mixerPacketType == PacketTypeMicrophoneAudioWithEcho - || mixerPacketType == PacketTypeInjectAudio - || mixerPacketType == PacketTypeSilentAudioFrame - || mixerPacketType == PacketTypeAudioStreamStats) { + if (mixerPacketType == PacketType::MicrophoneAudioNoEcho + || mixerPacketType == PacketType::MicrophoneAudioWithEcho + || mixerPacketType == PacketType::InjectAudio + || mixerPacketType == PacketType::SilentAudioFrame + || mixerPacketType == PacketType::AudioStreamStats) { nodeList->findNodeAndUpdateWithDataFromPacket(receivedPacket); - } else if (mixerPacketType == PacketTypeMuteEnvironment) { + } else if (mixerPacketType == PacketType::MuteEnvironment) { SharedNodePointer sendingNode = nodeList->sendingNodeForPacket(receivedPacket); if (sendingNode->getCanAdjustLocks()) { QByteArray packet = receivedPacket; - nodeList->populatePacketHeader(packet, PacketTypeMuteEnvironment); + nodeList->populatePacketHeader(packet, PacketType::MuteEnvironment); nodeList->eachNode([&](const SharedNodePointer& node){ if (node->getType() == NodeType::Agent && node->getActiveSocket() && diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index b9fe98a2bd..c394305998 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -51,7 +51,7 @@ AvatarAudioStream* AudioMixerClientData::getAvatarAudioStream() const { int AudioMixerClientData::parseData(const QByteArray& packet) { PacketType::Value packetType = packetTypeForPacket(packet); - if (packetType == PacketTypeAudioStreamStats) { + if (packetType == PacketType::AudioStreamStats) { const char* dataAt = packet.data(); @@ -67,9 +67,9 @@ int AudioMixerClientData::parseData(const QByteArray& packet) { } else { PositionalAudioStream* matchingStream = NULL; - if (packetType == PacketTypeMicrophoneAudioWithEcho - || packetType == PacketTypeMicrophoneAudioNoEcho - || packetType == PacketTypeSilentAudioFrame) { + if (packetType == PacketType::MicrophoneAudioWithEcho + || packetType == PacketType::MicrophoneAudioNoEcho + || packetType == PacketType::SilentAudioFrame) { QUuid nullUUID = QUuid(); if (!_audioStreams.contains(nullUUID)) { @@ -84,7 +84,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) { } else { matchingStream = _audioStreams.value(nullUUID); } - } else if (packetType == PacketTypeInjectAudio) { + } else if (packetType == PacketType::InjectAudio) { // this is injected audio // grab the stream identifier for this injected audio diff --git a/assignment-client/src/audio/AvatarAudioStream.cpp b/assignment-client/src/audio/AvatarAudioStream.cpp index 0cece94094..68f8f718de 100644 --- a/assignment-client/src/audio/AvatarAudioStream.cpp +++ b/assignment-client/src/audio/AvatarAudioStream.cpp @@ -21,7 +21,7 @@ AvatarAudioStream::AvatarAudioStream(bool isStereo, const InboundAudioStream::Se int AvatarAudioStream::parseStreamProperties(PacketType::Value type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) { int readBytes = 0; - if (type == PacketTypeSilentAudioFrame) { + if (type == PacketType::SilentAudioFrame) { const char* dataAt = packetAfterSeqNum.constData(); quint16 numSilentSamples = *(reinterpret_cast(dataAt)); readBytes += sizeof(quint16); @@ -31,7 +31,7 @@ int AvatarAudioStream::parseStreamProperties(PacketType::Value type, const QByte readBytes += parsePositionalData(packetAfterSeqNum.mid(readBytes)); } else { - _shouldLoopbackForNode = (type == PacketTypeMicrophoneAudioWithEcho); + _shouldLoopbackForNode = (type == PacketType::MicrophoneAudioWithEcho); // read the channel flag quint8 channelFlag = packetAfterSeqNum.at(readBytes); diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 30ce80e1eb..d64870180e 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -254,7 +254,7 @@ void AvatarMixer::broadcastAvatarData() { } PacketSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID()); - PacketSequenceNumber lastSeqFromSender = otherNode->getLastSequenceNumberForPacketType(PacketType::AvatarData); + PacketSequenceNumber lastSeqFromSender = otherNode->getLastSequenceNumberForPacketType::(PacketType::AvatarData); if (lastSeqToReceiver > lastSeqFromSender) { // Did we somehow get out of order packets from the sender? @@ -283,7 +283,7 @@ void AvatarMixer::broadcastAvatarData() { // set the last sent sequence number for this sender on the receiver nodeData->setLastBroadcastSequenceNumber(otherNode->getUUID(), - otherNode->getLastSequenceNumberForPacketType(PacketType::AvatarData)); + otherNode->getLastSequenceNumberForPacketType::(PacketType::AvatarData)); // start a new segment in the PacketList for this avatar avatarPacketList.startSegment(); @@ -399,11 +399,11 @@ void AvatarMixer::readPendingDatagrams() { while (readAvailableDatagram(receivedPacket, senderSockAddr)) { if (nodeList->packetVersionAndHashMatch(receivedPacket)) { switch (packetTypeForPacket(receivedPacket)) { - case PacketTypeAvatarData: { + case PacketType::AvatarData: { nodeList->findNodeAndUpdateWithDataFromPacket(receivedPacket); break; } - case PacketTypeAvatarIdentity: { + case PacketType::AvatarIdentity: { // check if we have a matching node in our list SharedNodePointer avatarNode = nodeList->sendingNodeForPacket(receivedPacket); @@ -420,7 +420,7 @@ void AvatarMixer::readPendingDatagrams() { } break; } - case PacketTypeAvatarBillboard: { + case PacketType::AvatarBillboard: { // check if we have a matching node in our list SharedNodePointer avatarNode = nodeList->sendingNodeForPacket(receivedPacket); @@ -438,7 +438,7 @@ void AvatarMixer::readPendingDatagrams() { } break; } - case PacketTypeKillAvatar: { + case PacketType::KillAvatar: { nodeList->processKillNode(receivedPacket); break; } diff --git a/assignment-client/src/entities/EntityNodeData.h b/assignment-client/src/entities/EntityNodeData.h index a31374c4ab..054ceb07d3 100644 --- a/assignment-client/src/entities/EntityNodeData.h +++ b/assignment-client/src/entities/EntityNodeData.h @@ -22,7 +22,7 @@ public: OctreeQueryNode(), _lastDeletedEntitiesSentAt(0) { } - virtual PacketType::Value getMyPacketType() const { return PacketTypeEntityData; } + virtual PacketType::Value getMyPacketType() const { return PacketType::EntityData; } quint64 getLastDeletedEntitiesSentAt() const { return _lastDeletedEntitiesSentAt; } void setLastDeletedEntitiesSentAt(quint64 sentAt) { _lastDeletedEntitiesSentAt = sentAt; } diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h index cde3958bf3..ba80c91b71 100644 --- a/assignment-client/src/entities/EntityServer.h +++ b/assignment-client/src/entities/EntityServer.h @@ -28,11 +28,11 @@ public: // Subclasses must implement these methods virtual OctreeQueryNode* createOctreeQueryNode(); virtual char getMyNodeType() const { return NodeType::EntityServer; } - virtual PacketType::Value getMyQueryMessageType() const { return PacketTypeEntityQuery; } + virtual PacketType::Value getMyQueryMessageType() const { return PacketType::EntityQuery; } virtual const char* getMyServerName() const { return MODEL_SERVER_NAME; } virtual const char* getMyLoggingServerTargetName() const { return MODEL_SERVER_LOGGING_TARGET_NAME; } virtual const char* getMyDefaultPersistFilename() const { return LOCAL_MODELS_PERSIST_FILE; } - virtual PacketType::Value getMyEditNackType() const { return PacketTypeEntityEditNack; } + virtual PacketType::Value getMyEditNackType() const { return PacketType::EntityEditNack; } virtual QString getMyDomainSettingsKey() const { return QString("entity_server_settings"); } // subclass may implement these method diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index f6d8eaf7c8..332edb2569 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -875,7 +875,7 @@ void OctreeServer::readPendingDatagram(const QByteArray& receivedPacket, const H nodeData->initializeOctreeSendThread(this, matchingNode); } } - } else if (packetType == PacketTypeOctreeDataNack) { + } else if (packetType == PacketType::OctreeDataNack) { // If we got a nack packet, then we're talking to an agent, and we // need to make sure we have it in our nodeList. if (matchingNode) { @@ -884,7 +884,7 @@ void OctreeServer::readPendingDatagram(const QByteArray& receivedPacket, const H nodeData->parseNackPacket(receivedPacket); } } - } else if (packetType == PacketTypeJurisdictionRequest) { + } else if (packetType == PacketType::JurisdictionRequest) { _jurisdictionSender->queueReceivedPacket(matchingNode, receivedPacket); } else if (_octreeInboundPacketProcessor && getOctree()->handlesEditPacketType(packetType)) { _octreeInboundPacketProcessor->queueReceivedPacket(matchingNode, receivedPacket); diff --git a/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp b/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp index 98b50383c7..94249e7517 100644 --- a/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp +++ b/assignment-client/src/octree/OctreeServerDatagramProcessor.cpp @@ -44,7 +44,7 @@ void OctreeServerDatagramProcessor::readPendingDatagrams() { senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer()); PacketType::Value packetType = packetTypeForPacket(incomingPacket); - if (packetType == PacketTypePing) { + if (packetType == PacketType::Ping) { DependencyManager::get()->processNodeData(senderSockAddr, incomingPacket); return; // don't emit } diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 96980a6f48..a967392696 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -706,7 +706,7 @@ void DomainServer::handleConnectRequest(const QByteArray& packet, const HifiSock nodeData->setSendingSockAddr(senderSockAddr); - // reply back to the user with a PacketTypeDomainList + // reply back to the user with a PacketType::DomainList sendDomainListToNode(newNode, senderSockAddr, nodeInterestList.toSet()); // send out this node to our other connected nodes @@ -1002,7 +1002,7 @@ void DomainServer::broadcastNewNode(const SharedNodePointer& addedNode) { auto limitedNodeList = DependencyManager::get(); // setup the add packet for this new node - QByteArray addNodePacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketTypeDomainServerAddedNode); + QByteArray addNodePacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketType::DomainServerAddedNode); QDataStream addNodeStream(&addNodePacket, QIODevice::Append); addNodeStream << *addedNode.data(); @@ -1037,14 +1037,14 @@ void DomainServer::readAvailableDatagrams() { HifiSockAddr senderSockAddr; QByteArray receivedPacket; - static QByteArray assignmentPacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketTypeCreateAssignment); + static QByteArray assignmentPacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketType::CreateAssignment); static int numAssignmentPacketHeaderBytes = assignmentPacket.size(); while (limitedNodeList->getNodeSocket().hasPendingDatagrams()) { receivedPacket.resize(limitedNodeList->getNodeSocket().pendingDatagramSize()); limitedNodeList->getNodeSocket().readDatagram(receivedPacket.data(), receivedPacket.size(), senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer()); - if (packetTypeForPacket(receivedPacket) == PacketTypeRequestAssignment + if (packetTypeForPacket(receivedPacket) == PacketType::RequestAssignment && limitedNodeList->packetVersionAndHashMatch(receivedPacket)) { // construct the requested assignment from the packet data @@ -1108,8 +1108,8 @@ void DomainServer::readAvailableDatagrams() { processDatagram(receivedPacket, senderSockAddr); } else { // we're using DTLS, so tell the sender to get back to us using DTLS - static QByteArray dtlsRequiredPacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketTypeDomainServerRequireDTLS); - static int numBytesDTLSHeader = numBytesForPacketHeaderGivenPacketType(PacketTypeDomainServerRequireDTLS); + static QByteArray dtlsRequiredPacket = limitedNodeList->byteArrayWithPopulatedHeader(PacketType::DomainServerRequireDTLS); + static int numBytesDTLSHeader = numBytesForPacketHeaderGivenPacketType::(PacketTypeDomainServerRequireDTLS); if (dtlsRequiredPacket.size() == numBytesDTLSHeader) { // pack the port that we accept DTLS traffic on @@ -1390,10 +1390,10 @@ void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiS if (nodeList->packetVersionAndHashMatch(receivedPacket)) { PacketType::Value requestType = packetTypeForPacket(receivedPacket); switch (requestType) { - case PacketTypeDomainConnectRequest: + case PacketType::DomainConnectRequest: handleConnectRequest(receivedPacket, senderSockAddr); break; - case PacketTypeDomainListRequest: { + case PacketType::DomainListRequest: { QUuid nodeUUID = uuidFromPacketHeader(receivedPacket); if (!nodeUUID.isNull() && nodeList->nodeWithUUID(nodeUUID)) { @@ -1422,12 +1422,12 @@ void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiS break; } - case PacketTypeDomainServerPathQuery: { + case PacketType::DomainServerPathQuery: { // have our private method attempt to respond to this path query respondToPathQuery(receivedPacket, senderSockAddr); break; } - case PacketTypeNodeJsonStats: { + case PacketType::NodeJsonStats: { SharedNodePointer matchingNode = nodeList->sendingNodeForPacket(receivedPacket); if (matchingNode) { reinterpret_cast(matchingNode->getLinkedData())->parseJSONStatsPacket(receivedPacket); @@ -1435,16 +1435,16 @@ void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiS break; } - case PacketTypeStunResponse: + case PacketType::StunResponse: nodeList->processSTUNResponse(receivedPacket); break; - case PacketTypeUnverifiedPing: { + case PacketType::UnverifiedPing: { QByteArray pingReplyPacket = nodeList->constructPingReplyPacket(receivedPacket); nodeList->writeUnverifiedDatagram(pingReplyPacket, senderSockAddr); break; } - case PacketTypeUnverifiedPingReply: { + case PacketType::UnverifiedPingReply: { processICEPingReply(receivedPacket, senderSockAddr); break; } @@ -2225,7 +2225,7 @@ void DomainServer::respondToPathQuery(const QByteArray& receivedPacket, const Hi // this is a query for the viewpoint resulting from a path // first pull the query path from the packet - int numHeaderBytes = numBytesForPacketHeaderGivenPacketType(PacketTypeDomainServerPathQuery); + int numHeaderBytes = numBytesForPacketHeaderGivenPacketType::(PacketTypeDomainServerPathQuery); const char* packetDataStart = receivedPacket.data() + numHeaderBytes; // figure out how many bytes the sender said this path is @@ -2257,7 +2257,7 @@ void DomainServer::respondToPathQuery(const QByteArray& receivedPacket, const Hi QByteArray viewpointUTF8 = responseViewpoint.toUtf8(); // prepare a packet for the response - QByteArray pathResponsePacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeDomainServerPathResponse); + QByteArray pathResponsePacket = nodeList->byteArrayWithPopulatedHeader(PacketType::DomainServerPathResponse); // check the number of bytes the viewpoint is quint16 numViewpointBytes = responseViewpoint.toUtf8().size(); diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 80519690b6..bc76d818c3 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -56,12 +56,12 @@ void IceServer::processDatagrams() { PacketType::Value packetType = packetTypeForPacket(incomingPacket); - if (packetType == PacketTypeIceServerHeartbeat) { + if (packetType == PacketType::IceServerHeartbeat) { SharedNetworkPeer peer = addOrUpdateHeartbeatingPeer(incomingPacket); // so that we can send packets to the heartbeating peer when we need, we need to activate a socket now peer->activateMatchingOrNewSymmetricSocket(sendingSockAddr); - } else if (packetType == PacketTypeIceServerQuery) { + } else if (packetType == PacketType::IceServerQuery) { QDataStream heartbeatStream(incomingPacket); // this is a node hoping to connect to a heartbeating peer - do we have the heartbeating peer? diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d91575c950..dfa082719a 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2627,7 +2627,7 @@ void Application::update(float deltaTime) { _lastQueriedTime = now; if (DependencyManager::get()->shouldRenderEntities()) { - queryOctree(NodeType::EntityServer, PacketTypeEntityQuery, _entityServerJurisdictions); + queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); } _lastQueriedViewFrustum = _viewFrustum; } diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp index 2808601316..14e286c80e 100644 --- a/interface/src/DatagramProcessor.cpp +++ b/interface/src/DatagramProcessor.cpp @@ -55,15 +55,15 @@ void DatagramProcessor::processDatagrams() { PacketType::Value incomingType = packetTypeForPacket(incomingPacket); // only process this packet if we have a match on the packet version switch (incomingType) { - case PacketTypeAudioEnvironment: - case PacketTypeAudioStreamStats: - case PacketTypeMixedAudio: - case PacketTypeSilentAudioFrame: { - if (incomingType == PacketTypeAudioStreamStats) { + case PacketType::AudioEnvironment: + case PacketType::AudioStreamStats: + case PacketType::MixedAudio: + case PacketType::SilentAudioFrame: { + if (incomingType == PacketType::AudioStreamStats) { QMetaObject::invokeMethod(DependencyManager::get().data(), "parseAudioStreamStatsPacket", Qt::QueuedConnection, Q_ARG(QByteArray, incomingPacket)); - } else if (incomingType == PacketTypeAudioEnvironment) { + } else if (incomingType == PacketType::AudioEnvironment) { QMetaObject::invokeMethod(DependencyManager::get().data(), "parseAudioEnvironmentData", Qt::QueuedConnection, Q_ARG(QByteArray, incomingPacket)); @@ -82,10 +82,10 @@ void DatagramProcessor::processDatagrams() { break; } - case PacketTypeEntityData: - case PacketTypeEntityErase: - case PacketTypeOctreeStats: - case PacketTypeEnvironmentData: { + case PacketType::EntityData: + case PacketType::EntityErase: + case PacketType::OctreeStats: + case PacketType::EnvironmentData: { PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::networkReceive()... _octreeProcessor.queueReceivedPacket()"); SharedNodePointer matchedNode = DependencyManager::get()->sendingNodeForPacket(incomingPacket); @@ -96,10 +96,10 @@ void DatagramProcessor::processDatagrams() { } break; } - case PacketTypeBulkAvatarData: - case PacketTypeKillAvatar: - case PacketTypeAvatarIdentity: - case PacketTypeAvatarBillboard: { + case PacketType::BulkAvatarData: + case PacketType::KillAvatar: + case PacketType::AvatarIdentity: + case PacketType::AvatarBillboard: { // update having heard from the avatar-mixer and record the bytes received SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket); @@ -112,8 +112,8 @@ void DatagramProcessor::processDatagrams() { } break; } - case PacketTypeDomainConnectionDenied: { - int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeDomainConnectionDenied); + case PacketType::DomainConnectionDenied: { + int headerSize = numBytesForPacketHeaderGivenPacketType::(PacketTypeDomainConnectionDenied); QDataStream packetStream(QByteArray(incomingPacket.constData() + headerSize, incomingPacket.size() - headerSize)); QString reason; @@ -127,15 +127,15 @@ void DatagramProcessor::processDatagrams() { AccountManager::getInstance().checkAndSignalForAccessToken(); break; } - case PacketTypeNoisyMute: - case PacketTypeMuteEnvironment: { + case PacketType::NoisyMute: + case PacketType::MuteEnvironment: { bool mute = !DependencyManager::get()->isMuted(); - if (incomingType == PacketTypeMuteEnvironment) { + if (incomingType == PacketType::MuteEnvironment) { glm::vec3 position; float radius; - int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment); + int headerSize = numBytesForPacketHeaderGivenPacketType::(PacketTypeMuteEnvironment); memcpy(&position, incomingPacket.constData() + headerSize, sizeof(glm::vec3)); memcpy(&radius, incomingPacket.constData() + headerSize + sizeof(glm::vec3), sizeof(float)); float distance = glm::distance(DependencyManager::get()->getMyAvatar()->getPosition(), @@ -146,7 +146,7 @@ void DatagramProcessor::processDatagrams() { if (mute) { DependencyManager::get()->toggleMute(); - if (incomingType == PacketTypeMuteEnvironment) { + if (incomingType == PacketType::MuteEnvironment) { AudioScriptingInterface::getInstance().environmentMuted(); } else { AudioScriptingInterface::getInstance().mutedByMixer(); @@ -154,7 +154,7 @@ void DatagramProcessor::processDatagrams() { } break; } - case PacketTypeEntityEditNack: + case PacketType::EntityEditNack: if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) { application->_entityEditSender.processNackPacket(incomingPacket); } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 594a8c198e..e6eba84c23 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -866,7 +866,7 @@ int MyAvatar::parseDataAtOffset(const QByteArray& packet, int offset) { void MyAvatar::sendKillAvatar() { auto nodeList = DependencyManager::get(); - QByteArray killPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeKillAvatar); + QByteArray killPacket = nodeList->byteArrayWithPopulatedHeader(PacketType::KillAvatar); nodeList->broadcastToNodes(killPacket, NodeSet() << NodeType::AvatarMixer); } diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index 498123db00..c5b4d2a4a7 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -38,7 +38,7 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, // note: PacketType_OCTREE_STATS can have PacketType_VOXEL_DATA // immediately following them inside the same packet. So, we process the PacketType_OCTREE_STATS first // then process any remaining bytes as if it was another packet - if (voxelPacketType == PacketTypeOctreeStats) { + if (voxelPacketType == PacketType::OctreeStats) { int statsMessageLength = app->parseOctreeStats(mutablePacket, sendingNode); wasStatsPacket = true; if (messageLength > statsMessageLength) { @@ -81,19 +81,19 @@ void OctreePacketProcessor::processPacket(const SharedNodePointer& sendingNode, if (sendingNode) { switch(voxelPacketType) { - case PacketTypeEntityErase: { + case PacketType::EntityErase: { if (DependencyManager::get()->shouldRenderEntities()) { app->_entities.processEraseMessage(mutablePacket, sendingNode); } } break; - case PacketTypeEntityData: { + case PacketType::EntityData: { if (DependencyManager::get()->shouldRenderEntities()) { app->_entities.processDatagram(mutablePacket, sendingNode); } } break; - case PacketTypeEnvironmentData: { + case PacketType::EnvironmentData: { app->_environment.parseData(*sendingNode->getActiveSocket(), mutablePacket); } break; diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp index c885a67674..928662d2e8 100644 --- a/libraries/audio/src/InboundAudioStream.cpp +++ b/libraries/audio/src/InboundAudioStream.cpp @@ -132,7 +132,7 @@ int InboundAudioStream::parseData(const QByteArray& packet) { } case SequenceNumberStats::OnTime: { // Packet is on time; parse its data to the ringbuffer - if (packetType == PacketTypeSilentAudioFrame) { + if (packetType == PacketType::SilentAudioFrame) { writeDroppableSilentSamples(networkSamples); } else { readBytes += parseAudioData(packetType, packet.mid(readBytes), networkSamples); @@ -169,7 +169,7 @@ int InboundAudioStream::parseData(const QByteArray& packet) { } int InboundAudioStream::parseStreamProperties(PacketType::Value type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) { - if (type == PacketTypeSilentAudioFrame) { + if (type == PacketType::SilentAudioFrame) { quint16 numSilentSamples = 0; memcpy(&numSilentSamples, packetAfterSeqNum.constData(), sizeof(quint16)); numAudioSamples = numSilentSamples; diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 9a6400ae16..efc8e5c157 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1078,7 +1078,7 @@ void AvatarData::setJointMappingsFromNetworkReply() { void AvatarData::sendAvatarDataPacket() { auto nodeList = DependencyManager::get(); - QByteArray dataPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeAvatarData); + QByteArray dataPacket = nodeList->byteArrayWithPopulatedHeader(PacketType::AvatarData); dataPacket.append(toByteArray()); nodeList->broadcastToNodes(dataPacket, NodeSet() << NodeType::AvatarMixer); @@ -1087,7 +1087,7 @@ void AvatarData::sendAvatarDataPacket() { void AvatarData::sendIdentityPacket() { auto nodeList = DependencyManager::get(); - QByteArray identityPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeAvatarIdentity); + QByteArray identityPacket = nodeList->byteArrayWithPopulatedHeader(PacketType::AvatarIdentity); identityPacket.append(identityByteArray()); nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::AvatarMixer); @@ -1097,7 +1097,7 @@ void AvatarData::sendBillboardPacket() { if (!_billboard.isEmpty()) { auto nodeList = DependencyManager::get(); - QByteArray billboardPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeAvatarBillboard); + QByteArray billboardPacket = nodeList->byteArrayWithPopulatedHeader(PacketType::AvatarBillboard); billboardPacket.append(_billboard); nodeList->broadcastToNodes(billboardPacket, NodeSet() << NodeType::AvatarMixer); diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 6d0d9d8d76..60eb5c4499 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -22,16 +22,16 @@ AvatarHashMap::AvatarHashMap() { void AvatarHashMap::processAvatarMixerDatagram(const QByteArray& datagram, const QWeakPointer& mixerWeakPointer) { switch (packetTypeForPacket(datagram)) { - case PacketTypeBulkAvatarData: + case PacketType::BulkAvatarData: processAvatarDataPacket(datagram, mixerWeakPointer); break; - case PacketTypeAvatarIdentity: + case PacketType::AvatarIdentity: processAvatarIdentityPacket(datagram, mixerWeakPointer); break; - case PacketTypeAvatarBillboard: + case PacketType::AvatarBillboard: processAvatarBillboardPacket(datagram, mixerWeakPointer); break; - case PacketTypeKillAvatar: + case PacketType::KillAvatar: processKillAvatar(datagram); break; default: diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h index edbb2d250f..54cd5d80e2 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.h +++ b/libraries/entities-renderer/src/EntityTreeRenderer.h @@ -43,8 +43,8 @@ public: virtual ~EntityTreeRenderer(); virtual char getMyNodeType() const { return NodeType::EntityServer; } - virtual PacketType::Value getMyQueryMessageType() const { return PacketTypeEntityQuery; } - virtual PacketType::Value getExpectedPacketType() const { return PacketTypeEntityData; } + virtual PacketType::Value getMyQueryMessageType() const { return PacketType::EntityQuery; } + virtual PacketType::Value getExpectedPacketType() const { return PacketType::EntityData; } virtual void renderElement(OctreeElement* element, RenderArgs* args); virtual float getSizeScale() const; virtual int getBoundaryLevelAdjust() const; diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp index e5225b5ebb..f228467316 100644 --- a/libraries/entities/src/EntityEditPacketSender.cpp +++ b/libraries/entities/src/EntityEditPacketSender.cpp @@ -21,7 +21,7 @@ void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType::Value type, unsigned char* editBuffer, size_t length, int clockSkew) { - if (type == PacketTypeEntityAdd || type == PacketTypeEntityEdit) { + if (type == PacketType::EntityAdd || type == PacketType::EntityEdit) { EntityItem::adjustEditPacketForClockSkew(editBuffer, length, clockSkew); } } @@ -54,6 +54,6 @@ void EntityEditPacketSender::queueEraseEntityMessage(const EntityItemID& entityI unsigned char bufferOut[MAX_PACKET_SIZE]; size_t sizeOut = 0; if (EntityItemProperties::encodeEraseEntityMessage(entityItemID, &bufferOut[0], _maxPacketSize, sizeOut)) { - queueOctreeEditMessage(PacketTypeEntityErase, bufferOut, sizeOut); + queueOctreeEditMessage(PacketType::EntityErase, bufferOut, sizeOut); } } diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 31f1f2cfc0..02e129c251 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -93,7 +93,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties // queue the packet if (success) { - queueEntityMessage(PacketTypeEntityAdd, id, propertiesWithSimID); + queueEntityMessage(PacketType::EntityAdd, id, propertiesWithSimID); } return id; @@ -175,13 +175,13 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties proper entity->setLastBroadcast(usecTimestampNow()); } _entityTree->unlock(); - queueEntityMessage(PacketTypeEntityEdit, entityID, properties); + queueEntityMessage(PacketType::EntityEdit, entityID, properties); return id; } return QUuid(); } - queueEntityMessage(PacketTypeEntityEdit, entityID, properties); + queueEntityMessage(PacketType::EntityEdit, entityID, properties); return id; } @@ -446,7 +446,7 @@ bool EntityScriptingInterface::setVoxels(QUuid entityID, properties.setVoxelDataDirty(); properties.setLastEdited(now); - queueEntityMessage(PacketTypeEntityEdit, entityID, properties); + queueEntityMessage(PacketType::EntityEdit, entityID, properties); return true; } @@ -483,7 +483,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::functionmarkAsChangedOnServer(); endUpdate = usecTimestampNow(); _totalUpdates++; - } else if (packetType == PacketTypeEntityAdd) { + } else if (packetType == PacketType::EntityAdd) { if (senderNode->getCanRez()) { // this is a new entity... assign a new entityID properties.setCreated(properties.getLastEdited()); @@ -766,7 +766,7 @@ bool EntityTree::encodeEntitiesDeletedSince(OCTREE_PACKET_SEQUENCE sequenceNumbe unsigned char* copyAt = outputBuffer; size_t numBytesPacketHeader = DependencyManager::get()->populatePacketHeader(reinterpret_cast(outputBuffer), - PacketTypeEntityErase); + PacketType::EntityErase); copyAt += numBytesPacketHeader; outputLength = numBytesPacketHeader; @@ -1072,7 +1072,7 @@ bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData) properties.markAllChanged(); // so the entire property set is considered new, since we're making a new entity // queue the packet to send to the server - args->packetSender->queueEditEntityMessage(PacketTypeEntityAdd, newID, properties); + args->packetSender->queueEditEntityMessage(PacketType::EntityAdd, newID, properties); // also update the local tree instantly (note: this is not our tree, but an alternate tree) if (args->localTree) { diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index 5c65b94868..7ca0244f8f 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -62,10 +62,10 @@ public: // These methods will allow the OctreeServer to send your tree inbound edit packets of your // own definition. Implement these to allow your octree based server to support editing virtual bool getWantSVOfileVersions() const { return true; } - virtual PacketType::Value expectedDataPacketType() const { return PacketTypeEntityData; } + virtual PacketType::Value expectedDataPacketType() const { return PacketType::EntityData; } virtual bool canProcessVersion(PacketVersion thisVersion) const { return thisVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS; } - virtual bool handlesEditPacketType(PacketType::Value packetType) const; + virtual bool handlesEditPacketType::(PacketType::Value packetType) const; virtual int processEditPacketData(PacketType::Value packetType, const unsigned char* packetData, int packetLength, const unsigned char* editData, int maxLength, const SharedNodePointer& senderNode); diff --git a/libraries/entities/src/EntityTreeHeadlessViewer.h b/libraries/entities/src/EntityTreeHeadlessViewer.h index 7f4dda3ee1..fedbc74430 100644 --- a/libraries/entities/src/EntityTreeHeadlessViewer.h +++ b/libraries/entities/src/EntityTreeHeadlessViewer.h @@ -31,8 +31,8 @@ public: virtual ~EntityTreeHeadlessViewer(); virtual char getMyNodeType() const { return NodeType::EntityServer; } - virtual PacketType::Value getMyQueryMessageType() const { return PacketTypeEntityQuery; } - virtual PacketType::Value getExpectedPacketType() const { return PacketTypeEntityData; } + virtual PacketType::Value getMyQueryMessageType() const { return PacketType::EntityQuery; } + virtual PacketType::Value getExpectedPacketType() const { return PacketType::EntityData; } void update(); diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index db7275eb49..aef732e5e1 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -353,7 +353,7 @@ qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram, const HifiSock PacketSequenceNumber LimitedNodeList::getNextSequenceNumberForPacket(const QUuid& nodeUUID, PacketType::Value packetType) { // Thanks to std::map and std::unordered_map this line either default constructs the - // PacketTypeSequenceMap and the PacketSequenceNumber or returns the existing value. + // PacketType::SequenceMap and the PacketSequenceNumber or returns the existing value. // We use the postfix increment so that the stored value is incremented and the next // return gives the correct value. diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 6aafbd65f8..4c92ce07e7 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -413,7 +413,7 @@ void NodeList::sendDSPathQuery(const QString& newPath) { // send off the path query sendPacket(std::move(pathQueryPacket), _domainHandler.getSockAddr()); } else { - qCDebug(networking) << "Path" << newPath << "would make PacketTypeDomainServerPathQuery packet > MAX_PACKET_SIZE." << + qCDebug(networking) << "Path" << newPath << "would make PacketType::DomainServerPathQuery packet > MAX_PACKET_SIZE." << "Will not send query."; } } diff --git a/libraries/octree/src/EditPacketBuffer.cpp b/libraries/octree/src/EditPacketBuffer.cpp index 966a315a41..5e2f74549c 100644 --- a/libraries/octree/src/EditPacketBuffer.cpp +++ b/libraries/octree/src/EditPacketBuffer.cpp @@ -13,7 +13,7 @@ EditPacketBuffer::EditPacketBuffer() : _nodeUUID(), - _currentType(PacketTypeUnknown), + _currentType(PacketType::Unknown), _currentSize(0), _satoshiCost(0) { diff --git a/libraries/octree/src/JurisdictionListener.cpp b/libraries/octree/src/JurisdictionListener.cpp index a86130b005..029cffc101 100644 --- a/libraries/octree/src/JurisdictionListener.cpp +++ b/libraries/octree/src/JurisdictionListener.cpp @@ -57,7 +57,7 @@ bool JurisdictionListener::queueJurisdictionRequest() { } void JurisdictionListener::processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet) { - if (packetTypeForPacket(packet) == PacketTypeJurisdiction && sendingNode) { + if (packetTypeForPacket(packet) == PacketType::Jurisdiction && sendingNode) { QUuid nodeUUID = sendingNode->getUUID(); JurisdictionMap map; map.unpackFromMessage(reinterpret_cast(packet.data()), packet.size()); diff --git a/libraries/octree/src/JurisdictionListener.h b/libraries/octree/src/JurisdictionListener.h index 7fb4fb33c7..72e4b5faf7 100644 --- a/libraries/octree/src/JurisdictionListener.h +++ b/libraries/octree/src/JurisdictionListener.h @@ -20,8 +20,8 @@ #include "JurisdictionMap.h" -/// Sends out PacketType_JURISDICTION_REQUEST packets to all voxel servers and then listens for and processes -/// the PacketType_JURISDICTION packets it receives in order to maintain an accurate state of all jurisidictions +/// Sends out PacketType::_JURISDICTION_REQUEST packets to all voxel servers and then listens for and processes +/// the PacketType::_JURISDICTION packets it receives in order to maintain an accurate state of all jurisidictions /// within the domain. As with other ReceivedPacketProcessor classes the user is responsible for reading inbound packets /// and adding them to the processing queue by calling queueReceivedPacket() class JurisdictionListener : public ReceivedPacketProcessor { @@ -45,7 +45,7 @@ public slots: void nodeKilled(SharedNodePointer node); protected: - /// Callback for processing of received packets. Will process any queued PacketType_JURISDICTION and update the + /// Callback for processing of received packets. Will process any queued PacketType::_JURISDICTION and update the /// jurisdiction map member variable virtual void processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet); diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp index 46e758cb42..39129037a2 100644 --- a/libraries/octree/src/JurisdictionMap.cpp +++ b/libraries/octree/src/JurisdictionMap.cpp @@ -272,7 +272,7 @@ int JurisdictionMap::packEmptyJurisdictionIntoMessage(NodeType_t type, unsigned unsigned char* bufferStart = destinationBuffer; int headerLength = DependencyManager::get()->populatePacketHeader(reinterpret_cast(destinationBuffer), - PacketTypeJurisdiction); + PacketType::Jurisdiction); destinationBuffer += headerLength; // Pack the Node Type in first byte @@ -291,7 +291,7 @@ int JurisdictionMap::packIntoMessage(unsigned char* destinationBuffer, int avail unsigned char* bufferStart = destinationBuffer; int headerLength = DependencyManager::get()->populatePacketHeader(reinterpret_cast(destinationBuffer), - PacketTypeJurisdiction); + PacketType::Jurisdiction); destinationBuffer += headerLength; // Pack the Node Type in first byte diff --git a/libraries/octree/src/JurisdictionSender.cpp b/libraries/octree/src/JurisdictionSender.cpp index f85cf406b9..029108e6af 100644 --- a/libraries/octree/src/JurisdictionSender.cpp +++ b/libraries/octree/src/JurisdictionSender.cpp @@ -30,7 +30,7 @@ JurisdictionSender::~JurisdictionSender() { void JurisdictionSender::processPacket(const SharedNodePointer& sendingNode, const QByteArray& packet) { - if (packetTypeForPacket(packet) == PacketTypeJurisdictionRequest) { + if (packetTypeForPacket(packet) == PacketType::JurisdictionRequest) { if (sendingNode) { lockRequestingNodes(); _nodesRequestingJurisdictions.push(sendingNode->getUUID()); diff --git a/libraries/octree/src/JurisdictionSender.h b/libraries/octree/src/JurisdictionSender.h index a7d23d85c7..bc40f92a2c 100644 --- a/libraries/octree/src/JurisdictionSender.h +++ b/libraries/octree/src/JurisdictionSender.h @@ -19,7 +19,7 @@ #include #include "JurisdictionMap.h" -/// Will process PacketType_JURISDICTION_REQUEST packets and send out PacketType_JURISDICTION packets +/// Will process PacketType::_JURISDICTION_REQUEST packets and send out PacketType::_JURISDICTION packets /// to requesting parties. As with other ReceivedPacketProcessor classes the user is responsible for reading inbound packets /// and adding them to the processing queue by calling queueReceivedPacket() class JurisdictionSender : public ReceivedPacketProcessor { diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index a48540f082..6a884ec062 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -1916,7 +1916,7 @@ bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream device->getChar(&firstChar); device->ungetChar(firstChar); - if (firstChar == (char) PacketTypeEntityData) { + if (firstChar == (char) PacketType::EntityData) { qCDebug(octree) << "Reading from SVO Stream length:" << streamLength; return readSVOFromStream(streamLength, inputStream); } else { diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h index ddded47171..c432b5d33e 100644 --- a/libraries/octree/src/Octree.h +++ b/libraries/octree/src/Octree.h @@ -226,7 +226,7 @@ public: // These methods will allow the OctreeServer to send your tree inbound edit packets of your // own definition. Implement these to allow your octree based server to support editing virtual bool getWantSVOfileVersions() const { return false; } - virtual PacketType::Value expectedDataPacketType() const { return PacketTypeUnknown; } + virtual PacketType::Value expectedDataPacketType() const { return PacketType::Unknown; } virtual bool canProcessVersion(PacketVersion thisVersion) const { return thisVersion == versionForPacketType(expectedDataPacketType()); } virtual PacketVersion expectedVersion() const { return versionForPacketType(expectedDataPacketType()); } diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 52c68c3e96..260f49e4b8 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -252,7 +252,7 @@ void OctreeEditPacketSender::queueOctreeEditMessage(PacketType::Value type, unsi QUuid nodeUUID = node->getUUID(); bool isMyJurisdiction = true; - if (type == PacketTypeEntityErase) { + if (type == PacketType::EntityErase) { isMyJurisdiction = true; // send erase messages to all servers } else if (_serverJurisdictions) { // we need to get the jurisdiction for this @@ -318,11 +318,11 @@ void OctreeEditPacketSender::releaseQueuedMessages() { void OctreeEditPacketSender::releaseQueuedPacket(EditPacketBuffer& packetBuffer) { _releaseQueuedPacketMutex.lock(); - if (packetBuffer._currentSize > 0 && packetBuffer._currentType != PacketTypeUnknown) { + if (packetBuffer._currentSize > 0 && packetBuffer._currentType != PacketType::Unknown) { queuePacketToNode(packetBuffer._nodeUUID, &packetBuffer._currentBuffer[0], packetBuffer._currentSize, packetBuffer._satoshiCost); packetBuffer._currentSize = 0; - packetBuffer._currentType = PacketTypeUnknown; + packetBuffer._currentType = PacketType::Unknown; } _releaseQueuedPacketMutex.unlock(); } diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index a975d21c4d..4652005730 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -481,7 +481,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, const Q qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()..."; #endif - entityPacketSender->queueEditEntityMessage(PacketTypeEntityEdit, id, properties); + entityPacketSender->queueEditEntityMessage(PacketType::EntityEdit, id, properties); _entity->setLastBroadcast(usecTimestampNow()); } else { #ifdef WANT_DEBUG diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 55cf9e9890..61f0ed8d37 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -587,7 +587,7 @@ void ScriptEngine::run() { / (1000 * 1000)) + 0.5); const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t); - QByteArray avatarPacket = nodeList->byteArrayWithPopulatedHeader(PacketTypeAvatarData); + QByteArray avatarPacket = nodeList->byteArrayWithPopulatedHeader(PacketType::AvatarData); avatarPacket.append(_avatarData->toByteArray()); nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer); @@ -629,8 +629,8 @@ void ScriptEngine::run() { } QByteArray audioPacket = nodeList->byteArrayWithPopulatedHeader(silentFrame - ? PacketTypeSilentAudioFrame - : PacketTypeMicrophoneAudioNoEcho); + ? PacketType::SilentAudioFrame + : PacketType::MicrophoneAudioNoEcho); QDataStream packetStream(&audioPacket, QIODevice::Append);