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

fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version

Browse source
This commit is contained in:
Seth Alves 2015-04-16 16:10:01 -07:00
parent 3b2a15f76a
commit 1484d6e37f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -798,7 +798,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONS_WILL_MOVE, bool, setCollisionsWillMove); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONS_WILL_MOVE, bool, setCollisionsWillMove);
READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOCKED, bool, setLocked); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOCKED, bool, setLocked);
READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_USER_DATA, setUserData); READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_USER_DATA, setUserData);
READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_SIMULATOR_ID, setSimulatorID); READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES(PROP_SIMULATOR_ID, setSimulatorID);
if (properties.getType() == EntityTypes::Text) { if (properties.getType() == EntityTypes::Text) {
READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_TEXT, setText); READ_ENTITY_PROPERTY_STRING_TO_PROPERTIES(PROP_TEXT, setText);

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

@ -145,14 +145,15 @@
} }
// TODO: make a version of this that does a binary unpacking of the uuid // TODO: this doesn't need a length. See OctreePacketData::appendValue(const QUuid& uuid)
#define READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES(P,O) \ #define READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES(P,O) \
if (propertyFlags.getHasProperty(P)) { \ if (propertyFlags.getHasProperty(P)) { \
uint16_t length; \ uint16_t length; \
memcpy(&length, dataAt, sizeof(length)); \ memcpy(&length, dataAt, sizeof(length)); \
dataAt += sizeof(length); \ dataAt += sizeof(length); \
processedBytes += sizeof(length); \ processedBytes += sizeof(length); \
QUuid value((const char*)dataAt); \ QByteArray ba((const char*)dataAt, length); \
QUuid value = QUuid::fromRfc4122(ba); \
dataAt += length; \ dataAt += length; \
processedBytes += length; \ processedBytes += length; \
properties.O(value); \ properties.O(value); \