Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -3339,12 +3339,6 @@ void* Application::networkReceive(void* args) { · 3338 unmodified lines | |||
| 3339 | if (packetVersionMatch(app->_incomingPacket)) { | 3339 | if (packetVersionMatch(app->_incomingPacket)) { |
| 3340 | // only process this packet if we have a match on the packet version | 3340 | // only process this packet if we have a match on the packet version |
| 3341 | switch (app->_incomingPacket[0]) { | 3341 | switch (app->_incomingPacket[0]) { |
| 3342 | case PACKET_TYPE_VOXEL_STATS:{ | ||
| 3343 | VoxelSceneStats stats; | ||
| 3344 | int statsMessageLength = stats.unpackFromMessage(app->_incomingPacket, bytesReceived); | ||
| 3345 | stats.printDebugDetails(); | ||
| 3346 | break; | ||
| 3347 | } | ||
| 3348 | case PACKET_TYPE_TRANSMITTER_DATA_V2: | 3342 | case PACKET_TYPE_TRANSMITTER_DATA_V2: |
| 3349 | // V2 = IOS transmitter app | 3343 | // V2 = IOS transmitter app |
| 3350 | app->_myTransmitter.processIncomingData(app->_incomingPacket, bytesReceived); | 3344 | app->_myTransmitter.processIncomingData(app->_incomingPacket, bytesReceived); |
| @@ -3357,16 +3351,39 @@ void* Application::networkReceive(void* args) { · 6 unmodified lines | |||
| 3357 | case PACKET_TYPE_VOXEL_DATA_MONOCHROME: | 3351 | case PACKET_TYPE_VOXEL_DATA_MONOCHROME: |
| 3358 | case PACKET_TYPE_Z_COMMAND: | 3352 | case PACKET_TYPE_Z_COMMAND: |
| 3359 | case PACKET_TYPE_ERASE_VOXEL: | 3353 | case PACKET_TYPE_ERASE_VOXEL: |
| 3354 | case PACKET_TYPE_VOXEL_STATS: | ||
| 3360 | case PACKET_TYPE_ENVIRONMENT_DATA: { | 3355 | case PACKET_TYPE_ENVIRONMENT_DATA: { |
| 3356 | |||
| 3357 | unsigned char* messageData = app->_incomingPacket; | ||
| 3358 | ssize_t messageLength = bytesReceived; | ||
| 3359 | |||
| 3360 | // note: PACKET_TYPE_VOXEL_STATS can have PACKET_TYPE_VOXEL_DATA or PACKET_TYPE_VOXEL_DATA_MONOCHROME | ||
| 3361 | // immediately following them inside the same packet. So, we process the PACKET_TYPE_VOXEL_STATS first | ||
| 3362 | // then process any remaining bytes as if it was another packet | ||
| 3363 | if (messageData[0] == PACKET_TYPE_VOXEL_STATS) { | ||
| 3364 | VoxelSceneStats stats; | ||
| 3365 | int statsMessageLength = stats.unpackFromMessage(messageData, messageLength); | ||
| 3366 | stats.printDebugDetails(); | ||
| 3367 | if (messageLength > statsMessageLength) { | ||
| 3368 | messageData += statsMessageLength; | ||
| 3369 | messageLength -= statsMessageLength; | ||
| 3370 | if (!packetVersionMatch(messageData)) { | ||
| 3371 | break; // bail since piggyback data doesn't match our versioning | ||
| 3372 | } | ||
| 3373 | } else { | ||
| 3374 | break; // bail since no piggyback data | ||
| 3375 | } | ||
| 3376 | } // fall through to piggyback message | ||
| 3377 | |||
| 3361 | if (app->_renderVoxels->isChecked()) { | 3378 | if (app->_renderVoxels->isChecked()) { |
| 3362 | Node* voxelServer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_VOXEL_SERVER); | 3379 | Node* voxelServer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_VOXEL_SERVER); |
| 3363 | if (voxelServer) { | 3380 | if (voxelServer) { |
| 3364 | voxelServer->lock(); | 3381 | voxelServer->lock(); |
| 3365 | 3382 | ||
| 3366 | if (app->_incomingPacket[0] == PACKET_TYPE_ENVIRONMENT_DATA) { | 3383 | if (messageData[0] == PACKET_TYPE_ENVIRONMENT_DATA) { |
| 3367 | app->_environment.parseData(&senderAddress, app->_incomingPacket, bytesReceived); | 3384 | app->_environment.parseData(&senderAddress, messageData, messageLength); |
| 3368 | } else { | 3385 | } else { |
| 3369 | app->_voxels.parseData(app->_incomingPacket, bytesReceived); | 3386 | app->_voxels.parseData(messageData, messageLength); |
| 3370 | } | 3387 | } |
| 3371 | 3388 | ||
| 3372 | voxelServer->unlock(); | 3389 | voxelServer->unlock(); |