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

removed old code that was commented out

Browse source 
changed tabs to spaces
This commit is contained in:
wangyix 2014-05-23 11:17:59 -07:00
parent 87d927d447
commit fe5fabdd61
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -197,18 +197,12 @@ void OctreeQueryNode::resetOctreePacket() {
*flagsAt = flags; *flagsAt = flags;
_octreePacketAt += sizeof(OCTREE_PACKET_FLAGS); _octreePacketAt += sizeof(OCTREE_PACKET_FLAGS);
_octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_FLAGS); _octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_FLAGS);
// pack in sequence number // pack in sequence number
OCTREE_PACKET_SEQUENCE* sequenceAt = (OCTREE_PACKET_SEQUENCE*)_octreePacketAt; OCTREE_PACKET_SEQUENCE* sequenceAt = (OCTREE_PACKET_SEQUENCE*)_octreePacketAt;
*sequenceAt = _sequenceNumber; *sequenceAt = _sequenceNumber;
_octreePacketAt += sizeof(OCTREE_PACKET_SEQUENCE); _octreePacketAt += sizeof(OCTREE_PACKET_SEQUENCE);
_octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_SEQUENCE); _octreePacketAvailableBytes -= sizeof(OCTREE_PACKET_SEQUENCE);
/*
if (!(lastWasSurpressed || _lastOctreePacketLength == (numBytesPacketHeader + OCTREE_PACKET_EXTRA_HEADERS_SIZE))) {
_sequenceNumber++;
}*/
// pack in timestamp // pack in timestamp
OCTREE_PACKET_SENT_TIME now = usecTimestampNow(); OCTREE_PACKET_SENT_TIME now = usecTimestampNow();
@ -370,5 +364,5 @@ void OctreeQueryNode::dumpOutOfView() {
} }
void OctreeQueryNode::incrementSequenceNumber() { void OctreeQueryNode::incrementSequenceNumber() {
_sequenceNumber++; _sequenceNumber++;
} }

4
assignment-client/src/octree/OctreeQueryNode.h
View file

@ -39,7 +39,7 @@ public:
void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet
const unsigned char* getPacket() const { return _octreePacket; } const unsigned char* getPacket() const { return _octreePacket; }
unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); } unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); }
bool isPacketWaiting() const { return _octreePacketWaiting; } bool isPacketWaiting() const { return _octreePacketWaiting; }
@ -100,7 +100,7 @@ public:
void forceNodeShutdown(); void forceNodeShutdown();
bool isShuttingDown() const { return _isShuttingDown; } bool isShuttingDown() const { return _isShuttingDown; }
void incrementSequenceNumber(); void incrementSequenceNumber();
private slots: private slots:
void sendThreadFinished(); void sendThreadFinished();

4
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -127,7 +127,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
return 0; return 0;
} }
bool debug = _myServer->wantsDebugSending(); bool debug = _myServer->wantsDebugSending();
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
bool packetSent = false; // did we send a packet? bool packetSent = false; // did we send a packet?
@ -242,7 +242,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
trueBytesSent += nodeData->getPacketLength(); trueBytesSent += nodeData->getPacketLength();
truePacketsSent++; truePacketsSent++;
packetsSent++; packetsSent++;
nodeData->incrementSequenceNumber(); nodeData->incrementSequenceNumber();
nodeData->resetOctreePacket(); nodeData->resetOctreePacket();
} }