History

resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit 599e3bb2 parents 4ea14a5 bd6418d44 files · +486 −892Browse files

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

Unified · Split

interface/src/Application.cpp+140−260
@@ -128,7 +128,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 127 unmodified lines
128128 _perfStatsOn(false),
129129 _chatEntryOn(false),
130130 _audio(&_audioScope, STARTUP_JITTER_SAMPLES),
131− _stopNetworkReceiveThread(false),
131+ _enableProcessVoxelsThread(true),
132132 _voxelProcessor(),
133133 _voxelHideShowThread(&_voxels),
134134 _voxelEditSender(this),
@@ -165,6 +165,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 30 unmodified lines
165165 }
166166
167167 NodeList* nodeList = NodeList::createInstance(NODE_TYPE_AGENT, listenPort);
168+
169+ // connect our processDatagrams slot to the QUDPSocket readyRead() signal
170+ connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), SLOT(processDatagrams()));
168171
169172 // put the audio processing on a separate thread
170173 QThread* audioThread = new QThread(this);
@@ -173,14 +176,13 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 2 unmodified lines
173176 connect(audioThread, SIGNAL(started()), &_audio, SLOT(start()));
174177
175178 audioThread->start();
176−
177− nodeList->addHook(&_voxels);
178− nodeList->addHook(this);
179+
180+ connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
181+ connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
182+ connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
183+
179184 nodeList->addDomainListener(this);
180185
181− // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line
182− _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
183−
184186 // read the ApplicationInfo.ini file for Name/Version/Domain information
185187 QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
186188
@@ -263,8 +265,6 @@ Application::~Application() { · 76 unmodified lines
263265 _audio.thread()->wait();
264266
265267 storeSizeAndPosition();
266− NodeList::getInstance()->removeHook(&_voxels);
267− NodeList::getInstance()->removeHook(this);
268268 NodeList::getInstance()->removeDomainListener(this);
269269
270270 _sharedVoxelSystem.changeTree(new VoxelTree);
@@ -274,7 +274,6 @@ Application::~Application() { · 3 unmodified lines
274274
275275 delete _logger;
276276 delete _settings;
277− delete _followMode;
278277 delete _glWidget;
279278 }
280279
@@ -330,12 +329,6 @@ void Application::initializeGL() { · 49 unmodified lines
330329 init();
331330 qDebug( "init() complete.");
332331
333− // create thread for receipt of data via UDP
334− if (_enableNetworkThread) {
335− pthread_create(&_networkReceiveThread, NULL, networkReceive, NULL);
336− qDebug("Network receive thread created.");
337− }
338−
339332 // create thread for parsing of voxel data independent of the main network and rendering threads
340333 _voxelProcessor.initialize(_enableProcessVoxelsThread);
341334 _voxelEditSender.initialize(_enableProcessVoxelsThread);
@@ -1416,11 +1409,6 @@ void Application::terminate() { · 1074 unmodified lines
14161409 // let the avatar mixer know we're out
14171410 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
14181411
1419− if (_enableNetworkThread) {
1420− _stopNetworkReceiveThread = true;
1421− pthread_join(_networkReceiveThread, NULL);
1422− }
1423−
14241412 printf("");
14251413 _voxelProcessor.terminate();
14261414 _voxelHideShowThread.terminate();
@@ -1433,7 +1421,7 @@ void Application::terminate() { · 6 unmodified lines
14331421 static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& dataBytes) {
14341422 // record the packet for stats-tracking
14351423 Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AVATARS).updateValue(dataBytes);
1436− Node* avatarMixerNode = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
1424+ SharedNodePointer avatarMixerNode = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
14371425 if (avatarMixerNode) {
14381426 avatarMixerNode->recordBytesReceived(dataBytes);
14391427 }
@@ -1450,7 +1438,7 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da · 10 unmodified lines
14501438 dataBytes -= NUM_BYTES_RFC4122_UUID;
14511439
14521440 // make sure the node exists
1453− Node* node = NodeList::getInstance()->nodeWithUUID(nodeUUID);
1441+ SharedNodePointer node = NodeList::getInstance()->nodeWithUUID(nodeUUID);
14541442 if (!node || !node->getLinkedData()) {
14551443 return NULL;
14561444 }
@@ -1915,10 +1903,6 @@ void Application::init() { · 458 unmodified lines
19151903 _glWidget->width(),
19161904 _glWidget->height());
19171905
1918− _followMode = new QAction(this);
1919− connect(_followMode, SIGNAL(triggered()), this, SLOT(toggleFollowMode()));
1920− _pieMenu.addAction(_followMode);
1921−
19221906 _audio.init(_glWidget);
19231907
19241908 _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
@@ -1976,16 +1960,16 @@ void Application::updateLookatTargetAvatar(const glm::vec3& mouseRayOrigin, cons · 51 unmodified lines
19761960 Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection,
19771961 glm::vec3& eyePosition, QUuid& nodeUUID = DEFAULT_NODE_ID_REF) {
19781962
1979− NodeList* nodeList = NodeList::getInstance();
1980− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
1963+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
19811964 if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
19821965 Avatar* avatar = (Avatar*)node->getLinkedData();
19831966 float distance;
1967+
19841968 if (avatar->findRayIntersection(mouseRayOrigin, mouseRayDirection, distance)) {
19851969 // rescale to compensate for head embiggening
19861970 eyePosition = (avatar->getHead().calculateAverageEyePosition() - avatar->getHead().getScalePivot()) *
1987− (avatar->getScale() / avatar->getHead().getScale()) + avatar->getHead().getScalePivot();
1988−
1971+ (avatar->getScale() / avatar->getHead().getScale()) + avatar->getHead().getScalePivot();
1972+
19891973 _lookatIndicatorScale = avatar->getHead().getScale();
19901974 _lookatOtherPosition = avatar->getHead().getPosition();
19911975 nodeUUID = avatar->getOwningNode()->getUUID();
@@ -1993,6 +1977,7 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 1 unmodified line
19931977 }
19941978 }
19951979 }
1980+
19961981 return NULL;
19971982 }
19981983
@@ -2017,71 +2002,6 @@ void Application::renderLookatIndicator(glm::vec3 pointOfInterest) { · 18 unmodified lines
20172002 renderCircle(haloOrigin, INDICATOR_RADIUS, IDENTITY_UP, NUM_SEGMENTS);
20182003 }
20192004
2020−void maybeBeginFollowIndicator(bool& began) {
2021− if (!began) {
2022− Application::getInstance()->getGlowEffect()->begin();
2023− glLineWidth(5);
2024− glBegin(GL_LINES);
2025− began = true;
2026− }
2027−}
2028−
2029−void Application::renderFollowIndicator() {
2030− NodeList* nodeList = NodeList::getInstance();
2031−
2032− // initialize lazily so that we don't enable the glow effect unnecessarily
2033− bool began = false;
2034−
2035− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); ++node) {
2036− if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
2037− Avatar* avatar = (Avatar *) node->getLinkedData();
2038− Avatar* leader = NULL;
2039−
2040− if (!avatar->getLeaderUUID().isNull()) {
2041− if (avatar->getLeaderUUID() == NodeList::getInstance()->getOwnerUUID()) {
2042− leader = &_myAvatar;
2043− } else {
2044− for (NodeList::iterator it = nodeList->begin(); it != nodeList->end(); ++it) {
2045− if(it->getUUID() == avatar->getLeaderUUID()
2046− && it->getType() == NODE_TYPE_AGENT) {
2047− leader = (Avatar*) it->getLinkedData();
2048− }
2049− }
2050− }
2051−
2052− if (leader != NULL) {
2053− maybeBeginFollowIndicator(began);
2054− glColor3f(1.f, 0.f, 0.f);
2055− glVertex3f((avatar->getHead().getPosition().x + avatar->getPosition().x) / 2.f,
2056− (avatar->getHead().getPosition().y + avatar->getPosition().y) / 2.f,
2057− (avatar->getHead().getPosition().z + avatar->getPosition().z) / 2.f);
2058− glColor3f(0.f, 1.f, 0.f);
2059− glVertex3f((leader->getHead().getPosition().x + leader->getPosition().x) / 2.f,
2060− (leader->getHead().getPosition().y + leader->getPosition().y) / 2.f,
2061− (leader->getHead().getPosition().z + leader->getPosition().z) / 2.f);
2062− }
2063− }
2064− }
2065− }
2066−
2067− if (_myAvatar.getLeadingAvatar() != NULL) {
2068− maybeBeginFollowIndicator(began);
2069− glColor3f(1.f, 0.f, 0.f);
2070− glVertex3f((_myAvatar.getHead().getPosition().x + _myAvatar.getPosition().x) / 2.f,
2071− (_myAvatar.getHead().getPosition().y + _myAvatar.getPosition().y) / 2.f,
2072− (_myAvatar.getHead().getPosition().z + _myAvatar.getPosition().z) / 2.f);
2073− glColor3f(0.f, 1.f, 0.f);
2074− glVertex3f((_myAvatar.getLeadingAvatar()->getHead().getPosition().x + _myAvatar.getLeadingAvatar()->getPosition().x) / 2.f,
2075− (_myAvatar.getLeadingAvatar()->getHead().getPosition().y + _myAvatar.getLeadingAvatar()->getPosition().y) / 2.f,
2076− (_myAvatar.getLeadingAvatar()->getHead().getPosition().z + _myAvatar.getLeadingAvatar()->getPosition().z) / 2.f);
2077− }
2078−
2079− if (began) {
2080− glEnd();
2081− _glowEffect.end();
2082− }
2083−}
2084−
20852005 void Application::renderHighlightVoxel(VoxelDetail voxel) {
20862006 glDisable(GL_LIGHTING);
20872007 glPushMatrix();
@@ -2099,10 +2019,9 @@ void Application::renderHighlightVoxel(VoxelDetail voxel) { · 11 unmodified lines
20992019 void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm::vec3 mouseRayDirection) {
21002020 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
21012021 PerformanceWarning warn(showWarnings, "Application::updateAvatars()");
2102− NodeList* nodeList = NodeList::getInstance();
2103−
2104− for(NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2105− node->lock();
2022+
2023+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
2024+ QMutexLocker(&node->getMutex());
21062025 if (node->getLinkedData()) {
21072026 Avatar *avatar = (Avatar *)node->getLinkedData();
21082027 if (!avatar->isInitialized()) {
@@ -2111,7 +2030,6 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 2 unmodified lines
21112030 avatar->simulate(deltaTime, NULL);
21122031 avatar->setMouseRay(mouseRayOrigin, mouseRayDirection);
21132032 }
2114− node->unlock();
21152033 }
21162034
21172035 // simulate avatar fades
@@ -2377,11 +2295,6 @@ void Application::updateThreads(float deltaTime) { · 259 unmodified lines
23772295 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
23782296 PerformanceWarning warn(showWarnings, "Application::updateThreads()");
23792297
2380− // read incoming packets from network
2381− if (!_enableNetworkThread) {
2382− networkReceive(0);
2383− }
2384−
23852298 // parse voxel packets
23862299 if (!_enableProcessVoxelsThread) {
23872300 _voxelProcessor.threadRoutine();
@@ -2694,39 +2607,36 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 306 unmodified lines
26942607
26952608 unsigned char voxelQueryPacket[MAX_PACKET_SIZE];
26962609
2697− NodeList* nodeList = NodeList::getInstance();
2698−
26992610 // Iterate all of the nodes, and get a count of how many voxel servers we have...
27002611 int totalServers = 0;
27012612 int inViewServers = 0;
27022613 int unknownJurisdictionServers = 0;
2703−
2704− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2705−
2614+
2615+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
27062616 // only send to the NodeTypes that are serverType
27072617 if (node->getActiveSocket() != NULL && node->getType() == serverType) {
27082618 totalServers++;
2709−
2619+
27102620 // get the server bounds for this server
27112621 QUuid nodeUUID = node->getUUID();
2712−
2622+
27132623 // if we haven't heard from this voxel server, go ahead and send it a query, so we
27142624 // can get the jurisdiction...
27152625 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
27162626 unknownJurisdictionServers++;
27172627 } else {
27182628 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
2719−
2629+
27202630 unsigned char* rootCode = map.getRootOctalCode();
2721−
2631+
27222632 if (rootCode) {
27232633 VoxelPositionSize rootDetails;
27242634 voxelDetailsForCode(rootCode, rootDetails);
27252635 AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s);
27262636 serverBounds.scale(TREE_SCALE);
2727−
2637+
27282638 ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
2729−
2639+
27302640 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
27312641 inViewServers++;
27322642 }
@@ -2759,18 +2669,20 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 26 unmodified lines
27592669 if (wantExtraDebugging && unknownJurisdictionServers > 0) {
27602670 qDebug("perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
27612671 }
2762−
2763− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2672+
2673+ NodeList* nodeList = NodeList::getInstance();
2674+
2675+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
27642676 // only send to the NodeTypes that are serverType
27652677 if (node->getActiveSocket() != NULL && node->getType() == serverType) {
2766−
2767−
2678+
2679+
27682680 // get the server bounds for this server
27692681 QUuid nodeUUID = node->getUUID();
2770−
2682+
27712683 bool inView = false;
27722684 bool unknownView = false;
2773−
2685+
27742686 // if we haven't heard from this voxel server, go ahead and send it a query, so we
27752687 // can get the jurisdiction...
27762688 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
@@ -2780,15 +2692,15 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 3 unmodified lines
27802692 }
27812693 } else {
27822694 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
2783−
2695+
27842696 unsigned char* rootCode = map.getRootOctalCode();
2785−
2697+
27862698 if (rootCode) {
27872699 VoxelPositionSize rootDetails;
27882700 voxelDetailsForCode(rootCode, rootDetails);
27892701 AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s);
27902702 serverBounds.scale(TREE_SCALE);
2791−
2703+
27922704 ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
27932705 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
27942706 inView = true;
@@ -2801,7 +2713,7 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 6 unmodified lines
28012713 }
28022714 }
28032715 }
2804−
2716+
28052717 if (inView) {
28062718 _voxelQuery.setMaxOctreePacketsPerSecond(perServerPPS);
28072719 } else if (unknownView) {
@@ -2809,7 +2721,7 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 1 unmodified line
28092721 qDebug() << "no known jurisdiction for node " << *node << ", give it budget of "
28102722 << perUnknownServer << " to send us jurisdiction.";
28112723 }
2812−
2724+
28132725 // set the query's position/orientation to be degenerate in a manner that will get the scene quickly
28142726 // If there's only one server, then don't do this, and just let the normal voxel query pass through
28152727 // as expected... this way, we will actually get a valid scene if there is one to be seen
@@ -2833,24 +2745,24 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 17 unmodified lines
28332745 }
28342746 // set up the packet for sending...
28352747 unsigned char* endOfVoxelQueryPacket = voxelQueryPacket;
2836−
2748+
28372749 // insert packet type/version and node UUID
28382750 endOfVoxelQueryPacket += populateTypeAndVersion(endOfVoxelQueryPacket, packetType);
28392751 QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();
28402752 memcpy(endOfVoxelQueryPacket, ownerUUID.constData(), ownerUUID.size());
28412753 endOfVoxelQueryPacket += ownerUUID.size();
2842−
2754+
28432755 // encode the query data...
28442756 endOfVoxelQueryPacket += _voxelQuery.getBroadcastData(endOfVoxelQueryPacket);
2845−
2757+
28462758 int packetLength = endOfVoxelQueryPacket - voxelQueryPacket;
2847−
2759+
28482760 // make sure we still have an active socket
28492761 if (node->getActiveSocket()) {
28502762 nodeList->getNodeSocket().writeDatagram((char*) voxelQueryPacket, packetLength,
2851− node->getActiveSocket()->getAddress(), node->getActiveSocket()->getPort());
2763+ node->getActiveSocket()->getAddress(), node->getActiveSocket()->getPort());
28522764 }
2853−
2765+
28542766 // Feed number of bytes to corresponding channel of the bandwidth meter
28552767 _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(packetLength);
28562768 }
@@ -3207,12 +3119,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 350 unmodified lines
32073119 }
32083120 }
32093121
3210− {
3211− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3212− "Application::displaySide() ... renderFollowIndicator...");
3213− renderFollowIndicator();
3214− }
3215−
32163122 // render transmitter pick ray, if non-empty
32173123 if (_transmitterPickStart != _transmitterPickEnd) {
32183124 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
@@ -3335,12 +3241,12 @@ void Application::displayOverlay() { · 116 unmodified lines
33353241 glPointSize(1.0f);
33363242 char nodes[100];
33373243
3338− NodeList* nodeList = NodeList::getInstance();
33393244 int totalAvatars = 0, totalServers = 0;
3340−
3341− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3245+
3246+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
33423247 node->getType() == NODE_TYPE_AGENT ? totalAvatars++ : totalServers++;
33433248 }
3249+
33443250 sprintf(nodes, "Servers: %d, Avatars: %d\n", totalServers, totalAvatars);
33453251 drawtext(_glWidget->width() - 150, 20, 0.10, 0, 1.0, 0, nodes, 1, 0, 0);
33463252 }
@@ -3440,8 +3346,8 @@ void Application::displayStats() { · 93 unmodified lines
34403346 int pingAudio = 0, pingAvatar = 0, pingVoxel = 0, pingVoxelMax = 0;
34413347
34423348 NodeList* nodeList = NodeList::getInstance();
3443− Node* audioMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
3444− Node* avatarMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
3349+ SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
3350+ SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
34453351
34463352 pingAudio = audioMixerNode ? audioMixerNode->getPingMs() : 0;
34473353 pingAvatar = avatarMixerNode ? avatarMixerNode->getPingMs() : 0;
@@ -3450,7 +3356,8 @@ void Application::displayStats() { · 2 unmodified lines
34503356 // Now handle voxel servers, since there could be more than one, we average their ping times
34513357 unsigned long totalPingVoxel = 0;
34523358 int voxelServerCount = 0;
3453− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3359+
3360+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
34543361 if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
34553362 totalPingVoxel += node->getPingMs();
34563363 voxelServerCount++;
@@ -3459,6 +3366,7 @@ void Application::displayStats() { · 2 unmodified lines
34593366 }
34603367 }
34613368 }
3369+
34623370 if (voxelServerCount) {
34633371 pingVoxel = totalPingVoxel/voxelServerCount;
34643372 }
@@ -3475,7 +3383,7 @@ void Application::displayStats() { · 10 unmodified lines
34753383 sprintf(avatarStats, "Avatar: pos %.3f, %.3f, %.3f, vel %.1f, yaw = %.2f", avatarPos.x, avatarPos.y, avatarPos.z, glm::length(_myAvatar.getVelocity()), _myAvatar.getBodyYaw());
34763384 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarStats);
34773385
3478− Node* avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
3386+ SharedNodePointer avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
34793387 char avatarMixerStats[200];
34803388 if (avatarMixer) {
34813389 sprintf(avatarMixerStats, "Avatar Mixer: %.f kbps, %.f pps",
@@ -3794,10 +3702,10 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 312 unmodified lines
37943702 if (!selfAvatarOnly) {
37953703 // Render avatars of other nodes
37963704 NodeList* nodeList = NodeList::getInstance();
3797−
3798− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3799− node->lock();
3800−
3705+
3706+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
3707+ QMutexLocker(&node->getMutex());
3708+
38013709 if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
38023710 Avatar *avatar = (Avatar *)node->getLinkedData();
38033711 if (!avatar->isInitialized()) {
@@ -3806,8 +3714,6 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 2 unmodified lines
38063714 avatar->render(false);
38073715 avatar->setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));
38083716 }
3809−
3810− node->unlock();
38113717 }
38123718
38133719 // render avatar fades
@@ -4052,18 +3958,6 @@ void Application::eyedropperVoxelUnderCursor() { · 238 unmodified lines
40523958 }
40533959 }
40543960
4055−void Application::toggleFollowMode() {
4056− glm::vec3 mouseRayOrigin, mouseRayDirection;
4057− _viewFrustum.computePickRay(_pieMenu.getX() / (float)_glWidget->width(),
4058− _pieMenu.getY() / (float)_glWidget->height(),
4059− mouseRayOrigin, mouseRayDirection);
4060− glm::vec3 eyePositionIgnored;
4061− QUuid nodeUUIDIgnored;
4062− Avatar* leadingAvatar = findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeUUIDIgnored);
4063−
4064− _myAvatar.follow(leadingAvatar);
4065−}
4066−
40673961 void Application::resetSensors() {
40683962 _headMouseX = _mouseX = _glWidget->width() / 2;
40693963 _headMouseY = _mouseY = _glWidget->height() / 2;
@@ -4143,11 +4037,7 @@ void Application::domainChanged(QString domain) { · 73 unmodified lines
41434037 updateLocalOctreeCache();
41444038 }
41454039
4146−void Application::nodeAdded(Node* node) {
4147−
4148−}
4149−
4150−void Application::nodeKilled(Node* node) {
4040+void Application::nodeKilled(SharedNodePointer node) {
41514041 if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
41524042 QUuid nodeUUID = node->getUUID();
41534043 // see if this is the first we've heard of this node...
@@ -4227,7 +4117,7 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 73 unmodified lines
42274117 const HifiSockAddr& senderSockAddr, bool wasStatsPacket) {
42284118
42294119 // Attempt to identify the sender from it's address.
4230− Node* serverNode = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
4120+ SharedNodePointer serverNode = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
42314121 if (serverNode) {
42324122 QUuid nodeUUID = serverNode->getUUID();
42334123
@@ -4244,7 +4134,7 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 10 unmodified lines
42444134 int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLength, const HifiSockAddr& senderSockAddr) {
42454135
42464136 // But, also identify the sender, and keep track of the contained jurisdiction root for this server
4247− Node* server = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
4137+ SharedNodePointer server = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
42484138
42494139 // parse the incoming stats datas stick it in a temporary object for now, while we
42504140 // determine which server it belongs to
@@ -4301,105 +4191,95 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 50 unmodified lines
43014191 }
43024192
43034193 // Receive packets from other nodes/servers and decide what to do with them!
4304−void* Application::networkReceive(void* args) {
4194+void Application::processDatagrams() {
43054195 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
43064196 "Application::networkReceive()");
43074197
43084198 HifiSockAddr senderSockAddr;
43094199 ssize_t bytesReceived;
43104200
4311− Application* app = Application::getInstance();
4312− while (!app->_stopNetworkReceiveThread) {
4313− if (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() &&
4314− (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) app->_incomingPacket,
4315− MAX_PACKET_SIZE,
4316− senderSockAddr.getAddressPointer(),
4317− senderSockAddr.getPortPointer()))) {
4318−
4319− app->_packetCount++;
4320− app->_bytesCount += bytesReceived;
4321−
4322− if (packetVersionMatch(app->_incomingPacket)) {
4323− // only process this packet if we have a match on the packet version
4324− switch (app->_incomingPacket[0]) {
4325− case PACKET_TYPE_TRANSMITTER_DATA_V2:
4326− // V2 = IOS transmitter app
4327− app->_myTransmitter.processIncomingData(app->_incomingPacket, bytesReceived);
4328−
4329− break;
4330− case PACKET_TYPE_MIXED_AUDIO:
4331− QMetaObject::invokeMethod(&app->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
4332− Q_ARG(QByteArray, QByteArray((char*) app->_incomingPacket, bytesReceived)));
4333− break;
4334−
4335− case PACKET_TYPE_PARTICLE_ADD_RESPONSE:
4336− // look up our ParticleEditHanders....
4337− ParticleEditHandle::handleAddResponse(app->_incomingPacket, bytesReceived);
4338− break;
4339−
4340− case PACKET_TYPE_PARTICLE_DATA:
4341− case PACKET_TYPE_VOXEL_DATA:
4342− case PACKET_TYPE_VOXEL_ERASE:
4343− case PACKET_TYPE_OCTREE_STATS:
4344− case PACKET_TYPE_ENVIRONMENT_DATA: {
4345− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4346− "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");
4347−
4348− bool wantExtraDebugging = app->getLogger()->extraDebugging();
4349− if (wantExtraDebugging && app->_incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) {
4350− int numBytesPacketHeader = numBytesForPacketHeader(app->_incomingPacket);
4351− unsigned char* dataAt = app->_incomingPacket + numBytesPacketHeader;
4352− dataAt += sizeof(VOXEL_PACKET_FLAGS);
4353− VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt);
4354− dataAt += sizeof(VOXEL_PACKET_SEQUENCE);
4355− VOXEL_PACKET_SENT_TIME sentAt = (*(VOXEL_PACKET_SENT_TIME*)dataAt);
4356− dataAt += sizeof(VOXEL_PACKET_SENT_TIME);
4357− VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
4358− int flightTime = arrivedAt - sentAt;
4359−
4360− printf("got PACKET_TYPE_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
4361− }
4362−
4363− // add this packet to our list of voxel packets and process them on the voxel processing
4364− app->_voxelProcessor.queueReceivedPacket(senderSockAddr, app->_incomingPacket, bytesReceived);
4365− break;
4201+ while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() &&
4202+ (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) _incomingPacket,
4203+ MAX_PACKET_SIZE,
4204+ senderSockAddr.getAddressPointer(),
4205+ senderSockAddr.getPortPointer()))) {
4206+
4207+ _packetCount++;
4208+ _bytesCount += bytesReceived;
4209+
4210+ if (packetVersionMatch(_incomingPacket)) {
4211+ // only process this packet if we have a match on the packet version
4212+ switch (_incomingPacket[0]) {
4213+ case PACKET_TYPE_TRANSMITTER_DATA_V2:
4214+ // V2 = IOS transmitter app
4215+ _myTransmitter.processIncomingData(_incomingPacket, bytesReceived);
4216+
4217+ break;
4218+ case PACKET_TYPE_MIXED_AUDIO:
4219+ QMetaObject::invokeMethod(&_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
4220+ Q_ARG(QByteArray, QByteArray((char*) _incomingPacket, bytesReceived)));
4221+ break;
4222+
4223+ case PACKET_TYPE_PARTICLE_ADD_RESPONSE:
4224+ // look up our ParticleEditHanders....
4225+ ParticleEditHandle::handleAddResponse(_incomingPacket, bytesReceived);
4226+ break;
4227+
4228+ case PACKET_TYPE_PARTICLE_DATA:
4229+ case PACKET_TYPE_VOXEL_DATA:
4230+ case PACKET_TYPE_VOXEL_ERASE:
4231+ case PACKET_TYPE_OCTREE_STATS:
4232+ case PACKET_TYPE_ENVIRONMENT_DATA: {
4233+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4234+ "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");
4235+
4236+ bool wantExtraDebugging = getLogger()->extraDebugging();
4237+ if (wantExtraDebugging && _incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) {
4238+ int numBytesPacketHeader = numBytesForPacketHeader(_incomingPacket);
4239+ unsigned char* dataAt = _incomingPacket + numBytesPacketHeader;
4240+ dataAt += sizeof(VOXEL_PACKET_FLAGS);
4241+ VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt);
4242+ dataAt += sizeof(VOXEL_PACKET_SEQUENCE);
4243+ VOXEL_PACKET_SENT_TIME sentAt = (*(VOXEL_PACKET_SENT_TIME*)dataAt);
4244+ dataAt += sizeof(VOXEL_PACKET_SENT_TIME);
4245+ VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
4246+ int flightTime = arrivedAt - sentAt;
4247+
4248+ printf("got PACKET_TYPE_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
43664249 }
4367− case PACKET_TYPE_METAVOXEL_DATA:
4368− app->_metavoxels.processData(QByteArray((const char*)app->_incomingPacket, bytesReceived),
4369− senderSockAddr);
4370− break;
4371− case PACKET_TYPE_BULK_AVATAR_DATA:
4372− NodeList::getInstance()->processBulkNodeData(senderSockAddr,
4373− app->_incomingPacket,
4374− bytesReceived);
4375− getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
4376− break;
4377− case PACKET_TYPE_AVATAR_URLS:
4378− processAvatarURLsMessage(app->_incomingPacket, bytesReceived);
4379− break;
4380− case PACKET_TYPE_AVATAR_FACE_VIDEO:
4381− processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived);
4382− break;
4383− case PACKET_TYPE_DATA_SERVER_GET:
4384− case PACKET_TYPE_DATA_SERVER_PUT:
4385− case PACKET_TYPE_DATA_SERVER_SEND:
4386− case PACKET_TYPE_DATA_SERVER_CONFIRM:
4387− DataServerClient::processMessageFromDataServer(app->_incomingPacket, bytesReceived);
4388− break;
4389− default:
4390− NodeList::getInstance()->processNodeData(senderSockAddr, app->_incomingPacket, bytesReceived);
4391− break;
4250+
4251+ // add this packet to our list of voxel packets and process them on the voxel processing
4252+ _voxelProcessor.queueReceivedPacket(senderSockAddr, _incomingPacket, bytesReceived);
4253+ break;
43924254 }
4255+ case PACKET_TYPE_METAVOXEL_DATA:
4256+ _metavoxels.processData(QByteArray((const char*) _incomingPacket, bytesReceived),
4257+ senderSockAddr);
4258+ break;
4259+ case PACKET_TYPE_BULK_AVATAR_DATA:
4260+ NodeList::getInstance()->processBulkNodeData(senderSockAddr,
4261+ _incomingPacket,
4262+ bytesReceived);
4263+ getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
4264+ break;
4265+ case PACKET_TYPE_AVATAR_URLS:
4266+ processAvatarURLsMessage(_incomingPacket, bytesReceived);
4267+ break;
4268+ case PACKET_TYPE_AVATAR_FACE_VIDEO:
4269+ processAvatarFaceVideoMessage(_incomingPacket, bytesReceived);
4270+ break;
4271+ case PACKET_TYPE_DATA_SERVER_GET:
4272+ case PACKET_TYPE_DATA_SERVER_PUT:
4273+ case PACKET_TYPE_DATA_SERVER_SEND:
4274+ case PACKET_TYPE_DATA_SERVER_CONFIRM:
4275+ DataServerClient::processMessageFromDataServer(_incomingPacket, bytesReceived);
4276+ break;
4277+ default:
4278+ NodeList::getInstance()->processNodeData(senderSockAddr, _incomingPacket, bytesReceived);
4279+ break;
43934280 }
4394− } else if (!app->_enableNetworkThread) {
4395− break;
43964281 }
43974282 }
4398−
4399− if (app->_enableNetworkThread) {
4400− pthread_exit(0);
4401− }
4402− return NULL;
44034283 }
44044284
44054285 void Application::packetSentNotification(ssize_t length) {

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