Showing the changes to interface/src/Application.cpp (1 of 38 files). Show all
Unified · Split
| @@ -208,8 +208,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 207 unmodified lines | |||
| 208 | #endif | 208 | #endif |
| 209 | 209 | ||
| 210 | // tell the NodeList instance who to tell the domain server we care about | 210 | // tell the NodeList instance who to tell the domain server we care about |
| 211 | const char nodeTypesOfInterest[] = {NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER, NODE_TYPE_VOXEL_SERVER, | 211 | const char nodeTypesOfInterest[] = {NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER, NODE_TYPE_VOXEL_SERVER, |
| 212 | NODE_TYPE_PARTICLE_SERVER}; | 212 | NODE_TYPE_PARTICLE_SERVER, NODE_TYPE_METAVOXEL_SERVER}; |
| 213 | nodeList->setNodeTypesOfInterest(nodeTypesOfInterest, sizeof(nodeTypesOfInterest)); | 213 | nodeList->setNodeTypesOfInterest(nodeTypesOfInterest, sizeof(nodeTypesOfInterest)); |
| 214 | 214 | ||
| 215 | QTimer* silentNodeTimer = new QTimer(this); | 215 | QTimer* silentNodeTimer = new QTimer(this); |
| @@ -1281,7 +1281,7 @@ void Application::wheelEvent(QWheelEvent* event) { · 1065 unmodified lines | |||
| 1281 | void Application::sendPingPackets() { | 1281 | void Application::sendPingPackets() { |
| 1282 | 1282 | ||
| 1283 | const char nodesToPing[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_PARTICLE_SERVER, | 1283 | const char nodesToPing[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_PARTICLE_SERVER, |
| 1284 | NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER}; | 1284 | NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER, NODE_TYPE_METAVOXEL_SERVER}; |
| 1285 | 1285 | ||
| 1286 | unsigned char pingPacket[MAX_PACKET_SIZE]; | 1286 | unsigned char pingPacket[MAX_PACKET_SIZE]; |
| 1287 | int length = NodeList::getInstance()->fillPingPacket(pingPacket); | 1287 | int length = NodeList::getInstance()->fillPingPacket(pingPacket); |
| @@ -4411,6 +4411,10 @@ void* Application::networkReceive(void* args) { · 3123 unmodified lines | |||
| 4411 | app->_voxelProcessor.queueReceivedPacket(senderSockAddr, app->_incomingPacket, bytesReceived); | 4411 | app->_voxelProcessor.queueReceivedPacket(senderSockAddr, app->_incomingPacket, bytesReceived); |
| 4412 | break; | 4412 | break; |
| 4413 | } | 4413 | } |
| 4414 | case PACKET_TYPE_METAVOXEL_DATA: | ||
| 4415 | app->_metavoxels.processData(QByteArray((const char*)app->_incomingPacket, bytesReceived), | ||
| 4416 | senderSockAddr); | ||
| 4417 | break; | ||
| 4414 | case PACKET_TYPE_BULK_AVATAR_DATA: | 4418 | case PACKET_TYPE_BULK_AVATAR_DATA: |
| 4415 | NodeList::getInstance()->processBulkNodeData(senderSockAddr, | 4419 | NodeList::getInstance()->processBulkNodeData(senderSockAddr, |
| 4416 | app->_incomingPacket, | 4420 | app->_incomingPacket, |