History

Merge

Leonardo Murillo committed 12 years ago

Commit 80946b12 parents f9bb986 6a2c962107 files · +1050 −2012Browse files

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

Unified · Split

interface/src/Application.cpp+168−351
@@ -92,15 +92,15 @@ const float MIRROR_REARVIEW_BODY_DISTANCE = 2.3f; · 91 unmodified lines
9292 const QString CHECK_VERSION_URL = "http://highfidelity.io/latestVersion.xml";
9393
9494 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
95− fprintf(stdout, "%s", message.toLocal8Bit().constData());
96− Application::getInstance()->getLogger()->addMessage(message.toLocal8Bit().constData());
95+ QString messageWithNewLine = message + "\n";
96+ fprintf(stdout, "%s", messageWithNewLine.toLocal8Bit().constData());
97+ Application::getInstance()->getLogger()->addMessage(messageWithNewLine.toLocal8Bit().constData());
9798 }
9899
99100 Application::Application(int& argc, char** argv, timeval &startup_time) :
100101 QApplication(argc, argv),
101102 _window(new QMainWindow(desktop())),
102103 _glWidget(new GLCanvas()),
103− _displayLevels(false),
104104 _frameCount(0),
105105 _fps(120.0f),
106106 _justStarted(true),
@@ -134,7 +134,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 27 unmodified lines
134134 _perfStatsOn(false),
135135 _chatEntryOn(false),
136136 _audio(&_audioScope, STARTUP_JITTER_SAMPLES),
137− _stopNetworkReceiveThread(false),
137+ _enableProcessVoxelsThread(true),
138138 _voxelProcessor(),
139139 _voxelHideShowThread(&_voxels),
140140 _voxelEditSender(this),
@@ -169,6 +169,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 28 unmodified lines
169169 }
170170
171171 NodeList* nodeList = NodeList::createInstance(NODE_TYPE_AGENT, listenPort);
172+
173+ // connect our processDatagrams slot to the QUDPSocket readyRead() signal
174+ connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), SLOT(processDatagrams()));
172175
173176 // put the audio processing on a separate thread
174177 QThread* audioThread = new QThread(this);
@@ -177,13 +180,12 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 2 unmodified lines
177180 connect(audioThread, SIGNAL(started()), &_audio, SLOT(start()));
178181
179182 audioThread->start();
183+
184+ connect(nodeList, SIGNAL(domainChanged(const QString&)), SLOT(domainChanged(const QString&)));
180185
181− nodeList->addHook(&_voxels);
182− nodeList->addHook(this);
183− nodeList->addDomainListener(this);
184−
185− // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line
186− _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
186+ connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
187+ connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
188+ connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
187189
188190 // read the ApplicationInfo.ini file for Name/Version/Domain information
189191 QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
@@ -279,9 +281,6 @@ Application::~Application() { · 89 unmodified lines
279281 _audio.thread()->wait();
280282
281283 storeSizeAndPosition();
282− NodeList::getInstance()->removeHook(&_voxels);
283− NodeList::getInstance()->removeHook(this);
284− NodeList::getInstance()->removeDomainListener(this);
285284
286285 _sharedVoxelSystem.changeTree(new VoxelTree);
287286
@@ -290,7 +289,6 @@ Application::~Application() { · 2 unmodified lines
290289
291290 delete _logger;
292291 delete _settings;
293− delete _followMode;
294292 delete _glWidget;
295293 }
296294
@@ -326,7 +324,7 @@ void Application::storeSizeAndPosition() { · 29 unmodified lines
326324 }
327325
328326 void Application::initializeGL() {
329− qDebug( "Created Display Window.\n" );
327+ qDebug( "Created Display Window.");
330328
331329 // initialize glut for shape drawing; Qt apparently initializes it on OS X
332330 #ifndef __APPLE__
@@ -341,16 +339,10 @@ void Application::initializeGL() { · 8 unmodified lines
341339 _viewFrustumOffsetCamera.setFarClip(500.0 * TREE_SCALE);
342340
343341 initDisplay();
344− qDebug( "Initialized Display.\n" );
342+ qDebug( "Initialized Display.");
345343
346344 init();
347− qDebug( "Init() complete.\n" );
348−
349− // create thread for receipt of data via UDP
350− if (_enableNetworkThread) {
351− pthread_create(&_networkReceiveThread, NULL, networkReceive, NULL);
352− qDebug("Network receive thread created.\n");
353− }
345+ qDebug( "init() complete.");
354346
355347 // create thread for parsing of voxel data independent of the main network and rendering threads
356348 _voxelProcessor.initialize(_enableProcessVoxelsThread);
@@ -358,7 +350,7 @@ void Application::initializeGL() { · 1 unmodified line
358350 _voxelHideShowThread.initialize(_enableProcessVoxelsThread);
359351 _particleEditSender.initialize(_enableProcessVoxelsThread);
360352 if (_enableProcessVoxelsThread) {
361− qDebug("Voxel parsing thread created.\n");
353+ qDebug("Voxel parsing thread created.");
362354 }
363355
364356 // call terminate before exiting
@@ -378,9 +370,7 @@ void Application::initializeGL() { · 13 unmodified lines
378370 if (_justStarted) {
379371 float startupTime = (usecTimestampNow() - usecTimestamp(&_applicationStartupTime)) / 1000000.0;
380372 _justStarted = false;
381− char title[50];
382− sprintf(title, "Interface: %4.2f seconds\n", startupTime);
383− qDebug("%s", title);
373+ qDebug("Startup time: %4.2f seconds.", startupTime);
384374 const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";
385375
386376 // ask the Logstash class to record the startup time
@@ -687,9 +677,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 300 unmodified lines
687677 _audioScope.inputPaused = !_audioScope.inputPaused;
688678 break;
689679 case Qt::Key_L:
690− if (!isShifted && !isMeta) {
691− _displayLevels = !_displayLevels;
692− } else if (isShifted) {
680+ if (isShifted) {
693681 Menu::getInstance()->triggerOption(MenuOption::LodTools);
694682 } else if (isMeta) {
695683 Menu::getInstance()->triggerOption(MenuOption::Log);
@@ -1355,11 +1343,6 @@ void Application::timer() { · 659 unmodified lines
13551343
13561344 gettimeofday(&_timerStart, NULL);
13571345
1358− // if we haven't detected gyros, check for them now
1359− if (!_serialHeadSensor.isActive()) {
1360− _serialHeadSensor.pair();
1361− }
1362−
13631346 // ask the node list to check in with the domain server
13641347 NodeList::getInstance()->sendDomainServerCheckIn();
13651348
@@ -1442,11 +1425,6 @@ void Application::terminate() { · 76 unmodified lines
14421425 // let the avatar mixer know we're out
14431426 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
14441427
1445− if (_enableNetworkThread) {
1446− _stopNetworkReceiveThread = true;
1447− pthread_join(_networkReceiveThread, NULL);
1448− }
1449−
14501428 printf("");
14511429 _voxelProcessor.terminate();
14521430 _voxelHideShowThread.terminate();
@@ -1459,7 +1437,7 @@ void Application::terminate() { · 6 unmodified lines
14591437 static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& dataBytes) {
14601438 // record the packet for stats-tracking
14611439 Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AVATARS).updateValue(dataBytes);
1462− Node* avatarMixerNode = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
1440+ SharedNodePointer avatarMixerNode = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
14631441 if (avatarMixerNode) {
14641442 avatarMixerNode->recordBytesReceived(dataBytes);
14651443 }
@@ -1476,7 +1454,7 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da · 10 unmodified lines
14761454 dataBytes -= NUM_BYTES_RFC4122_UUID;
14771455
14781456 // make sure the node exists
1479− Node* node = NodeList::getInstance()->nodeWithUUID(nodeUUID);
1457+ SharedNodePointer node = NodeList::getInstance()->nodeWithUUID(nodeUUID);
14801458 if (!node || !node->getLinkedData()) {
14811459 return NULL;
14821460 }
@@ -1724,9 +1702,9 @@ void Application::exportVoxels() { · 241 unmodified lines
17241702
17251703 void Application::importVoxels() {
17261704 if (_voxelImporter.exec()) {
1727− qDebug("[DEBUG] Import succedded.\n");
1705+ qDebug("[DEBUG] Import succeeded.");
17281706 } else {
1729− qDebug("[DEBUG] Import failed.\n");
1707+ qDebug("[DEBUG] Import failed.");
17301708 }
17311709
17321710 // restore the main window's active state
@@ -1907,7 +1885,7 @@ void Application::init() { · 174 unmodified lines
19071885 if (Menu::getInstance()->getAudioJitterBufferSamples() != 0) {
19081886 _audio.setJitterBufferSamples(Menu::getInstance()->getAudioJitterBufferSamples());
19091887 }
1910− qDebug("Loaded settings.\n");
1888+ qDebug("Loaded settings");
19111889
19121890 if (!_profile.getUsername().isEmpty()) {
19131891 // we have a username for this avatar, ask the data-server for the mesh URL for this avatar
@@ -1941,10 +1919,6 @@ void Application::init() { · 27 unmodified lines
19411919 _glWidget->width(),
19421920 _glWidget->height());
19431921
1944− _followMode = new QAction(this);
1945− connect(_followMode, SIGNAL(triggered()), this, SLOT(toggleFollowMode()));
1946− _pieMenu.addAction(_followMode);
1947−
19481922 _audio.init(_glWidget);
19491923
19501924 _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
@@ -2002,16 +1976,16 @@ void Application::updateLookatTargetAvatar(const glm::vec3& mouseRayOrigin, cons · 51 unmodified lines
20021976 Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection,
20031977 glm::vec3& eyePosition, QUuid& nodeUUID = DEFAULT_NODE_ID_REF) {
20041978
2005− NodeList* nodeList = NodeList::getInstance();
2006− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
1979+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
20071980 if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
20081981 Avatar* avatar = (Avatar*)node->getLinkedData();
20091982 float distance;
1983+
20101984 if (avatar->findRayIntersection(mouseRayOrigin, mouseRayDirection, distance)) {
20111985 // rescale to compensate for head embiggening
20121986 eyePosition = (avatar->getHead().calculateAverageEyePosition() - avatar->getHead().getScalePivot()) *
2013− (avatar->getScale() / avatar->getHead().getScale()) + avatar->getHead().getScalePivot();
2014−
1987+ (avatar->getScale() / avatar->getHead().getScale()) + avatar->getHead().getScalePivot();
1988+
20151989 _lookatIndicatorScale = avatar->getHead().getScale();
20161990 _lookatOtherPosition = avatar->getHead().getPosition();
20171991 nodeUUID = avatar->getOwningNode()->getUUID();
@@ -2019,6 +1993,7 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 1 unmodified line
20191993 }
20201994 }
20211995 }
1996+
20221997 return NULL;
20231998 }
20241999
@@ -2043,71 +2018,6 @@ void Application::renderLookatIndicator(glm::vec3 pointOfInterest) { · 18 unmodified lines
20432018 renderCircle(haloOrigin, INDICATOR_RADIUS, IDENTITY_UP, NUM_SEGMENTS);
20442019 }
20452020
2046−void maybeBeginFollowIndicator(bool& began) {
2047− if (!began) {
2048− Application::getInstance()->getGlowEffect()->begin();
2049− glLineWidth(5);
2050− glBegin(GL_LINES);
2051− began = true;
2052− }
2053−}
2054−
2055−void Application::renderFollowIndicator() {
2056− NodeList* nodeList = NodeList::getInstance();
2057−
2058− // initialize lazily so that we don't enable the glow effect unnecessarily
2059− bool began = false;
2060−
2061− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); ++node) {
2062− if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
2063− Avatar* avatar = (Avatar *) node->getLinkedData();
2064− Avatar* leader = NULL;
2065−
2066− if (!avatar->getLeaderUUID().isNull()) {
2067− if (avatar->getLeaderUUID() == NodeList::getInstance()->getOwnerUUID()) {
2068− leader = &_myAvatar;
2069− } else {
2070− for (NodeList::iterator it = nodeList->begin(); it != nodeList->end(); ++it) {
2071− if(it->getUUID() == avatar->getLeaderUUID()
2072− && it->getType() == NODE_TYPE_AGENT) {
2073− leader = (Avatar*) it->getLinkedData();
2074− }
2075− }
2076− }
2077−
2078− if (leader != NULL) {
2079− maybeBeginFollowIndicator(began);
2080− glColor3f(1.f, 0.f, 0.f);
2081− glVertex3f((avatar->getHead().getPosition().x + avatar->getPosition().x) / 2.f,
2082− (avatar->getHead().getPosition().y + avatar->getPosition().y) / 2.f,
2083− (avatar->getHead().getPosition().z + avatar->getPosition().z) / 2.f);
2084− glColor3f(0.f, 1.f, 0.f);
2085− glVertex3f((leader->getHead().getPosition().x + leader->getPosition().x) / 2.f,
2086− (leader->getHead().getPosition().y + leader->getPosition().y) / 2.f,
2087− (leader->getHead().getPosition().z + leader->getPosition().z) / 2.f);
2088− }
2089− }
2090− }
2091− }
2092−
2093− if (_myAvatar.getLeadingAvatar() != NULL) {
2094− maybeBeginFollowIndicator(began);
2095− glColor3f(1.f, 0.f, 0.f);
2096− glVertex3f((_myAvatar.getHead().getPosition().x + _myAvatar.getPosition().x) / 2.f,
2097− (_myAvatar.getHead().getPosition().y + _myAvatar.getPosition().y) / 2.f,
2098− (_myAvatar.getHead().getPosition().z + _myAvatar.getPosition().z) / 2.f);
2099− glColor3f(0.f, 1.f, 0.f);
2100− glVertex3f((_myAvatar.getLeadingAvatar()->getHead().getPosition().x + _myAvatar.getLeadingAvatar()->getPosition().x) / 2.f,
2101− (_myAvatar.getLeadingAvatar()->getHead().getPosition().y + _myAvatar.getLeadingAvatar()->getPosition().y) / 2.f,
2102− (_myAvatar.getLeadingAvatar()->getHead().getPosition().z + _myAvatar.getLeadingAvatar()->getPosition().z) / 2.f);
2103− }
2104−
2105− if (began) {
2106− glEnd();
2107− _glowEffect.end();
2108− }
2109−}
2110−
21112021 void Application::renderHighlightVoxel(VoxelDetail voxel) {
21122022 glDisable(GL_LIGHTING);
21132023 glPushMatrix();
@@ -2125,10 +2035,9 @@ void Application::renderHighlightVoxel(VoxelDetail voxel) { · 11 unmodified lines
21252035 void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm::vec3 mouseRayDirection) {
21262036 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
21272037 PerformanceWarning warn(showWarnings, "Application::updateAvatars()");
2128− NodeList* nodeList = NodeList::getInstance();
2129−
2130− for(NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2131− node->lock();
2038+
2039+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
2040+ QMutexLocker(&node->getMutex());
21322041 if (node->getLinkedData()) {
21332042 Avatar *avatar = (Avatar *)node->getLinkedData();
21342043 if (!avatar->isInitialized()) {
@@ -2137,7 +2046,6 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 2 unmodified lines
21372046 avatar->simulate(deltaTime, NULL);
21382047 avatar->setMouseRay(mouseRayOrigin, mouseRayDirection);
21392048 }
2140− node->unlock();
21412049 }
21422050
21432051 // simulate avatar fades
@@ -2397,21 +2305,12 @@ void Application::updateSixense(float deltaTime) { · 253 unmodified lines
23972305 void Application::updateSerialDevices(float deltaTime) {
23982306 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
23992307 PerformanceWarning warn(showWarnings, "Application::updateSerialDevices()");
2400−
2401− if (_serialHeadSensor.isActive()) {
2402− _serialHeadSensor.readData(deltaTime);
2403− }
24042308 }
24052309
24062310 void Application::updateThreads(float deltaTime) {
24072311 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
24082312 PerformanceWarning warn(showWarnings, "Application::updateThreads()");
24092313
2410− // read incoming packets from network
2411− if (!_enableNetworkThread) {
2412− networkReceive(0);
2413− }
2414−
24152314 // parse voxel packets
24162315 if (!_enableProcessVoxelsThread) {
24172316 _voxelProcessor.threadRoutine();
@@ -2644,41 +2543,6 @@ void Application::updateAvatar(float deltaTime) { · 226 unmodified lines
26442543 _headMouseY -= headVelocity.x * HEADMOUSE_FACESHIFT_PITCH_SCALE;
26452544 }
26462545
2647− if (_serialHeadSensor.isActive()) {
2648−
2649− // Grab latest readings from the gyros
2650− float measuredPitchRate = _serialHeadSensor.getLastPitchRate();
2651− float measuredYawRate = _serialHeadSensor.getLastYawRate();
2652−
2653− // Update gyro-based mouse (X,Y on screen)
2654− const float MIN_MOUSE_RATE = 3.0;
2655− const float HORIZONTAL_PIXELS_PER_DEGREE = 2880.f / 45.f;
2656− const float VERTICAL_PIXELS_PER_DEGREE = 1800.f / 30.f;
2657− if (powf(measuredYawRate * measuredYawRate +
2658− measuredPitchRate * measuredPitchRate, 0.5) > MIN_MOUSE_RATE) {
2659− _headMouseX -= measuredYawRate * HORIZONTAL_PIXELS_PER_DEGREE * deltaTime;
2660− _headMouseY -= measuredPitchRate * VERTICAL_PIXELS_PER_DEGREE * deltaTime;
2661− }
2662−
2663− const float MIDPOINT_OF_SCREEN = 0.5;
2664−
2665− // Only use gyro to set lookAt if mouse hasn't selected an avatar
2666− if (!_lookatTargetAvatar) {
2667−
2668− // Set lookAtPosition if an avatar is at the center of the screen
2669− glm::vec3 screenCenterRayOrigin, screenCenterRayDirection;
2670− _viewFrustum.computePickRay(MIDPOINT_OF_SCREEN, MIDPOINT_OF_SCREEN, screenCenterRayOrigin, screenCenterRayDirection);
2671−
2672− glm::vec3 eyePosition;
2673− updateLookatTargetAvatar(screenCenterRayOrigin, screenCenterRayDirection, eyePosition);
2674− if (_lookatTargetAvatar) {
2675− glm::vec3 myLookAtFromMouse(eyePosition);
2676− _myAvatar.getHead().setLookAtPosition(myLookAtFromMouse);
2677− }
2678− }
2679−
2680− }
2681−
26822546 // Constrain head-driven mouse to edges of screen
26832547 _headMouseX = glm::clamp(_headMouseX, 0, _glWidget->width());
26842548 _headMouseY = glm::clamp(_headMouseY, 0, _glWidget->height());
@@ -2759,39 +2623,36 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 74 unmodified lines
27592623
27602624 unsigned char voxelQueryPacket[MAX_PACKET_SIZE];
27612625
2762− NodeList* nodeList = NodeList::getInstance();
2763−
27642626 // Iterate all of the nodes, and get a count of how many voxel servers we have...
27652627 int totalServers = 0;
27662628 int inViewServers = 0;
27672629 int unknownJurisdictionServers = 0;
2768−
2769− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2770−
2630+
2631+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
27712632 // only send to the NodeTypes that are serverType
27722633 if (node->getActiveSocket() != NULL && node->getType() == serverType) {
27732634 totalServers++;
2774−
2635+
27752636 // get the server bounds for this server
27762637 QUuid nodeUUID = node->getUUID();
2777−
2638+
27782639 // if we haven't heard from this voxel server, go ahead and send it a query, so we
27792640 // can get the jurisdiction...
27802641 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
27812642 unknownJurisdictionServers++;
27822643 } else {
27832644 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
2784−
2645+
27852646 unsigned char* rootCode = map.getRootOctalCode();
2786−
2647+
27872648 if (rootCode) {
27882649 VoxelPositionSize rootDetails;
27892650 voxelDetailsForCode(rootCode, rootDetails);
27902651 AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s);
27912652 serverBounds.scale(TREE_SCALE);
2792−
2653+
27932654 ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
2794−
2655+
27952656 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
27962657 inViewServers++;
27972658 }
@@ -2801,7 +2662,7 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 3 unmodified lines
28012662 }
28022663
28032664 if (wantExtraDebugging && unknownJurisdictionServers > 0) {
2804− qDebug("Servers: total %d, in view %d, unknown jurisdiction %d \n",
2665+ qDebug("Servers: total %d, in view %d, unknown jurisdiction %d",
28052666 totalServers, inViewServers, unknownJurisdictionServers);
28062667 }
28072668
@@ -2822,38 +2683,40 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 14 unmodified lines
28222683 }
28232684
28242685 if (wantExtraDebugging && unknownJurisdictionServers > 0) {
2825− qDebug("perServerPPS: %d perUnknownServer: %d\n", perServerPPS, perUnknownServer);
2686+ qDebug("perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
28262687 }
2827−
2828− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2688+
2689+ NodeList* nodeList = NodeList::getInstance();
2690+
2691+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
28292692 // only send to the NodeTypes that are serverType
28302693 if (node->getActiveSocket() != NULL && node->getType() == serverType) {
2831−
2832−
2694+
2695+
28332696 // get the server bounds for this server
28342697 QUuid nodeUUID = node->getUUID();
2835−
2698+
28362699 bool inView = false;
28372700 bool unknownView = false;
2838−
2701+
28392702 // if we haven't heard from this voxel server, go ahead and send it a query, so we
28402703 // can get the jurisdiction...
28412704 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
28422705 unknownView = true; // assume it's in view
28432706 if (wantExtraDebugging) {
2844− qDebug() << "no known jurisdiction for node " << *node << ", assume it's visible.\n";
2707+ qDebug() << "no known jurisdiction for node " << *node << ", assume it's visible.";
28452708 }
28462709 } else {
28472710 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
2848−
2711+
28492712 unsigned char* rootCode = map.getRootOctalCode();
2850−
2713+
28512714 if (rootCode) {
28522715 VoxelPositionSize rootDetails;
28532716 voxelDetailsForCode(rootCode, rootDetails);
28542717 AABox serverBounds(glm::vec3(rootDetails.x, rootDetails.y, rootDetails.z), rootDetails.s);
28552718 serverBounds.scale(TREE_SCALE);
2856−
2719+
28572720 ViewFrustum::location serverFrustumLocation = _viewFrustum.boxInFrustum(serverBounds);
28582721 if (serverFrustumLocation != ViewFrustum::OUTSIDE) {
28592722 inView = true;
@@ -2862,19 +2725,19 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 2 unmodified lines
28622725 }
28632726 } else {
28642727 if (wantExtraDebugging) {
2865− qDebug() << "Jurisdiction without RootCode for node " << *node << ". That's unusual!\n";
2728+ qDebug() << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
28662729 }
28672730 }
28682731 }
2869−
2732+
28702733 if (inView) {
28712734 _voxelQuery.setMaxOctreePacketsPerSecond(perServerPPS);
28722735 } else if (unknownView) {
28732736 if (wantExtraDebugging) {
28742737 qDebug() << "no known jurisdiction for node " << *node << ", give it budget of "
2875− << perUnknownServer << " to send us jurisdiction.\n";
2738+ << perUnknownServer << " to send us jurisdiction.";
28762739 }
2877−
2740+
28782741 // set the query's position/orientation to be degenerate in a manner that will get the scene quickly
28792742 // If there's only one server, then don't do this, and just let the normal voxel query pass through
28802743 // as expected... this way, we will actually get a valid scene if there is one to be seen
@@ -2885,11 +2748,11 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 4 unmodified lines
28852748 _voxelQuery.setCameraNearClip(0.1);
28862749 _voxelQuery.setCameraFarClip(0.1);
28872750 if (wantExtraDebugging) {
2888− qDebug() << "Using 'minimal' camera position for node " << *node << "\n";
2751+ qDebug() << "Using 'minimal' camera position for node" << *node;
28892752 }
28902753 } else {
28912754 if (wantExtraDebugging) {
2892− qDebug() << "Using regular camera position for node " << *node << "\n";
2755+ qDebug() << "Using regular camera position for node" << *node;
28932756 }
28942757 }
28952758 _voxelQuery.setMaxOctreePacketsPerSecond(perUnknownServer);
@@ -2898,24 +2761,24 @@ void Application::queryOctree(NODE_TYPE serverType, PACKET_TYPE packetType, Node · 2 unmodified lines
28982761 }
28992762 // set up the packet for sending...
29002763 unsigned char* endOfVoxelQueryPacket = voxelQueryPacket;
2901−
2764+
29022765 // insert packet type/version and node UUID
29032766 endOfVoxelQueryPacket += populateTypeAndVersion(endOfVoxelQueryPacket, packetType);
29042767 QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();
29052768 memcpy(endOfVoxelQueryPacket, ownerUUID.constData(), ownerUUID.size());
29062769 endOfVoxelQueryPacket += ownerUUID.size();
2907−
2770+
29082771 // encode the query data...
29092772 endOfVoxelQueryPacket += _voxelQuery.getBroadcastData(endOfVoxelQueryPacket);
2910−
2773+
29112774 int packetLength = endOfVoxelQueryPacket - voxelQueryPacket;
2912−
2775+
29132776 // make sure we still have an active socket
29142777 if (node->getActiveSocket()) {
29152778 nodeList->getNodeSocket().writeDatagram((char*) voxelQueryPacket, packetLength,
2916− node->getActiveSocket()->getAddress(), node->getActiveSocket()->getPort());
2779+ node->getActiveSocket()->getAddress(), node->getActiveSocket()->getPort());
29172780 }
2918−
2781+
29192782 // Feed number of bytes to corresponding channel of the bandwidth meter
29202783 _bandwidthMeter.outputStream(BandwidthMeter::VOXELS).updateValue(packetLength);
29212784 }
@@ -3272,12 +3135,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 350 unmodified lines
32723135 }
32733136 }
32743137
3275− {
3276− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3277− "Application::displaySide() ... renderFollowIndicator...");
3278− renderFollowIndicator();
3279− }
3280−
32813138 // render transmitter pick ray, if non-empty
32823139 if (_transmitterPickStart != _transmitterPickEnd) {
32833140 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
@@ -3345,8 +3202,7 @@ void Application::displayOverlay() { · 61 unmodified lines
33453202
33463203 //noiseTest(_glWidget->width(), _glWidget->height());
33473204
3348− if (Menu::getInstance()->isOptionChecked(MenuOption::HeadMouse)
3349− && USING_INVENSENSE_MPU9150) {
3205+ if (Menu::getInstance()->isOptionChecked(MenuOption::HeadMouse)) {
33503206 // Display small target box at center or head mouse target that can also be used to measure LOD
33513207 glColor3f(1.0, 1.0, 1.0);
33523208 glDisable(GL_LINE_SMOOTH);
@@ -3382,9 +3238,6 @@ void Application::displayOverlay() { · 29 unmodified lines
33823238 }
33833239 }
33843240
3385− // Show detected levels from the serial I/O ADC channel sensors
3386− if (_displayLevels) _serialHeadSensor.renderLevels(_glWidget->width(), _glWidget->height());
3387−
33883241 // Show hand transmitter data if detected
33893242 if (_myTransmitter.isConnected()) {
33903243 _myTransmitter.renderLevels(_glWidget->width(), _glWidget->height());
@@ -3404,12 +3257,12 @@ void Application::displayOverlay() { · 13 unmodified lines
34043257 glPointSize(1.0f);
34053258 char nodes[100];
34063259
3407− NodeList* nodeList = NodeList::getInstance();
34083260 int totalAvatars = 0, totalServers = 0;
3409−
3410− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3261+
3262+ foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
34113263 node->getType() == NODE_TYPE_AGENT ? totalAvatars++ : totalServers++;
34123264 }
3265+
34133266 sprintf(nodes, "Servers: %d, Avatars: %d\n", totalServers, totalAvatars);
34143267 drawtext(_glWidget->width() - 150, 20, 0.10, 0, 1.0, 0, nodes, 1, 0, 0);
34153268 }
@@ -3509,8 +3362,8 @@ void Application::displayStats() { · 93 unmodified lines
35093362 int pingAudio = 0, pingAvatar = 0, pingVoxel = 0, pingVoxelMax = 0;
35103363
35113364 NodeList* nodeList = NodeList::getInstance();
3512− Node* audioMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
3513− Node* avatarMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
3365+ SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
3366+ SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
35143367
35153368 pingAudio = audioMixerNode ? audioMixerNode->getPingMs() : 0;
35163369 pingAvatar = avatarMixerNode ? avatarMixerNode->getPingMs() : 0;
@@ -3519,7 +3372,8 @@ void Application::displayStats() { · 2 unmodified lines
35193372 // Now handle voxel servers, since there could be more than one, we average their ping times
35203373 unsigned long totalPingVoxel = 0;
35213374 int voxelServerCount = 0;
3522− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3375+
3376+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
35233377 if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
35243378 totalPingVoxel += node->getPingMs();
35253379 voxelServerCount++;
@@ -3528,6 +3382,7 @@ void Application::displayStats() { · 2 unmodified lines
35283382 }
35293383 }
35303384 }
3385+
35313386 if (voxelServerCount) {
35323387 pingVoxel = totalPingVoxel/voxelServerCount;
35333388 }
@@ -3544,7 +3399,7 @@ void Application::displayStats() { · 10 unmodified lines
35443399 sprintf(avatarStats, "Avatar: pos %.3f, %.3f, %.3f, vel %.1f, yaw = %.2f", avatarPos.x, avatarPos.y, avatarPos.z, glm::length(_myAvatar.getVelocity()), _myAvatar.getBodyYaw());
35453400 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, avatarStats);
35463401
3547− Node* avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
3402+ SharedNodePointer avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
35483403 char avatarMixerStats[200];
35493404 if (avatarMixer) {
35503405 sprintf(avatarMixerStats, "Avatar Mixer: %.f kbps, %.f pps",
@@ -3746,9 +3601,6 @@ glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { · 195 unmodified lines
37463601
37473602 // render the coverage map on screen
37483603 void Application::renderCoverageMapV2() {
3749−
3750− //qDebug("renderCoverageMap()\n");
3751−
37523604 glDisable(GL_LIGHTING);
37533605 glLineWidth(2.0);
37543606 glBegin(GL_LINES);
@@ -3792,8 +3644,6 @@ void Application::renderCoverageMapsV2Recursively(CoverageMapV2* map) { · 37 unmodified lines
37923644 // render the coverage map on screen
37933645 void Application::renderCoverageMap() {
37943646
3795− //qDebug("renderCoverageMap()\n");
3796−
37973647 glDisable(GL_LIGHTING);
37983648 glLineWidth(2.0);
37993649 glBegin(GL_LINES);
@@ -3868,10 +3718,10 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 68 unmodified lines
38683718 if (!selfAvatarOnly) {
38693719 // Render avatars of other nodes
38703720 NodeList* nodeList = NodeList::getInstance();
3871−
3872− for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
3873− node->lock();
3874−
3721+
3722+ foreach (const SharedNodePointer& node, nodeList->getNodeHash()) {
3723+ QMutexLocker(&node->getMutex());
3724+
38753725 if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
38763726 Avatar *avatar = (Avatar *)node->getLinkedData();
38773727 if (!avatar->isInitialized()) {
@@ -3880,8 +3730,6 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 2 unmodified lines
38803730 avatar->render(false);
38813731 avatar->setDisplayingLookatVectors(Menu::getInstance()->isOptionChecked(MenuOption::LookAtVectors));
38823732 }
3883−
3884− node->unlock();
38853733 }
38863734
38873735 // render avatar fades
@@ -4126,25 +3974,10 @@ void Application::eyedropperVoxelUnderCursor() { · 238 unmodified lines
41263974 }
41273975 }
41283976
4129−void Application::toggleFollowMode() {
4130− glm::vec3 mouseRayOrigin, mouseRayDirection;
4131− _viewFrustum.computePickRay(_pieMenu.getX() / (float)_glWidget->width(),
4132− _pieMenu.getY() / (float)_glWidget->height(),
4133− mouseRayOrigin, mouseRayDirection);
4134− glm::vec3 eyePositionIgnored;
4135− QUuid nodeUUIDIgnored;
4136− Avatar* leadingAvatar = findLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, eyePositionIgnored, nodeUUIDIgnored);
4137−
4138− _myAvatar.follow(leadingAvatar);
4139−}
4140−
41413977 void Application::resetSensors() {
41423978 _headMouseX = _mouseX = _glWidget->width() / 2;
41433979 _headMouseY = _mouseY = _glWidget->height() / 2;
41443980
4145− if (_serialHeadSensor.isActive()) {
4146− _serialHeadSensor.resetAverages();
4147− }
41483981 _webcam.reset();
41493982 _faceshift.reset();
41503983
@@ -4197,13 +4030,13 @@ void Application::updateWindowTitle(){ · 46 unmodified lines
41974030 title += _profile.getLastDomain();
41984031 title += buildVersion;
41994032
4200− qDebug("Application title set to: %s.\n", title.toStdString().c_str());
4033+ qDebug("Application title set to: %s", title.toStdString().c_str());
42014034 _window->setWindowTitle(title);
42024035 }
42034036
4204−void Application::domainChanged(QString domain) {
4037+void Application::domainChanged(const QString& domainHostname) {
42054038 // update the user's last domain in their Profile (which will propagate to data-server)
4206− _profile.updateDomain(domain);
4039+ _profile.updateDomain(domainHostname);
42074040
42084041 updateWindowTitle();
42094042
@@ -4216,15 +4049,11 @@ void Application::domainChanged(QString domain) { · 6 unmodified lines
42164049 _particleServerJurisdictions.clear();
42174050
42184051 // reset our persist thread
4219− qDebug() << "domainChanged()... domain=" << domain << " swapping persist cache\n";
4052+ qDebug() << "Domain changed to" << domainHostname << ". Swapping persist cache.";
42204053 updateLocalOctreeCache();
42214054 }
42224055
4223−void Application::nodeAdded(Node* node) {
4224−
4225−}
4226−
4227−void Application::nodeKilled(Node* node) {
4056+void Application::nodeKilled(SharedNodePointer node) {
42284057 if (node->getType() == NODE_TYPE_VOXEL_SERVER) {
42294058 QUuid nodeUUID = node->getUUID();
42304059 // see if this is the first we've heard of this node...
@@ -4304,7 +4133,7 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 73 unmodified lines
43044133 const HifiSockAddr& senderSockAddr, bool wasStatsPacket) {
43054134
43064135 // Attempt to identify the sender from it's address.
4307− Node* serverNode = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
4136+ SharedNodePointer serverNode = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
43084137 if (serverNode) {
43094138 QUuid nodeUUID = serverNode->getUUID();
43104139
@@ -4321,7 +4150,7 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 10 unmodified lines
43214150 int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLength, const HifiSockAddr& senderSockAddr) {
43224151
43234152 // But, also identify the sender, and keep track of the contained jurisdiction root for this server
4324− Node* server = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
4153+ SharedNodePointer server = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
43254154
43264155 // parse the incoming stats datas stick it in a temporary object for now, while we
43274156 // determine which server it belongs to
@@ -4378,105 +4207,95 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 50 unmodified lines
43784207 }
43794208
43804209 // Receive packets from other nodes/servers and decide what to do with them!
4381−void* Application::networkReceive(void* args) {
4210+void Application::processDatagrams() {
43824211 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
43834212 "Application::networkReceive()");
43844213
43854214 HifiSockAddr senderSockAddr;
43864215 ssize_t bytesReceived;
43874216
4388− Application* app = Application::getInstance();
4389− while (!app->_stopNetworkReceiveThread) {
4390− if (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() &&
4391− (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) app->_incomingPacket,
4392− MAX_PACKET_SIZE,
4393− senderSockAddr.getAddressPointer(),
4394− senderSockAddr.getPortPointer()))) {
4395−
4396− app->_packetCount++;
4397− app->_bytesCount += bytesReceived;
4398−
4399− if (packetVersionMatch(app->_incomingPacket)) {
4400− // only process this packet if we have a match on the packet version
4401− switch (app->_incomingPacket[0]) {
4402− case PACKET_TYPE_TRANSMITTER_DATA_V2:
4403− // V2 = IOS transmitter app
4404− app->_myTransmitter.processIncomingData(app->_incomingPacket, bytesReceived);
4405−
4406− break;
4407− case PACKET_TYPE_MIXED_AUDIO:
4408− QMetaObject::invokeMethod(&app->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
4409− Q_ARG(QByteArray, QByteArray((char*) app->_incomingPacket, bytesReceived)));
4410− break;
4411−
4412− case PACKET_TYPE_PARTICLE_ADD_RESPONSE:
4413− // look up our ParticleEditHanders....
4414− ParticleEditHandle::handleAddResponse(app->_incomingPacket, bytesReceived);
4415− break;
4416−
4417− case PACKET_TYPE_PARTICLE_DATA:
4418− case PACKET_TYPE_VOXEL_DATA:
4419− case PACKET_TYPE_VOXEL_ERASE:
4420− case PACKET_TYPE_OCTREE_STATS:
4421− case PACKET_TYPE_ENVIRONMENT_DATA: {
4422− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4423− "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");
4424−
4425− bool wantExtraDebugging = app->getLogger()->extraDebugging();
4426− if (wantExtraDebugging && app->_incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) {
4427− int numBytesPacketHeader = numBytesForPacketHeader(app->_incomingPacket);
4428− unsigned char* dataAt = app->_incomingPacket + numBytesPacketHeader;
4429− dataAt += sizeof(VOXEL_PACKET_FLAGS);
4430− VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt);
4431− dataAt += sizeof(VOXEL_PACKET_SEQUENCE);
4432− VOXEL_PACKET_SENT_TIME sentAt = (*(VOXEL_PACKET_SENT_TIME*)dataAt);
4433− dataAt += sizeof(VOXEL_PACKET_SENT_TIME);
4434− VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
4435− int flightTime = arrivedAt - sentAt;
4436−
4437− printf("got PACKET_TYPE_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
4438− }
4439−
4440− // add this packet to our list of voxel packets and process them on the voxel processing
4441− app->_voxelProcessor.queueReceivedPacket(senderSockAddr, app->_incomingPacket, bytesReceived);
4442− break;
4217+ while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() &&
4218+ (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) _incomingPacket,
4219+ MAX_PACKET_SIZE,
4220+ senderSockAddr.getAddressPointer(),
4221+ senderSockAddr.getPortPointer()))) {
4222+
4223+ _packetCount++;
4224+ _bytesCount += bytesReceived;
4225+
4226+ if (packetVersionMatch(_incomingPacket)) {
4227+ // only process this packet if we have a match on the packet version
4228+ switch (_incomingPacket[0]) {
4229+ case PACKET_TYPE_TRANSMITTER_DATA_V2:
4230+ // V2 = IOS transmitter app
4231+ _myTransmitter.processIncomingData(_incomingPacket, bytesReceived);
4232+
4233+ break;
4234+ case PACKET_TYPE_MIXED_AUDIO:
4235+ QMetaObject::invokeMethod(&_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
4236+ Q_ARG(QByteArray, QByteArray((char*) _incomingPacket, bytesReceived)));
4237+ break;
4238+
4239+ case PACKET_TYPE_PARTICLE_ADD_RESPONSE:
4240+ // look up our ParticleEditHanders....
4241+ ParticleEditHandle::handleAddResponse(_incomingPacket, bytesReceived);
4242+ break;
4243+
4244+ case PACKET_TYPE_PARTICLE_DATA:
4245+ case PACKET_TYPE_VOXEL_DATA:
4246+ case PACKET_TYPE_VOXEL_ERASE:
4247+ case PACKET_TYPE_OCTREE_STATS:
4248+ case PACKET_TYPE_ENVIRONMENT_DATA: {
4249+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
4250+ "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");
4251+
4252+ bool wantExtraDebugging = getLogger()->extraDebugging();
4253+ if (wantExtraDebugging && _incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) {
4254+ int numBytesPacketHeader = numBytesForPacketHeader(_incomingPacket);
4255+ unsigned char* dataAt = _incomingPacket + numBytesPacketHeader;
4256+ dataAt += sizeof(VOXEL_PACKET_FLAGS);
4257+ VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt);
4258+ dataAt += sizeof(VOXEL_PACKET_SEQUENCE);
4259+ VOXEL_PACKET_SENT_TIME sentAt = (*(VOXEL_PACKET_SENT_TIME*)dataAt);
4260+ dataAt += sizeof(VOXEL_PACKET_SENT_TIME);
4261+ VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
4262+ int flightTime = arrivedAt - sentAt;
4263+
4264+ printf("got PACKET_TYPE_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
44434265 }
4444− case PACKET_TYPE_METAVOXEL_DATA:
4445− app->_metavoxels.processData(QByteArray((const char*)app->_incomingPacket, bytesReceived),
4446− senderSockAddr);
4447− break;
4448− case PACKET_TYPE_BULK_AVATAR_DATA:
4449− NodeList::getInstance()->processBulkNodeData(senderSockAddr,
4450− app->_incomingPacket,
4451− bytesReceived);
4452− getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
4453− break;
4454− case PACKET_TYPE_AVATAR_URLS:
4455− processAvatarURLsMessage(app->_incomingPacket, bytesReceived);
4456− break;
4457− case PACKET_TYPE_AVATAR_FACE_VIDEO:
4458− processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived);
4459− break;
4460− case PACKET_TYPE_DATA_SERVER_GET:
4461− case PACKET_TYPE_DATA_SERVER_PUT:
4462− case PACKET_TYPE_DATA_SERVER_SEND:
4463− case PACKET_TYPE_DATA_SERVER_CONFIRM:
4464− DataServerClient::processMessageFromDataServer(app->_incomingPacket, bytesReceived);
4465− break;
4466− default:
4467− NodeList::getInstance()->processNodeData(senderSockAddr, app->_incomingPacket, bytesReceived);
4468− break;
4266+
4267+ // add this packet to our list of voxel packets and process them on the voxel processing
4268+ _voxelProcessor.queueReceivedPacket(senderSockAddr, _incomingPacket, bytesReceived);
4269+ break;
44694270 }
4271+ case PACKET_TYPE_METAVOXEL_DATA:
4272+ _metavoxels.processData(QByteArray((const char*) _incomingPacket, bytesReceived),
4273+ senderSockAddr);
4274+ break;
4275+ case PACKET_TYPE_BULK_AVATAR_DATA:
4276+ NodeList::getInstance()->processBulkNodeData(senderSockAddr,
4277+ _incomingPacket,
4278+ bytesReceived);
4279+ getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
4280+ break;
4281+ case PACKET_TYPE_AVATAR_URLS:
4282+ processAvatarURLsMessage(_incomingPacket, bytesReceived);
4283+ break;
4284+ case PACKET_TYPE_AVATAR_FACE_VIDEO:
4285+ processAvatarFaceVideoMessage(_incomingPacket, bytesReceived);
4286+ break;
4287+ case PACKET_TYPE_DATA_SERVER_GET:
4288+ case PACKET_TYPE_DATA_SERVER_PUT:
4289+ case PACKET_TYPE_DATA_SERVER_SEND:
4290+ case PACKET_TYPE_DATA_SERVER_CONFIRM:
4291+ DataServerClient::processMessageFromDataServer(_incomingPacket, bytesReceived);
4292+ break;
4293+ default:
4294+ NodeList::getInstance()->processNodeData(senderSockAddr, _incomingPacket, bytesReceived);
4295+ break;
44704296 }
4471− } else if (!app->_enableNetworkThread) {
4472− break;
44734297 }
44744298 }
4475−
4476− if (app->_enableNetworkThread) {
4477− pthread_exit(0);
4478− }
4479− return NULL;
44804299 }
44814300
44824301 void Application::packetSentNotification(ssize_t length) {
@@ -4493,14 +4312,12 @@ void Application::loadScript() { · 10 unmodified lines
44934312 QByteArray fileNameAscii = fileNameString.toLocal8Bit();
44944313 const char* fileName = fileNameAscii.data();
44954314
4496− printf("fileName:%s\n",fileName);
4497−
44984315 std::ifstream file(fileName, std::ios::in|std::ios::binary|std::ios::ate);
44994316 if(!file.is_open()) {
4500− printf("error loading file\n");
4317+ qDebug("Error loading file %s", fileName);
45014318 return;
45024319 }
4503− qDebug("loading file %s...\n", fileName);
4320+ qDebug("Loading file %s...", fileName);
45044321
45054322 // get file length....
45064323 unsigned long fileLength = file.tellg();
@@ -4591,7 +4408,7 @@ void Application::updateLocalOctreeCache(bool firstTime) { · 84 unmodified lines
45914408 _persistThread = new OctreePersistThread(_voxels.getTree(),
45924409 localVoxelCacheFileName.toLocal8Bit().constData(),LOCAL_CACHE_PERSIST_INTERVAL);
45934410
4594− qDebug() << "updateLocalOctreeCache()... localVoxelCacheFileName=" << localVoxelCacheFileName << "\n";
4411+ qDebug() << "updateLocalOctreeCache()... localVoxelCacheFileName=" << localVoxelCacheFileName;
45954412
45964413 if (_persistThread) {
45974414 _voxels.beginLoadingLocalVoxelCache(); // while local voxels are importing, don't do individual node VBO updates
@@ -4667,4 +4484,4 @@ void Application::skipVersion() { · 69 unmodified lines
46674484 skipFile->seek(0);
46684485 skipFile->write(_latestVersion->toStdString().c_str());
46694486 skipFile->close();
4670−}
4487+}

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