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

quiet some debugging

Browse source
This commit is contained in:
Seth Alves 2015-10-14 13:12:11 -07:00
parent d72152da87
commit 9937b6a3ef
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,9 +211,11 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
dataStream >> _expires; dataStream >> _expires;
dataStream >> _tag; dataStream >> _tag;
qDebug() << "deserialize hold: " << _holderID #if WANT_DEBUG
qDebug() << "deserialize AvatarActionHold: " << _holderID
<< _relativePosition.x << _relativePosition.y << _relativePosition.z << _relativePosition.x << _relativePosition.y << _relativePosition.z
<< _hand << _expires; << _hand << _expires;
#endif
_active = true; _active = true;
}); });

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

@ -1580,8 +1580,6 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulation* s
EntityActionPointer action = _objectActions[actionID]; EntityActionPointer action = _objectActions[actionID];
qDebug() << "EntityItem::removeActionInternal clearing _ownerEntity";
action->setOwnerEntity(nullptr); action->setOwnerEntity(nullptr);
_objectActions.remove(actionID); _objectActions.remove(actionID);
@ -1604,7 +1602,6 @@ bool EntityItem::clearActions(EntitySimulation* simulation) {
const QUuid id = i.key(); const QUuid id = i.key();
EntityActionPointer action = _objectActions[id]; EntityActionPointer action = _objectActions[id];
i = _objectActions.erase(i); i = _objectActions.erase(i);
qDebug() << "EntityItem::clearActions clearing _ownerEntity";
action->setOwnerEntity(nullptr); action->setOwnerEntity(nullptr);
action->removeFromSimulation(simulation); action->removeFromSimulation(simulation);
} }
@ -1648,8 +1645,6 @@ void EntityItem::deserializeActionsInternal() {
// Keep track of which actions got added or updated by the new actionData // Keep track of which actions got added or updated by the new actionData
QSet<QUuid> updated; QSet<QUuid> updated;
qDebug() << "EntityItem::deserializeActionsInternal" << serializedActions.size();
foreach(QByteArray serializedAction, serializedActions) { foreach(QByteArray serializedAction, serializedActions) {
QDataStream serializedActionStream(serializedAction); QDataStream serializedActionStream(serializedAction);
EntityActionType actionType; EntityActionType actionType;
@ -1663,14 +1658,12 @@ void EntityItem::deserializeActionsInternal() {
updated << actionID; updated << actionID;
if (_objectActions.contains(actionID)) { if (_objectActions.contains(actionID)) {
qDebug() << "EntityItem::deserializeActionsInternal is UPDATING" << actionID;
EntityActionPointer action = _objectActions[actionID]; EntityActionPointer action = _objectActions[actionID];
// TODO: make sure types match? there isn't currently a way to // TODO: make sure types match? there isn't currently a way to
// change the type of an existing action. // change the type of an existing action.
action->deserialize(serializedAction); action->deserialize(serializedAction);
action->locallyAddedButNotYetReceived = false; action->locallyAddedButNotYetReceived = false;
} else { } else {
qDebug() << "EntityItem::deserializeActionsInternal is ADDING" << actionID;
auto actionFactory = DependencyManager::get<EntityActionFactoryInterface>(); auto actionFactory = DependencyManager::get<EntityActionFactoryInterface>();
EntityItemPointer entity = shared_from_this(); EntityItemPointer entity = shared_from_this();
EntityActionPointer action = actionFactory->factoryBA(entity, serializedAction); EntityActionPointer action = actionFactory->factoryBA(entity, serializedAction);
@ -1728,11 +1721,8 @@ void EntityItem::setActionData(QByteArray actionData) {
void EntityItem::setActionDataInternal(QByteArray actionData) { void EntityItem::setActionDataInternal(QByteArray actionData) {
assertWriteLocked(); assertWriteLocked();
if (_allActionsDataCache != actionData) { if (_allActionsDataCache != actionData) {
qDebug() << "EntityItem::setActionDataInternal yes";
_allActionsDataCache = actionData; _allActionsDataCache = actionData;
deserializeActionsInternal(); deserializeActionsInternal();
} else {
qDebug() << "EntityItem::setActionDataInternal no";
} }
checkWaitingToRemove(); checkWaitingToRemove();
} }