Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more locking

Browse source
This commit is contained in:
Seth Alves 2015-10-14 13:01:56 -07:00
parent 07a4dc3a7f
commit d72152da87
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,15 +136,14 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
_angularTimeScale = _linearTimeScale; _angularTimeScale = _linearTimeScale;
_hand = hand; _hand = hand;
_holderID = holderID; _holderID = holderID;
_active = true; _active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock(); auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) { if (ownerEntity) {
ownerEntity->setActionDataDirty(true); ownerEntity->setActionDataDirty(true);
} }
}); });
activateBody();
} }
return true; return true;

7
libraries/physics/src/ObjectActionOffset.cpp
View file

@ -126,8 +126,13 @@ bool ObjectActionOffset::updateArguments(QVariantMap arguments) {
_linearDistance = linearDistance; _linearDistance = linearDistance;
_positionalTargetSet = true; _positionalTargetSet = true;
_active = true; _active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
}); });
activateBody();
} }
return true; return true;

3
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -159,14 +159,13 @@ bool ObjectActionSpring::updateArguments(QVariantMap arguments) {
_rotationalTarget = rotationalTarget; _rotationalTarget = rotationalTarget;
_angularTimeScale = glm::max(MIN_TIMESCALE, glm::abs(angularTimeScale)); _angularTimeScale = glm::max(MIN_TIMESCALE, glm::abs(angularTimeScale));
_active = true; _active = true;
activateBody();
auto ownerEntity = _ownerEntity.lock(); auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) { if (ownerEntity) {
ownerEntity->setActionDataDirty(true); ownerEntity->setActionDataDirty(true);
} }
}); });
activateBody();
} }
return true; return true;