From 100439784d7ca08d68f1b88b60bd109c2d52896d Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 6 Nov 2013 17:37:37 -0800 Subject: [PATCH] got rid of redundant getTree() --- libraries/voxel-server-library/src/VoxelSendThread.cpp | 4 ++-- libraries/voxel-server-library/src/VoxelServer.h | 2 -- .../src/VoxelServerPacketProcessor.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/voxel-server-library/src/VoxelSendThread.cpp b/libraries/voxel-server-library/src/VoxelSendThread.cpp index 9e669b4da7..4455f1e379 100644 --- a/libraries/voxel-server-library/src/VoxelSendThread.cpp +++ b/libraries/voxel-server-library/src/VoxelSendThread.cpp @@ -117,7 +117,7 @@ int VoxelSendThread::handlePacketSend(Node* node, VoxelNodeData* nodeData, int& /// Version of voxel distributor that sends the deepest LOD level at once int VoxelSendThread::deepestLevelVoxelDistributor(Node* node, VoxelNodeData* nodeData, bool viewFrustumChanged) { - _myServer->getTree()->lockForRead(); + _myServer->getServerTree().lockForRead(); int truePacketsSent = 0; int trueBytesSent = 0; @@ -360,7 +360,7 @@ int VoxelSendThread::deepestLevelVoxelDistributor(Node* node, VoxelNodeData* nod } // end if bag wasn't empty, and so we sent stuff... - _myServer->getTree()->unlock(); + _myServer->getServerTree().unlock(); return truePacketsSent; } diff --git a/libraries/voxel-server-library/src/VoxelServer.h b/libraries/voxel-server-library/src/VoxelServer.h index ca0b07dd63..f938bebd7e 100644 --- a/libraries/voxel-server-library/src/VoxelServer.h +++ b/libraries/voxel-server-library/src/VoxelServer.h @@ -48,8 +48,6 @@ public: VoxelTree& getServerTree() { return _serverTree; } JurisdictionMap* getJurisdiction() { return _jurisdiction; } - VoxelTree* getTree() { return &_serverTree; } - int getPacketsPerClientPerInterval() const { return _packetsPerClientPerInterval; } bool getSendMinimalEnvironment() const { return _sendMinimalEnvironment; } EnvironmentData* getEnvironmentData(int i) { return &_environmentData[i]; } diff --git a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp index d156228544..5fd2028f50 100644 --- a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp +++ b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp @@ -86,9 +86,9 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned delete[] vertices; } - _myServer->getTree()->lockForWrite(); + _myServer->getServerTree().lockForWrite(); _myServer->getServerTree().readCodeColorBufferToTree(voxelData, destructive); - _myServer->getTree()->unlock(); + _myServer->getServerTree().unlock(); // skip to next voxel edit record in the packet voxelData += voxelDataSize; @@ -114,9 +114,9 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned } else if (packetData[0] == PACKET_TYPE_ERASE_VOXEL) { // Send these bits off to the VoxelTree class to process them - _myServer->getTree()->lockForWrite(); + _myServer->getServerTree().lockForWrite(); _myServer->getServerTree().processRemoveVoxelBitstream((unsigned char*)packetData, packetLength); - _myServer->getTree()->unlock(); + _myServer->getServerTree().unlock(); // Make sure our Node and NodeList knows we've heard from this node. Node* node = NodeList::getInstance()->nodeWithAddress(&senderAddress);