Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 14:00:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Punting on the span tracking thing for now.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-05 19:24:16 -08:00
parent e77feb8efd
commit 98a432d3e5
2 changed files with 7 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libraries/metavoxels/src/DatagramSequencer.cpp
View file

@ -309,7 +309,7 @@ void DatagramSequencer::handleHighPriorityMessage(const QVariant& data) {
}
int ReliableChannel::getBytesAvailable() const {
return _buffer.pos() - _sent;
return _buffer.size() - _acknowledged;
}
void ReliableChannel::sendMessage(const QVariant& message) {
@ -328,7 +328,7 @@ ReliableChannel::ReliableChannel(DatagramSequencer* sequencer, int index) :
_bitstream(_dataStream),
_priority(1.0f),
_offset(0),
_sent(0) {
_acknowledged(0) {
_buffer.open(QIODevice::WriteOnly);
_dataStream.setByteOrder(QDataStream::LittleEndian);
@ -337,40 +337,8 @@ ReliableChannel::ReliableChannel(DatagramSequencer* sequencer, int index) :
}
void ReliableChannel::writeData(QDataStream& out, int bytes, QVector<DatagramSequencer::ChannelSpan>& spans) {
// determine how many spans we can send
int remainingBytes = bytes;
int position = 0;
int spanCount = 0;
foreach (const RemainingSpan& remainingSpan, _remainingSpans) {
if (remainingBytes == 0) {
break;
}
int spanBytes = qMin(remainingSpan.unacknowledged, remainingBytes);
remainingBytes -= spanBytes;
spanCount++;
position += remainingSpan.unacknowledged + remainingSpan.acknowledged;
}
if (remainingBytes > 0 && position < _buffer.pos()) {
spanCount++;
}
out << (quint32)spanCount;
remainingBytes = bytes;
position = 0;
foreach (const RemainingSpan& remainingSpan, _remainingSpans) {
if (remainingBytes == 0) {
break;
}
int spanBytes = qMin(remainingSpan.unacknowledged, remainingBytes);
writeSpan(out, position, spanBytes, spans);
remainingBytes -= spanBytes;
position += remainingSpan.unacknowledged + remainingSpan.acknowledged;
}
if (remainingBytes > 0 && position < _buffer.pos()) {
int spanBytes = qMin((int)_buffer.pos() - position, remainingBytes);
writeSpan(out, position, spanBytes, spans);
}
// nothing for now
out << (quint32)0;
}
void ReliableChannel::writeSpan(QDataStream& out, int position, int length, QVector<DatagramSequencer::ChannelSpan>& spans) {
@ -382,12 +350,14 @@ void ReliableChannel::writeSpan(QDataStream& out, int position, int length, QVec
}
void ReliableChannel::spanAcknowledged(const DatagramSequencer::ChannelSpan& span) {
// no-op for now
}
void ReliableChannel::readData(QDataStream& in) {
quint32 segments;
in >> segments;
for (int i = 0; i < segments; i++) {
// ignore for now
quint32 offset, size;
in >> offset >> size;
in.skipRawData(size);

9
libraries/metavoxels/src/DatagramSequencer.h
View file

@ -193,12 +193,6 @@ private:
friend class DatagramSequencer;
class RemainingSpan {
public:
int unacknowledged;
int acknowledged;
};
ReliableChannel(DatagramSequencer* sequencer, int index);
void writeData(QDataStream& out, int bytes, QVector<DatagramSequencer::ChannelSpan>& spans);
@ -215,8 +209,7 @@ private:
float _priority;
int _offset;
int _sent;
QList<RemainingSpan> _remainingSpans;
int _acknowledged;
};
#endif /* defined(__interface__DatagramSequencer__) */