Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update voxel-server to use new AgentList iterator

Browse source
This commit is contained in:
Stephen Birarda 2013-04-25 15:26:21 -07:00
parent 88eca95020
commit 89da132bf2
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
voxel-server/src/main.cpp
View file

@ -122,12 +122,12 @@ void eraseVoxelTreeAndCleanupAgentVisitData() {
::randomTree.eraseAllVoxels(); ::randomTree.eraseAllVoxels();
// enumerate the agents clean up their marker nodes // enumerate the agents clean up their marker nodes
for (int i = 0; i < AgentList::getInstance()->getAgents().size(); i++) {
for (AgentList::iterator agent = AgentList::getInstance()->begin(); agent != AgentList::getInstance()->end(); agent++) {
//printf("eraseVoxelTreeAndCleanupAgentVisitData() agent[%d]\n",i); //printf("eraseVoxelTreeAndCleanupAgentVisitData() agent[%d]\n",i);
Agent *thisAgent = (Agent *)&AgentList::getInstance()->getAgents()[i]; VoxelAgentData *agentData = (VoxelAgentData *)(*agent).getLinkedData();
VoxelAgentData *agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
// clean up the agent visit data // clean up the agent visit data
delete agentData->rootMarkerNode; delete agentData->rootMarkerNode;
@ -154,10 +154,8 @@ void *distributeVoxelsToListeners(void *args) {
gettimeofday(&lastSendTime, NULL); gettimeofday(&lastSendTime, NULL);
// enumerate the agents to send 3 packets to each // enumerate the agents to send 3 packets to each
for (int i = 0; i < agentList->getAgents().size(); i++) { for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
VoxelAgentData *agentData = (VoxelAgentData *)(*agent).getLinkedData();
Agent *thisAgent = (Agent *)&agentList->getAgents()[i];
VoxelAgentData *agentData = (VoxelAgentData *)(thisAgent->getLinkedData());
ViewFrustum viewFrustum; ViewFrustum viewFrustum;
// get position and orientation details from the camera // get position and orientation details from the camera
@ -193,7 +191,7 @@ void *distributeVoxelsToListeners(void *args) {
::viewFrustumCulling, ::viewFrustumCulling,
stopOctal); stopOctal);
agentList->getAgentSocket().send(thisAgent->getActiveSocket(), voxelPacket, voxelPacketEnd - voxelPacket); agentList->getAgentSocket().send((*agent).getActiveSocket(), voxelPacket, voxelPacketEnd - voxelPacket);
packetCount++; packetCount++;
totalBytesSent += voxelPacketEnd - voxelPacket; totalBytesSent += voxelPacketEnd - voxelPacket;