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

Fix for streaming the same object.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-06 11:18:55 -07:00
parent 005a314695
commit 0fc6354b6c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/metavoxels/src/Bitstream.cpp
View file

@ -224,7 +224,8 @@ void Bitstream::persistWriteMappings(const WriteMappings& mappings) {
} }
connect(it.key().data(), SIGNAL(destroyed(QObject*)), SLOT(clearSharedObject(QObject*))); connect(it.key().data(), SIGNAL(destroyed(QObject*)), SLOT(clearSharedObject(QObject*)));
QPointer<SharedObject>& reference = _sharedObjectReferences[it.key()->getOriginID()]; QPointer<SharedObject>& reference = _sharedObjectReferences[it.key()->getOriginID()];
if (reference) { if (reference && reference != it.key()) {
// the object has been replaced by a successor, so we can forget about the original
_sharedObjectStreamer.removePersistentID(reference); _sharedObjectStreamer.removePersistentID(reference);
reference->disconnect(this); reference->disconnect(this);
} }
@ -258,7 +259,8 @@ void Bitstream::persistReadMappings(const ReadMappings& mappings) {
continue; continue;
} }
QPointer<SharedObject>& reference = _sharedObjectReferences[it.value()->getRemoteOriginID()]; QPointer<SharedObject>& reference = _sharedObjectReferences[it.value()->getRemoteOriginID()];
if (reference) { if (reference && reference != it.value()) {
// the object has been replaced by a successor, so we can forget about the original
_sharedObjectStreamer.removePersistentValue(reference.data()); _sharedObjectStreamer.removePersistentValue(reference.data());
} }
reference = it.value(); reference = it.value();

4
tests/metavoxels/src/MetavoxelTests.cpp
View file

@ -183,7 +183,7 @@ bool MetavoxelTests::run() {
bob.setOther(&alice); bob.setOther(&alice);
// perform a large number of simulation iterations // perform a large number of simulation iterations
const int SIMULATION_ITERATIONS = 100000; const int SIMULATION_ITERATIONS = 10000;
for (int i = 0; i < SIMULATION_ITERATIONS; i++) { for (int i = 0; i < SIMULATION_ITERATIONS; i++) {
if (alice.simulate(i) || bob.simulate(i)) { if (alice.simulate(i) || bob.simulate(i)) {
return true; return true;
@ -241,7 +241,7 @@ Endpoint::Endpoint(const QByteArray& datagramHeader) :
_receiveRecords.append(receiveRecord); _receiveRecords.append(receiveRecord);
// create the object that represents out delta-encoded state // create the object that represents out delta-encoded state
//_localState = new TestSharedObjectA(); _localState = new TestSharedObjectA();
connect(_sequencer->getReliableInputChannel(), SIGNAL(receivedMessage(const QVariant&)), connect(_sequencer->getReliableInputChannel(), SIGNAL(receivedMessage(const QVariant&)),
SLOT(handleReliableMessage(const QVariant&))); SLOT(handleReliableMessage(const QVariant&)));