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

rather than activating rigid body and forcing non-static on deserialize, just force non-static

Browse source
This commit is contained in:
Seth Alves 2015-11-23 12:17:15 -08:00
parent c3821d7202
commit d4937071e1
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -328,5 +328,5 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
_active = true; _active = true;
}); });
activateBody(); forceBodyNonStatic();
} }

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

@ -244,6 +244,9 @@ void ObjectAction::activateBody() {
if (rigidBody) { if (rigidBody) {
rigidBody->activate(); rigidBody->activate();
} }
}
void ObjectAction::forceBodyNonStatic() {
auto ownerEntity = _ownerEntity.lock(); auto ownerEntity = _ownerEntity.lock();
if (!ownerEntity) { if (!ownerEntity) {
return; return;

1
libraries/physics/src/ObjectAction.h
View file

@ -63,6 +63,7 @@ protected:
virtual glm::vec3 getAngularVelocity(); virtual glm::vec3 getAngularVelocity();
virtual void setAngularVelocity(glm::vec3 angularVelocity); virtual void setAngularVelocity(glm::vec3 angularVelocity);
virtual void activateBody(); virtual void activateBody();
virtual void forceBodyNonStatic();
EntityItemWeakPointer _ownerEntity; EntityItemWeakPointer _ownerEntity;
QString _tag; QString _tag;