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

Upload fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-10-22 14:30:20 -07:00
parent e69bc22222
commit 345a9f02f7
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/metavoxels/MetavoxelServer.cpp
View file

@ -237,8 +237,7 @@ void MetavoxelSession::update() {
// go back to the beginning with the current packet and note that there's a delta pending // go back to the beginning with the current packet and note that there's a delta pending
_sequencer.getOutputStream().getUnderlying().device()->seek(start); _sequencer.getOutputStream().getUnderlying().device()->seek(start);
MetavoxelDeltaPendingMessage msg = { ++_reliableDeltaID, sendRecord->getPacketNumber(), MetavoxelDeltaPendingMessage msg = { ++_reliableDeltaID, sendRecord->getPacketNumber(), _lodPacketNumber };
_sequencer.getIncomingPacketNumber() };
out << (_reliableDeltaMessage = QVariant::fromValue(msg)); out << (_reliableDeltaMessage = QVariant::fromValue(msg));
_sequencer.endPacket(); _sequencer.endPacket();
@ -265,6 +264,7 @@ void MetavoxelSession::handleMessage(const QVariant& message) {
if (userType == ClientStateMessage::Type) { if (userType == ClientStateMessage::Type) {
ClientStateMessage state = message.value<ClientStateMessage>(); ClientStateMessage state = message.value<ClientStateMessage>();
_lod = state.lod; _lod = state.lod;
_lodPacketNumber = _sequencer.getIncomingPacketNumber();
} else if (userType == MetavoxelEditMessage::Type) { } else if (userType == MetavoxelEditMessage::Type) {
QMetaObject::invokeMethod(_sender->getServer(), "applyEdit", Q_ARG(const MetavoxelEditMessage&, QMetaObject::invokeMethod(_sender->getServer(), "applyEdit", Q_ARG(const MetavoxelEditMessage&,

1
assignment-client/src/metavoxels/MetavoxelServer.h
View file

@ -127,6 +127,7 @@ private:
MetavoxelSender* _sender; MetavoxelSender* _sender;
MetavoxelLOD _lod; MetavoxelLOD _lod;
int _lodPacketNumber;
ReliableChannel* _reliableDeltaChannel; ReliableChannel* _reliableDeltaChannel;
int _reliableDeltaReceivedOffset; int _reliableDeltaReceivedOffset;