Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-28 02:38:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed debug stuff i missed

Browse source
This commit is contained in:
wangyix 2014-05-29 11:27:14 -07:00
parent c87c474877
commit fe1a0e4565
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,6 @@ OctreeQueryNode::OctreeQueryNode() :
_lastClientOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE), _lastClientOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE),
_lodChanged(false), _lodChanged(false),
_lodInitialized(false), _lodInitialized(false),
//_sequenceNumber(0),
_lastRootTimestamp(0), _lastRootTimestamp(0),
_myPacketType(PacketTypeUnknown), _myPacketType(PacketTypeUnknown),
_isShuttingDown(false) _isShuttingDown(false)
@ -362,8 +361,3 @@ void OctreeQueryNode::dumpOutOfView() {
} }
} }
} }
/*
void OctreeQueryNode::incrementSequenceNumber() {
_sequenceNumber++;
}
*/

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

@ -99,8 +99,6 @@ public:
void nodeKilled(); void nodeKilled();
void forceNodeShutdown(); void forceNodeShutdown();
bool isShuttingDown() const { return _isShuttingDown; } bool isShuttingDown() const { return _isShuttingDown; }
//void incrementSequenceNumber();
private slots: private slots:
void sendThreadFinished(); void sendThreadFinished();
@ -138,8 +136,6 @@ private:
bool _lodChanged; bool _lodChanged;
bool _lodInitialized; bool _lodInitialized;
//OCTREE_PACKET_SEQUENCE _sequenceNumber;
quint64 _lastRootTimestamp; quint64 _lastRootTimestamp;
PacketType _myPacketType; PacketType _myPacketType;

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

@ -143,8 +143,6 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
} }
const unsigned char* messageData = nodeData->getPacket(); const unsigned char* messageData = nodeData->getPacket();
//unsigned char messageData[MAX_PACKET_SIZE];
//memcpy(messageData, nodeData->getPacket(), MAX_PACKET_SIZE); // DEBUG: make copy of message to send
int numBytesPacketHeader = numBytesForPacketHeader(reinterpret_cast<const char*>(messageData)); int numBytesPacketHeader = numBytesForPacketHeader(reinterpret_cast<const char*>(messageData));
const unsigned char* dataAt = messageData + numBytesPacketHeader; const unsigned char* dataAt = messageData + numBytesPacketHeader;
@ -164,7 +162,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
int piggyBackSize = nodeData->getPacketLength() + statsMessageLength; int piggyBackSize = nodeData->getPacketLength() + statsMessageLength;
// If the size of the stats message and the voxel message will fit in a packet, then piggyback them // If the size of the stats message and the voxel message will fit in a packet, then piggyback them
if (piggyBackSize < MAX_PACKET_SIZE && false) { if (piggyBackSize < MAX_PACKET_SIZE) {
// copy voxel message to back of stats message // copy voxel message to back of stats message
memcpy(statsMessage + statsMessageLength, nodeData->getPacket(), nodeData->getPacketLength()); memcpy(statsMessage + statsMessageLength, nodeData->getPacket(), nodeData->getPacketLength());
@ -252,6 +250,7 @@ if (piggyBackSize < MAX_PACKET_SIZE && false) {
_sequenceNumber++; _sequenceNumber++;
nodeData->resetOctreePacket(_sequenceNumber); nodeData->resetOctreePacket(_sequenceNumber);
} }
return packetsSent; return packetsSent;
} }

2
assignment-client/src/voxels/VoxelServer.cpp
View file

@ -48,7 +48,6 @@ int VoxelServer::sendSpecialPacket(OCTREE_PACKET_SEQUENCE& sequenceNumber, const
copyAt += numBytesPacketHeader; copyAt += numBytesPacketHeader;
int envPacketLength = numBytesPacketHeader; int envPacketLength = numBytesPacketHeader;
// pack in flags // pack in flags
OCTREE_PACKET_FLAGS flags = 0; OCTREE_PACKET_FLAGS flags = 0;
OCTREE_PACKET_FLAGS* flagsAt = (OCTREE_PACKET_FLAGS*)copyAt; OCTREE_PACKET_FLAGS* flagsAt = (OCTREE_PACKET_FLAGS*)copyAt;
@ -69,7 +68,6 @@ int VoxelServer::sendSpecialPacket(OCTREE_PACKET_SEQUENCE& sequenceNumber, const
copyAt += sizeof(OCTREE_PACKET_SENT_TIME); copyAt += sizeof(OCTREE_PACKET_SENT_TIME);
envPacketLength += sizeof(OCTREE_PACKET_SENT_TIME); envPacketLength += sizeof(OCTREE_PACKET_SENT_TIME);
int environmentsToSend = getSendMinimalEnvironment() ? 1 : getEnvironmentDataCount(); int environmentsToSend = getSendMinimalEnvironment() ? 1 : getEnvironmentDataCount();
for (int i = 0; i < environmentsToSend; i++) { for (int i = 0; i < environmentsToSend; i++) {

6
libraries/octree/src/OctreeSceneStats.cpp
View file

@ -857,7 +857,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
//bool packetIsColored = oneAtBit(flags, PACKET_IS_COLOR_BIT); //bool packetIsColored = oneAtBit(flags, PACKET_IS_COLOR_BIT);
//bool packetIsCompressed = oneAtBit(flags, PACKET_IS_COMPRESSED_BIT); //bool packetIsCompressed = oneAtBit(flags, PACKET_IS_COMPRESSED_BIT);
OCTREE_PACKET_SENT_TIME arrivedAt = usecTimestampNow(); // DEBUG!!! OCTREE_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
qint64 flightTime = arrivedAt - sentAt + nodeClockSkewUsec; qint64 flightTime = arrivedAt - sentAt + nodeClockSkewUsec;
if (wantExtraDebugging) { if (wantExtraDebugging) {
@ -872,7 +872,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
const int MIN_RESONABLE_FLIGHT_TIME = 0; const int MIN_RESONABLE_FLIGHT_TIME = 0;
if (flightTime > MAX_RESONABLE_FLIGHT_TIME || flightTime < MIN_RESONABLE_FLIGHT_TIME) { if (flightTime > MAX_RESONABLE_FLIGHT_TIME || flightTime < MIN_RESONABLE_FLIGHT_TIME) {
qDebug() << "ignoring unreasonable packet... flightTime:" << flightTime; qDebug() << "ignoring unreasonable packet... flightTime:" << flightTime;
return; return; // ignore any packets that are unreasonable
} }
// determine our expected sequence number... handle rollover appropriately // determine our expected sequence number... handle rollover appropriately
@ -985,6 +985,6 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
} }
} }
} }
return;
} }