From ea8dcfa5b51207becb9a655ab487f043f83c2b30 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 16 Apr 2015 15:33:43 -0700 Subject: [PATCH] read UUIDs as UUIDs rather than as strings. more debugging prints --- libraries/entities/src/EntityItem.cpp | 2 +- libraries/entities/src/EntityItemPropertiesMacros.h | 3 ++- libraries/physics/src/EntityMotionState.cpp | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 94d4d7f8a7..5a37baf4a0 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -569,7 +569,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef READ_ENTITY_PROPERTY_STRING(PROP_USER_DATA, setUserData); 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) { diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index 8b9d9847bd..1611a542c9 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -96,7 +96,8 @@ dataAt += sizeof(length); \ bytesRead += sizeof(length); \ QByteArray ba((const char*)dataAt, length); \ - QUuid value = QUUid::fromRfc4122(ba); \ + QUuid value = QUuid::fromRfc4122(ba); \ + qDebug() << "UUID" << value; \ dataAt += length; \ bytesRead += length; \ if (overwriteLocalData) { \ diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 9af97d20ad..c3da5b35d1 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -191,8 +191,11 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) { QUuid myNodeID = nodeList->getSessionUUID(); QUuid simulatorID = _entity->getSimulatorID(); + qDebug() << "XXX" << simulatorID << myNodeID; + if (!simulatorID.isNull() && simulatorID != myNodeID) { // some other Node is simulating this, so don't broadcast our computations. + qDebug() << "NOT SENDING DUE TO NOT OWNER"; return false; }