Showing the changes to interface/src/Application.cpp (1 of 17 files). Show all
Unified · Split
| @@ -3004,6 +3004,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 3003 unmodified lines | |||
| 3004 | _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures)); | 3004 | _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures)); |
| 3005 | } | 3005 | } |
| 3006 | } | 3006 | } |
| 3007 | |||
| 3008 | // render particles... | ||
| 3009 | _particles.render(); | ||
| 3007 | 3010 | ||
| 3008 | // restore default, white specular | 3011 | // restore default, white specular |
| 3009 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); | 3012 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); |
| @@ -4217,6 +4220,12 @@ void* Application::networkReceive(void* args) { · 1207 unmodified lines | |||
| 4217 | QMetaObject::invokeMethod(&app->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection, | 4220 | QMetaObject::invokeMethod(&app->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection, |
| 4218 | Q_ARG(QByteArray, QByteArray((char*) app->_incomingPacket, bytesReceived))); | 4221 | Q_ARG(QByteArray, QByteArray((char*) app->_incomingPacket, bytesReceived))); |
| 4219 | break; | 4222 | break; |
| 4223 | |||
| 4224 | case PACKET_TYPE_PARTICLE_DATA: { | ||
| 4225 | app->_particles.processDatagram(QByteArray((char*) app->_incomingPacket, bytesReceived), | ||
| 4226 | senderSockAddr); | ||
| 4227 | break; | ||
| 4228 | } | ||
| 4220 | case PACKET_TYPE_VOXEL_DATA: | 4229 | case PACKET_TYPE_VOXEL_DATA: |
| 4221 | case PACKET_TYPE_VOXEL_ERASE: | 4230 | case PACKET_TYPE_VOXEL_ERASE: |
| 4222 | case PACKET_TYPE_OCTREE_STATS: | 4231 | case PACKET_TYPE_OCTREE_STATS: |