History

remove 16-bit node IDs and replace with UUIDs

Stephen Birarda committed 13 years ago

Commit fa146e31 parent 6805b0e45 files · +1291 −606Browse files

Showing the changes to interface/src/Application.cpp (1 of 45 files). Show all

Unified · Split

interface/src/Application.cpp+44−64
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #include <PacketHeaders.h>
5555 #include <PairingHandler.h>
5656 #include <PerfStat.h>
57−
57+#include <UUID.h>
5858 #include <VoxelSceneStats.h>
5959
6060 #include "Application.h"
@@ -1160,8 +1160,9 @@ void Application::sendAvatarFaceVideoMessage(int frameCount, const QByteArray& d · 1099 unmodified lines
11601160
11611161 packetPosition += populateTypeAndVersion(packetPosition, PACKET_TYPE_AVATAR_FACE_VIDEO);
11621162
1163− *(uint16_t*)packetPosition = NodeList::getInstance()->getOwnerID();
1164− packetPosition += sizeof(uint16_t);
1163+ QByteArray rfcUUID = NodeList::getInstance()->getOwnerUUID().toRfc4122();
1164+ memcpy(packetPosition, rfcUUID.constData(), rfcUUID.size());
1165+ packetPosition += rfcUUID.size();
11651166
11661167 *(uint32_t*)packetPosition = frameCount;
11671168 packetPosition += sizeof(uint32_t);
@@ -1295,12 +1296,13 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da · 127 unmodified lines
12951296 dataBytes -= numBytesPacketHeader;
12961297
12971298 // read the node id
1298− uint16_t nodeID = *(uint16_t*)packetData;
1299− packetData += sizeof(nodeID);
1300− dataBytes -= sizeof(nodeID);
1299+ QUuid nodeUUID = QUuid::fromRfc4122(QByteArray((char*) packetData, NUM_BYTES_RFC4122_UUID));
1300+
1301+ packetData += NUM_BYTES_RFC4122_UUID;
1302+ dataBytes -= NUM_BYTES_RFC4122_UUID;
13011303
13021304 // make sure the node exists
1303− Node* node = NodeList::getInstance()->nodeWithID(nodeID);
1305+ Node* node = NodeList::getInstance()->nodeWithUUID(nodeUUID);
13041306 if (!node || !node->getLinkedData()) {
13051307 return NULL;
13061308 }
@@ -1560,29 +1562,6 @@ void Application::deleteVoxels() { · 253 unmodified lines
15601562 deleteVoxelUnderCursor();
15611563 }
15621564
1563−void Application::setListenModeNormal() {
1564− _audio.setListenMode(AudioRingBuffer::NORMAL);
1565−}
1566−
1567−void Application::setListenModePoint() {
1568− _audio.setListenMode(AudioRingBuffer::OMNI_DIRECTIONAL_POINT);
1569− _audio.setListenRadius(1.0);
1570−}
1571−
1572−void Application::setListenModeSingleSource() {
1573− _audio.setListenMode(AudioRingBuffer::SELECTED_SOURCES);
1574− _audio.clearListenSources();
1575−
1576− glm::vec3 mouseRayOrigin = _myAvatar.getMouseRayOrigin();
1577− glm::vec3 mouseRayDirection = _myAvatar.getMouseRayDirection();
1578− glm::vec3 eyePositionIgnored;
1579− uint16_t nodeID;
1580−
1581− if (findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeID)) {
1582− _audio.addListenSource(nodeID);
1583− }
1584−}
1585−
15861565 void Application::initDisplay() {
15871566 glEnable(GL_BLEND);
15881567 glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);
@@ -1688,7 +1667,7 @@ const float MAX_AVATAR_EDIT_VELOCITY = 1.0f; · 99 unmodified lines
16881667 const float MAX_VOXEL_EDIT_DISTANCE = 20.0f;
16891668 const float HEAD_SPHERE_RADIUS = 0.07;
16901669
1691−static uint16_t DEFAULT_NODE_ID_REF = 1;
1670+static QUuid DEFAULT_NODE_ID_REF;
16921671
16931672 void Application::updateLookatTargetAvatar(const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection,
16941673 glm::vec3& eyePosition) {
@@ -1697,7 +1676,7 @@ void Application::updateLookatTargetAvatar(const glm::vec3& mouseRayOrigin, cons · 2 unmodified lines
16971676 }
16981677
16991678 Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection,
1700− glm::vec3& eyePosition, uint16_t& nodeID = DEFAULT_NODE_ID_REF) {
1679+ glm::vec3& eyePosition, QUuid& nodeUUID = DEFAULT_NODE_ID_REF) {
17011680
17021681 NodeList* nodeList = NodeList::getInstance();
17031682 for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
@@ -1710,7 +1689,7 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 6 unmodified lines
17101689 eyePosition = avatar->getHead().getEyePosition();
17111690 _lookatIndicatorScale = avatar->getHead().getScale();
17121691 _lookatOtherPosition = headPosition;
1713− nodeID = avatar->getOwningNode()->getNodeID();
1692+ nodeUUID = avatar->getOwningNode()->getUUID();
17141693 return avatar;
17151694 }
17161695 }
@@ -1759,12 +1738,12 @@ void Application::renderFollowIndicator() { · 42 unmodified lines
17591738 Avatar* avatar = (Avatar *) node->getLinkedData();
17601739 Avatar* leader = NULL;
17611740
1762− if (avatar->getLeaderID() != UNKNOWN_NODE_ID) {
1763− if (avatar->getLeaderID() == NodeList::getInstance()->getOwnerID()) {
1741+ if (!avatar->getLeaderUUID().isNull()) {
1742+ if (avatar->getLeaderUUID() == NodeList::getInstance()->getOwnerUUID()) {
17641743 leader = &_myAvatar;
17651744 } else {
17661745 for (NodeList::iterator it = nodeList->begin(); it != nodeList->end(); ++it) {
1767− if(it->getNodeID() == avatar->getLeaderID()
1746+ if(it->getUUID() == avatar->getLeaderUUID()
17681747 && it->getType() == NODE_TYPE_AGENT) {
17691748 leader = (Avatar*) it->getLinkedData();
17701749 }
@@ -2244,26 +2223,27 @@ void Application::updateAvatar(float deltaTime) { · 473 unmodified lines
22442223 _myAvatar.setCameraEyeOffsetPosition(_viewFrustum.getEyeOffsetPosition());
22452224
22462225 NodeList* nodeList = NodeList::getInstance();
2247− if (nodeList->getOwnerID() != UNKNOWN_NODE_ID) {
2248− // if I know my ID, send head/hand data to the avatar mixer and voxel server
2249− unsigned char broadcastString[MAX_PACKET_SIZE];
2250− unsigned char* endOfBroadcastStringWrite = broadcastString;
2251−
2252− endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);
2253−
2254− endOfBroadcastStringWrite += packNodeId(endOfBroadcastStringWrite, nodeList->getOwnerID());
2255−
2256− endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
2257−
2258− const char nodeTypesOfInterest[] = { NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AVATAR_MIXER };
2259− controlledBroadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString,
2260− nodeTypesOfInterest, sizeof(nodeTypesOfInterest));
2261−
2262− // once in a while, send my urls
2263− const float AVATAR_URLS_SEND_INTERVAL = 1.0f; // seconds
2264− if (shouldDo(AVATAR_URLS_SEND_INTERVAL, deltaTime)) {
2265− Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL());
2266− }
2226+
2227+ // send head/hand data to the avatar mixer and voxel server
2228+ unsigned char broadcastString[MAX_PACKET_SIZE];
2229+ unsigned char* endOfBroadcastStringWrite = broadcastString;
2230+
2231+ endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);
2232+
2233+ QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();
2234+ memcpy(endOfBroadcastStringWrite, ownerUUID.constData(), ownerUUID.size());
2235+ endOfBroadcastStringWrite += ownerUUID.size();
2236+
2237+ endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
2238+
2239+ const char nodeTypesOfInterest[] = { NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AVATAR_MIXER };
2240+ controlledBroadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString,
2241+ nodeTypesOfInterest, sizeof(nodeTypesOfInterest));
2242+
2243+ // once in a while, send my urls
2244+ const float AVATAR_URLS_SEND_INTERVAL = 1.0f; // seconds
2245+ if (shouldDo(AVATAR_URLS_SEND_INTERVAL, deltaTime)) {
2246+ Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL());
22672247 }
22682248 }
22692249
@@ -3557,8 +3537,8 @@ void Application::toggleFollowMode() { · 1287 unmodified lines
35573537 _pieMenu.getY() / (float)_glWidget->height(),
35583538 mouseRayOrigin, mouseRayDirection);
35593539 glm::vec3 eyePositionIgnored;
3560− uint16_t nodeIDIgnored;
3561− Avatar* leadingAvatar = findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeIDIgnored);
3540+ QUuid nodeUUIDIgnored;
3541+ Avatar* leadingAvatar = findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeUUIDIgnored);
35623542
35633543 _myAvatar.follow(leadingAvatar);
35643544 }
@@ -3626,10 +3606,10 @@ void Application::nodeAdded(Node* node) { · 61 unmodified lines
36263606
36273607 void Application::nodeKilled(Node* node) {
36283608 if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
3629− uint16_t nodeID = node->getNodeID();
3609+ QUuid nodeUUID = node->getUUID();
36303610 // see if this is the first we've heard of this node...
3631− if (_voxelServerJurisdictions.find(nodeID) != _voxelServerJurisdictions.end()) {
3632− unsigned char* rootCode = _voxelServerJurisdictions[nodeID].getRootOctalCode();
3611+ if (_voxelServerJurisdictions.find(nodeUUID) != _voxelServerJurisdictions.end()) {
3612+ unsigned char* rootCode = _voxelServerJurisdictions[nodeUUID].getRootOctalCode();
36333613 VoxelPositionSize rootDetails;
36343614 voxelDetailsForCode(rootCode, rootDetails);
36353615
@@ -3659,13 +3639,13 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng · 23 unmodified lines
36593639
36603640 // quick fix for crash... why would voxelServer be NULL?
36613641 if (voxelServer) {
3662− uint16_t nodeID = voxelServer->getNodeID();
3642+ QUuid nodeUUID = voxelServer->getUUID();
36633643
36643644 VoxelPositionSize rootDetails;
36653645 voxelDetailsForCode(_voxelSceneStats.getJurisdictionRoot(), rootDetails);
36663646
36673647 // see if this is the first we've heard of this node...
3668− if (_voxelServerJurisdictions.find(nodeID) == _voxelServerJurisdictions.end()) {
3648+ if (_voxelServerJurisdictions.find(nodeUUID) == _voxelServerJurisdictions.end()) {
36693649 printf("stats from new voxel server... v[%f, %f, %f, %f]\n",
36703650 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
36713651
@@ -3682,7 +3662,7 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng · 10 unmodified lines
36823662 // details from the VoxelSceneStats to construct the JurisdictionMap
36833663 JurisdictionMap jurisdictionMap;
36843664 jurisdictionMap.copyContents(_voxelSceneStats.getJurisdictionRoot(), _voxelSceneStats.getJurisdictionEndNodes());
3685− _voxelServerJurisdictions[nodeID] = jurisdictionMap;
3665+ _voxelServerJurisdictions[nodeUUID] = jurisdictionMap;
36863666 }
36873667 return statsMessageLength;
36883668 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t