Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 16:30:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add actionData to properties that EntityItem transmits and receives

Browse source
This commit is contained in:
Seth Alves 2015-06-19 09:36:06 -07:00
parent fce551099f
commit fca06d9d3d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
requestedProperties += PROP_SIMULATOR_ID; requestedProperties += PROP_SIMULATOR_ID;
requestedProperties += PROP_HREF; requestedProperties += PROP_HREF;
requestedProperties += PROP_DESCRIPTION; requestedProperties += PROP_DESCRIPTION;
requestedProperties += PROP_ACTION_DATA;
return requestedProperties; return requestedProperties;
} }
@ -922,6 +923,7 @@ EntityItemProperties EntityItem::getProperties() const {
COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName); COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref); COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(description, getDescription); COPY_ENTITY_PROPERTY_TO_PROPERTIES(description, getDescription);
COPY_ENTITY_PROPERTY_TO_PROPERTIES(actionData, getActionData);
properties._defaultSettings = false; properties._defaultSettings = false;
@ -982,6 +984,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
SET_ENTITY_PROPERTY_FROM_PROPERTIES(name, setName); SET_ENTITY_PROPERTY_FROM_PROPERTIES(name, setName);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(href, setHref); SET_ENTITY_PROPERTY_FROM_PROPERTIES(href, setHref);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(description, setDescription); SET_ENTITY_PROPERTY_FROM_PROPERTIES(description, setDescription);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(actionData, setActionData);
if (somethingChanged) { if (somethingChanged) {
uint64_t now = usecTimestampNow(); uint64_t now = usecTimestampNow();
@ -1398,10 +1401,15 @@ void EntityItem::clearActions(EntitySimulation* simulation) {
} }
void EntityItem::setActionData(QByteArray actionData) { void EntityItem::setActionData(QByteArray actionData) {
if (actionData.size() == 0) {
return;
}
QVector<QByteArray> serializedActions; QVector<QByteArray> serializedActions;
QDataStream ds(actionData); QDataStream ds(actionData);
ds >> serializedActions; ds >> serializedActions;
qDebug() << "EntityItem::setActionData" << actionData.size() << "bytes";
foreach(QByteArray serializedAction, serializedActions) { foreach(QByteArray serializedAction, serializedActions) {
QDataStream dsForAction(serializedAction); QDataStream dsForAction(serializedAction);
EntityActionType actionType; EntityActionType actionType;
@ -1438,6 +1446,7 @@ const QByteArray EntityItem::getActionData() const {
EntityActionPointer action = _objectActions[id]; EntityActionPointer action = _objectActions[id];
QByteArray bytesForAction = action->serialize(); QByteArray bytesForAction = action->serialize();
serializedActions << bytesForAction; serializedActions << bytesForAction;
i++;
} }
QByteArray result; QByteArray result;