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

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

View file

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

View file

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

View file

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