History

first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles

ZappoMan committed 12 years ago

Commit 2ca628f1 parent 4df2f2117 files · +333 −9Browse files

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

Unified · Split

interface/src/Application.cpp+9−0
@@ -3004,6 +3004,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 3003 unmodified lines
30043004 _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures));
30053005 }
30063006 }
3007+
3008+ // render particles...
3009+ _particles.render();
30073010
30083011 // restore default, white specular
30093012 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
@@ -4217,6 +4220,12 @@ void* Application::networkReceive(void* args) { · 1207 unmodified lines
42174220 QMetaObject::invokeMethod(&app->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
42184221 Q_ARG(QByteArray, QByteArray((char*) app->_incomingPacket, bytesReceived)));
42194222 break;
4223+
4224+ case PACKET_TYPE_PARTICLE_DATA: {
4225+ app->_particles.processDatagram(QByteArray((char*) app->_incomingPacket, bytesReceived),
4226+ senderSockAddr);
4227+ break;
4228+ }
42204229 case PACKET_TYPE_VOXEL_DATA:
42214230 case PACKET_TYPE_VOXEL_ERASE:
42224231 case PACKET_TYPE_OCTREE_STATS:

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