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

if an action changes its own arguments, cause reserialisation

Browse source
This commit is contained in:
Seth Alves 2015-07-09 14:32:34 -07:00
parent 85f206d49d
commit a01fb6f1dc
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/AvatarActionHold.cpp
View file

@ -147,6 +147,10 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
_rotationalTargetSet = true; _rotationalTargetSet = true;
_active = true; _active = true;
unlock(); unlock();
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
return true; return true;
} }

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

@ -1714,6 +1714,14 @@ QByteArray EntityItem::serializeActions(bool& success) const {
} }
const QByteArray EntityItem::getActionData() const { const QByteArray EntityItem::getActionData() const {
if (_actionDataDirty) {
bool success;
QByteArray newDataCache = serializeActions(success);
if (success) {
_allActionsDataCache = newDataCache;
}
_actionDataDirty = false;
}
return _allActionsDataCache; return _allActionsDataCache;
} }

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

@ -395,6 +395,7 @@ public:
bool hasActions() { return !_objectActions.empty(); } bool hasActions() { return !_objectActions.empty(); }
QList<QUuid> getActionIDs() { return _objectActions.keys(); } QList<QUuid> getActionIDs() { return _objectActions.keys(); }
QVariantMap getActionArguments(const QUuid& actionID) const; QVariantMap getActionArguments(const QUuid& actionID) const;
void setActionDataDirty(bool value) const { _actionDataDirty = value; }
protected: protected:
@ -482,6 +483,7 @@ protected:
void checkWaitingToRemove(EntitySimulation* simulation = nullptr); void checkWaitingToRemove(EntitySimulation* simulation = nullptr);
mutable QByteArray _waitingActionData; mutable QByteArray _waitingActionData;
mutable QSet<QUuid> _actionsToRemove; mutable QSet<QUuid> _actionsToRemove;
mutable bool _actionDataDirty = false;
}; };
#endif // hifi_EntityItem_h #endif // hifi_EntityItem_h