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

read UUIDs as UUIDs rather than as strings. more debugging prints

Browse source
This commit is contained in:
Seth Alves 2015-04-16 15:33:43 -07:00
parent d7881f1891
commit ea8dcfa5b5
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItem.cpp
View file

@ -569,7 +569,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
READ_ENTITY_PROPERTY_STRING(PROP_USER_DATA, setUserData); READ_ENTITY_PROPERTY_STRING(PROP_USER_DATA, setUserData);
if (args.bitstreamVersion >= VERSION_ENTITIES_HAVE_ACCELERATION) { if (args.bitstreamVersion >= VERSION_ENTITIES_HAVE_ACCELERATION) {
READ_ENTITY_PROPERTY_STRING(PROP_SIMULATOR_ID, setSimulatorID); READ_ENTITY_PROPERTY_UUID(PROP_SIMULATOR_ID, setSimulatorID);
} }
if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_MARKETPLACE_ID) { if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_MARKETPLACE_ID) {

3
libraries/entities/src/EntityItemPropertiesMacros.h
View file

@ -96,7 +96,8 @@
dataAt += sizeof(length); \ dataAt += sizeof(length); \
bytesRead += sizeof(length); \ bytesRead += sizeof(length); \
QByteArray ba((const char*)dataAt, length); \ QByteArray ba((const char*)dataAt, length); \
QUuid value = QUUid::fromRfc4122(ba); \ QUuid value = QUuid::fromRfc4122(ba); \
qDebug() << "UUID" << value; \
dataAt += length; \ dataAt += length; \
bytesRead += length; \ bytesRead += length; \
if (overwriteLocalData) { \ if (overwriteLocalData) { \

3
libraries/physics/src/EntityMotionState.cpp
View file

@ -191,8 +191,11 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
QUuid myNodeID = nodeList->getSessionUUID(); QUuid myNodeID = nodeList->getSessionUUID();
QUuid simulatorID = _entity->getSimulatorID(); QUuid simulatorID = _entity->getSimulatorID();
qDebug() << "XXX" << simulatorID << myNodeID;
if (!simulatorID.isNull() && simulatorID != myNodeID) { if (!simulatorID.isNull() && simulatorID != myNodeID) {
// some other Node is simulating this, so don't broadcast our computations. // some other Node is simulating this, so don't broadcast our computations.
qDebug() << "NOT SENDING DUE TO NOT OWNER";
return false; return false;
} }