History

Merge branch 'master' of https://github.com/worklist/hifi into dev4

Eric Johnston committed 13 years ago

Commit 4341e852 parents 3ea100e ab249d642 files · +1535 −1537Browse files

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

Unified · Split

interface/src/Application.cpp+78−78
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646 #include <QFileDialog>
4747 #include <QDesktopServices>
4848
49−#include <AgentTypes.h>
49+#include <NodeTypes.h>
5050 #include <AudioInjectionManager.h>
5151 #include <AudioInjector.h>
5252 #include <Logstash.h>
@@ -73,7 +73,7 @@ static char STAR_CACHE_FILE[] = "cachedStars.txt"; · 20 unmodified lines
7373
7474 static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
7575
76−const glm::vec3 START_LOCATION(4.f, 0.f, 5.f); // Where one's own agent begins in the world
76+const glm::vec3 START_LOCATION(4.f, 0.f, 5.f); // Where one's own node begins in the world
7777 // (will be overwritten if avatar data file is found)
7878
7979 const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff
@@ -211,11 +211,11 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 131 unmodified lines
211211 listenPort = atoi(portStr);
212212 }
213213
214− AgentList::createInstance(AGENT_TYPE_AVATAR, listenPort);
214+ NodeList::createInstance(NODE_TYPE_AGENT, listenPort);
215215
216216 _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
217217 if (!_enableNetworkThread) {
218− AgentList::getInstance()->getAgentSocket()->setBlocking(false);
218+ NodeList::getInstance()->getNodeSocket()->setBlocking(false);
219219 }
220220
221221 const char* domainIP = getCmdOption(argc, constArgv, "--domain");
@@ -234,21 +234,21 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 12 unmodified lines
234234 // Voxel File.
235235 _voxelsFilename = getCmdOption(argc, constArgv, "-i");
236236
237− // the callback for our instance of AgentList is attachNewHeadToAgent
238− AgentList::getInstance()->linkedDataCreateCallback = &attachNewHeadToAgent;
237+ // the callback for our instance of NodeList is attachNewHeadToNode
238+ NodeList::getInstance()->linkedDataCreateCallback = &attachNewHeadToNode;
239239
240240 #ifdef _WIN32
241241 WSADATA WsaData;
242242 int wsaresult = WSAStartup(MAKEWORD(2,2), &WsaData);
243243 #endif
244244
245− // tell the AgentList instance who to tell the domain server we care about
246− const char agentTypesOfInterest[] = {AGENT_TYPE_AUDIO_MIXER, AGENT_TYPE_AVATAR_MIXER, AGENT_TYPE_VOXEL_SERVER};
247− AgentList::getInstance()->setAgentTypesOfInterest(agentTypesOfInterest, sizeof(agentTypesOfInterest));
245+ // tell the NodeList instance who to tell the domain server we care about
246+ const char nodeTypesOfInterest[] = {NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER, NODE_TYPE_VOXEL_SERVER};
247+ NodeList::getInstance()->setNodeTypesOfInterest(nodeTypesOfInterest, sizeof(nodeTypesOfInterest));
248248
249− // start the agentList threads
250− AgentList::getInstance()->startSilentAgentRemovalThread();
251− AgentList::getInstance()->startPingUnknownAgentsThread();
249+ // start the nodeList threads
250+ NodeList::getInstance()->startSilentNodeRemovalThread();
251+ NodeList::getInstance()->startPingUnknownNodesThread();
252252
253253 _window->setCentralWidget(_glWidget);
254254
@@ -483,17 +483,17 @@ void Application::resizeGL(int width, int height) { · 228 unmodified lines
483483 glLoadIdentity();
484484 }
485485
486−void Application::broadcastToAgents(unsigned char* data, size_t bytes, const char type) {
486+void Application::broadcastToNodes(unsigned char* data, size_t bytes, const char type) {
487487
488− int n = AgentList::getInstance()->broadcastToAgents(data, bytes, &type, 1);
488+ int n = NodeList::getInstance()->broadcastToNodes(data, bytes, &type, 1);
489489
490490 BandwidthMeter::ChannelIndex channel;
491491 switch (type) {
492− case AGENT_TYPE_AVATAR:
493− case AGENT_TYPE_AVATAR_MIXER:
492+ case NODE_TYPE_AGENT:
493+ case NODE_TYPE_AVATAR_MIXER:
494494 channel = BandwidthMeter::AVATARS;
495495 break;
496− case AGENT_TYPE_VOXEL_SERVER:
496+ case NODE_TYPE_VOXEL_SERVER:
497497 channel = BandwidthMeter::VOXELS;
498498 break;
499499 default:
@@ -506,7 +506,7 @@ void Application::sendVoxelServerAddScene() { · 6 unmodified lines
506506 char message[100];
507507 sprintf(message,"%c%s",'Z',"add scene");
508508 int messageSize = strlen(message) + 1;
509− broadcastToAgents((unsigned char*)message, messageSize, AGENT_TYPE_VOXEL_SERVER);
509+ broadcastToNodes((unsigned char*)message, messageSize, NODE_TYPE_VOXEL_SERVER);
510510 }
511511
512512 void Application::keyPressEvent(QKeyEvent* event) {
@@ -879,13 +879,13 @@ void Application::wheelEvent(QWheelEvent* event) { · 366 unmodified lines
879879
880880 void sendPingPackets() {
881881
882− char agentTypesOfInterest[] = {AGENT_TYPE_VOXEL_SERVER, AGENT_TYPE_AUDIO_MIXER, AGENT_TYPE_AVATAR_MIXER};
882+ char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER};
883883 long long currentTime = usecTimestampNow();
884884 char pingPacket[1 + sizeof(currentTime)];
885885 pingPacket[0] = PACKET_HEADER_PING;
886886
887887 memcpy(&pingPacket[1], &currentTime, sizeof(currentTime));
888− AgentList::getInstance()->broadcastToAgents((unsigned char*)pingPacket, 1 + sizeof(currentTime), agentTypesOfInterest, 3);
888+ NodeList::getInstance()->broadcastToNodes((unsigned char*)pingPacket, 1 + sizeof(currentTime), nodeTypesOfInterest, 3);
889889
890890 }
891891
@@ -911,8 +911,8 @@ void Application::timer() { · 19 unmodified lines
911911 _serialHeadSensor.pair();
912912 }
913913
914− // ask the agent list to check in with the domain server
915− AgentList::getInstance()->sendDomainServerCheckIn();
914+ // ask the node list to check in with the domain server
915+ NodeList::getInstance()->sendDomainServerCheckIn();
916916 }
917917
918918 static glm::vec3 getFaceVector(BoxFace face) {
@@ -981,9 +981,9 @@ void Application::terminate() { · 62 unmodified lines
981981 }
982982
983983 void Application::sendAvatarVoxelURLMessage(const QUrl& url) {
984− uint16_t ownerID = AgentList::getInstance()->getOwnerID();
984+ uint16_t ownerID = NodeList::getInstance()->getOwnerID();
985985
986− if (ownerID == UNKNOWN_AGENT_ID) {
986+ if (ownerID == UNKNOWN_NODE_ID) {
987987 return; // we don't yet know who we are
988988 }
989989 QByteArray message;
@@ -991,7 +991,7 @@ void Application::sendAvatarVoxelURLMessage(const QUrl& url) { · 1 unmodified line
991991 message.append((const char*)&ownerID, sizeof(ownerID));
992992 message.append(url.toEncoded());
993993
994− broadcastToAgents((unsigned char*)message.data(), message.size(), AGENT_TYPE_AVATAR_MIXER);
994+ broadcastToNodes((unsigned char*)message.data(), message.size(), NODE_TYPE_AVATAR_MIXER);
995995 }
996996
997997 void Application::processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes) {
@@ -999,17 +999,17 @@ void Application::processAvatarVoxelURLMessage(unsigned char *packetData, size_t · 1 unmodified line
999999 packetData++;
10001000 dataBytes--;
10011001
1002− // read the agent id
1003− uint16_t agentID = *(uint16_t*)packetData;
1004− packetData += sizeof(agentID);
1005− dataBytes -= sizeof(agentID);
1002+ // read the node id
1003+ uint16_t nodeID = *(uint16_t*)packetData;
1004+ packetData += sizeof(nodeID);
1005+ dataBytes -= sizeof(nodeID);
10061006
1007− // make sure the agent exists
1008− Agent* agent = AgentList::getInstance()->agentWithID(agentID);
1009− if (!agent || !agent->getLinkedData()) {
1007+ // make sure the node exists
1008+ Node* node = NodeList::getInstance()->nodeWithID(nodeID);
1009+ if (!node || !node->getLinkedData()) {
10101010 return;
10111011 }
1012− Avatar* avatar = static_cast<Avatar*>(agent->getLinkedData());
1012+ Avatar* avatar = static_cast<Avatar*>(node->getLinkedData());
10131013 if (!avatar->isInitialized()) {
10141014 return; // wait until initialized
10151015 }
@@ -1224,7 +1224,7 @@ void Application::sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail · 208 unmodified lines
12241224 int sizeOut;
12251225
12261226 if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){
1227− Application::broadcastToAgents(bufferOut, sizeOut, AGENT_TYPE_VOXEL_SERVER);
1227+ Application::broadcastToNodes(bufferOut, sizeOut, NODE_TYPE_VOXEL_SERVER);
12281228 delete[] bufferOut;
12291229 }
12301230 }
@@ -1305,7 +1305,7 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 74 unmodified lines
13051305
13061306 // if we have room don't have room in the buffer, then send the previously generated message first
13071307 if (args->bufferInUse + codeAndColorLength > MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE) {
1308− broadcastToAgents(args->messageBuffer, args->bufferInUse, AGENT_TYPE_VOXEL_SERVER);
1308+ broadcastToNodes(args->messageBuffer, args->bufferInUse, NODE_TYPE_VOXEL_SERVER);
13091309 args->bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // reset
13101310 }
13111311
@@ -1386,7 +1386,7 @@ void Application::importVoxels() { · 74 unmodified lines
13861386
13871387 // If we have voxels left in the packet, then send the packet
13881388 if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
1389− broadcastToAgents(args.messageBuffer, args.bufferInUse, AGENT_TYPE_VOXEL_SERVER);
1389+ broadcastToNodes(args.messageBuffer, args.bufferInUse, NODE_TYPE_VOXEL_SERVER);
13901390 }
13911391
13921392 if (calculatedOctCode) {
@@ -1438,7 +1438,7 @@ void Application::pasteVoxels() { · 45 unmodified lines
14381438
14391439 // If we have voxels left in the packet, then send the packet
14401440 if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
1441− broadcastToAgents(args.messageBuffer, args.bufferInUse, AGENT_TYPE_VOXEL_SERVER);
1441+ broadcastToNodes(args.messageBuffer, args.bufferInUse, NODE_TYPE_VOXEL_SERVER);
14421442 }
14431443
14441444 if (calculatedOctCode) {
@@ -1831,7 +1831,7 @@ void Application::update(float deltaTime) { · 386 unmodified lines
18311831
18321832 // Update transmitter
18331833
1834− // Sample hardware, update view frustum if needed, and send avatar data to mixer/agents
1834+ // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes
18351835 updateAvatar(deltaTime);
18361836
18371837 // read incoming packets from network
@@ -1840,11 +1840,11 @@ void Application::update(float deltaTime) { · 2 unmodified lines
18401840 }
18411841
18421842 //loop through all the other avatars and simulate them...
1843− AgentList* agentList = AgentList::getInstance();
1844− agentList->lock();
1845− for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
1846− if (agent->getLinkedData() != NULL) {
1847− Avatar *avatar = (Avatar *)agent->getLinkedData();
1843+ NodeList* nodeList = NodeList::getInstance();
1844+ nodeList->lock();
1845+ for(NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
1846+ if (node->getLinkedData() != NULL) {
1847+ Avatar *avatar = (Avatar *)node->getLinkedData();
18481848 if (!avatar->isInitialized()) {
18491849 avatar->init();
18501850 }
@@ -1852,7 +1852,7 @@ void Application::update(float deltaTime) { · 1 unmodified line
18521852 avatar->setMouseRay(mouseRayOrigin, mouseRayDirection);
18531853 }
18541854 }
1855− agentList->unlock();
1855+ nodeList->unlock();
18561856
18571857 // Simulate myself
18581858 if (_gravityUse->isChecked()) {
@@ -1974,19 +1974,19 @@ void Application::updateAvatar(float deltaTime) { · 115 unmodified lines
19741974 _myAvatar.setCameraNearClip(_viewFrustum.getNearClip());
19751975 _myAvatar.setCameraFarClip(_viewFrustum.getFarClip());
19761976
1977− AgentList* agentList = AgentList::getInstance();
1978− if (agentList->getOwnerID() != UNKNOWN_AGENT_ID) {
1977+ NodeList* nodeList = NodeList::getInstance();
1978+ if (nodeList->getOwnerID() != UNKNOWN_NODE_ID) {
19791979 // if I know my ID, send head/hand data to the avatar mixer and voxel server
19801980 unsigned char broadcastString[200];
19811981 unsigned char* endOfBroadcastStringWrite = broadcastString;
19821982
19831983 *(endOfBroadcastStringWrite++) = PACKET_HEADER_HEAD_DATA;
1984− endOfBroadcastStringWrite += packAgentId(endOfBroadcastStringWrite, agentList->getOwnerID());
1984+ endOfBroadcastStringWrite += packNodeId(endOfBroadcastStringWrite, nodeList->getOwnerID());
19851985
19861986 endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
19871987
1988− broadcastToAgents(broadcastString, endOfBroadcastStringWrite - broadcastString, AGENT_TYPE_VOXEL_SERVER);
1989− broadcastToAgents(broadcastString, endOfBroadcastStringWrite - broadcastString, AGENT_TYPE_AVATAR_MIXER);
1988+ broadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, NODE_TYPE_VOXEL_SERVER);
1989+ broadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, NODE_TYPE_AVATAR_MIXER);
19901990
19911991 // once in a while, send my voxel url
19921992 const float AVATAR_VOXEL_URL_SEND_INTERVAL = 1.0f; // seconds
@@ -1995,7 +1995,7 @@ void Application::updateAvatar(float deltaTime) { · 2 unmodified lines
19951995 }
19961996 }
19971997
1998− // If I'm in paint mode, send a voxel out to VOXEL server agents.
1998+ // If I'm in paint mode, send a voxel out to VOXEL server nodes.
19991999 if (_paintOn) {
20002000
20012001 glm::vec3 avatarPos = _myAvatar.getPosition();
@@ -2300,12 +2300,12 @@ void Application::displaySide(Camera& whichCamera) { · 298 unmodified lines
23002300 }
23012301
23022302 if (_renderAvatarsOn->isChecked()) {
2303− // Render avatars of other agents
2304− AgentList* agentList = AgentList::getInstance();
2305− agentList->lock();
2306− for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
2307− if (agent->getLinkedData() != NULL && agent->getType() == AGENT_TYPE_AVATAR) {
2308− Avatar *avatar = (Avatar *)agent->getLinkedData();
2303+ // Render avatars of other nodes
2304+ NodeList* nodeList = NodeList::getInstance();
2305+ nodeList->lock();
2306+ for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2307+ if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) {
2308+ Avatar *avatar = (Avatar *)node->getLinkedData();
23092309 if (!avatar->isInitialized()) {
23102310 avatar->init();
23112311 }
@@ -2313,7 +2313,7 @@ void Application::displaySide(Camera& whichCamera) { · 1 unmodified line
23132313 avatar->setDisplayingLookatVectors(_renderLookatOn->isChecked());
23142314 }
23152315 }
2316− agentList->unlock();
2316+ nodeList->unlock();
23172317
23182318 // Render my own Avatar
23192319 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
@@ -2396,17 +2396,17 @@ void Application::displayOverlay() { · 76 unmodified lines
23962396
23972397 // Stats at upper right of screen about who domain server is telling us about
23982398 glPointSize(1.0f);
2399− char agents[100];
2399+ char nodes[100];
24002400
2401− AgentList* agentList = AgentList::getInstance();
2401+ NodeList* nodeList = NodeList::getInstance();
24022402 int totalAvatars = 0, totalServers = 0;
24032403
2404− for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
2405− agent->getType() == AGENT_TYPE_AVATAR ? totalAvatars++ : totalServers++;
2404+ for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
2405+ node->getType() == NODE_TYPE_AGENT ? totalAvatars++ : totalServers++;
24062406 }
24072407
2408− sprintf(agents, "Servers: %d, Avatars: %d\n", totalServers, totalAvatars);
2409− drawtext(_glWidget->width() - 150, 20, 0.10, 0, 1.0, 0, agents, 1, 0, 0);
2408+ sprintf(nodes, "Servers: %d, Avatars: %d\n", totalServers, totalAvatars);
2409+ drawtext(_glWidget->width() - 150, 20, 0.10, 0, 1.0, 0, nodes, 1, 0, 0);
24102410
24112411 if (_paintOn) {
24122412
@@ -2434,14 +2434,14 @@ void Application::displayStats() { · 21 unmodified lines
24342434 if (_testPing->isChecked()) {
24352435 int pingAudio = 0, pingAvatar = 0, pingVoxel = 0;
24362436
2437− AgentList *agentList = AgentList::getInstance();
2438− Agent *audioMixerAgent = agentList->soloAgentOfType(AGENT_TYPE_AUDIO_MIXER);
2439− Agent *avatarMixerAgent = agentList->soloAgentOfType(AGENT_TYPE_AVATAR_MIXER);
2440− Agent *voxelServerAgent = agentList->soloAgentOfType(AGENT_TYPE_VOXEL_SERVER);
2437+ NodeList *nodeList = NodeList::getInstance();
2438+ Node *audioMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER);
2439+ Node *avatarMixerNode = nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
2440+ Node *voxelServerNode = nodeList->soloNodeOfType(NODE_TYPE_VOXEL_SERVER);
24412441
2442− pingAudio = audioMixerAgent ? audioMixerAgent->getPingMs() : 0;
2443− pingAvatar = avatarMixerAgent ? avatarMixerAgent->getPingMs() : 0;
2444− pingVoxel = voxelServerAgent ? voxelServerAgent->getPingMs() : 0;
2442+ pingAudio = audioMixerNode ? audioMixerNode->getPingMs() : 0;
2443+ pingAvatar = avatarMixerNode ? avatarMixerNode->getPingMs() : 0;
2444+ pingVoxel = voxelServerNode ? voxelServerNode->getPingMs() : 0;
24452445
24462446 char pingStats[200];
24472447 sprintf(pingStats, "Ping audio/avatar/voxel: %d / %d / %d ", pingAudio, pingAvatar, pingVoxel);
@@ -2476,7 +2476,7 @@ void Application::displayStats() { · 28 unmodified lines
24762476 voxelStats << "Voxels Bits per Colored: " << voxelsBytesPerColored * 8;
24772477 drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
24782478
2479− Agent *avatarMixer = AgentList::getInstance()->soloAgentOfType(AGENT_TYPE_AVATAR_MIXER);
2479+ Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
24802480 char avatarMixerStats[200];
24812481
24822482 if (avatarMixer) {
@@ -2847,13 +2847,13 @@ QAction* Application::checkedVoxelModeAction() const { · 364 unmodified lines
28472847 return 0;
28482848 }
28492849
2850−void Application::attachNewHeadToAgent(Agent* newAgent) {
2851− if (newAgent->getLinkedData() == NULL) {
2852− newAgent->setLinkedData(new Avatar(newAgent));
2850+void Application::attachNewHeadToNode(Node* newNode) {
2851+ if (newNode->getLinkedData() == NULL) {
2852+ newNode->setLinkedData(new Avatar(newNode));
28532853 }
28542854 }
28552855
2856−// Receive packets from other agents/servers and decide what to do with them!
2856+// Receive packets from other nodes/servers and decide what to do with them!
28572857 void* Application::networkReceive(void* args) {
28582858 sockaddr senderAddress;
28592859 ssize_t bytesReceived;
@@ -2866,7 +2866,7 @@ void* Application::networkReceive(void* args) { · 6 unmodified lines
28662866 app->_wantToKillLocalVoxels = false;
28672867 }
28682868
2869− if (AgentList::getInstance()->getAgentSocket()->receive(&senderAddress, app->_incomingPacket, &bytesReceived)) {
2869+ if (NodeList::getInstance()->getNodeSocket()->receive(&senderAddress, app->_incomingPacket, &bytesReceived)) {
28702870 app->_packetCount++;
28712871 app->_bytesCount += bytesReceived;
28722872
@@ -2889,7 +2889,7 @@ void* Application::networkReceive(void* args) { · 16 unmodified lines
28892889 app->_environment.parseData(&senderAddress, app->_incomingPacket, bytesReceived);
28902890 break;
28912891 case PACKET_HEADER_BULK_AVATAR_DATA:
2892− AgentList::getInstance()->processBulkAgentData(&senderAddress,
2892+ NodeList::getInstance()->processBulkNodeData(&senderAddress,
28932893 app->_incomingPacket,
28942894 bytesReceived);
28952895 getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
@@ -2898,7 +2898,7 @@ void* Application::networkReceive(void* args) { · 2 unmodified lines
28982898 processAvatarVoxelURLMessage(app->_incomingPacket, bytesReceived);
28992899 break;
29002900 default:
2901− AgentList::getInstance()->processAgentData(&senderAddress, app->_incomingPacket, bytesReceived);
2901+ NodeList::getInstance()->processNodeData(&senderAddress, app->_incomingPacket, bytesReceived);
29022902 break;
29032903 }
29042904 } else if (!app->_enableNetworkThread) {

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