GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'fix-root-motion' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-fix-root-motion

Browse Source
This commit is contained in:
Wojtek Figat
2024-02-06 16:10:20 +01:00
parent 5a50ec592f 8922b5cd79
commit 6272caffa5
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Engine/Physics/Actors/RigidBody.cpp
View File

@@ -300,6 +300,44 @@ void RigidBody::ClosestPoint(const Vector3& position, Vector3& result) const
} }
} }
void RigidBody::AddMovement(const Vector3& translation, const Quaternion& rotation)
{
// filter rotation according to constraints
Quaternion allowedRotation;
if (EnumHasAllFlags(GetConstraints(), RigidbodyConstraints::LockRotation))
allowedRotation = Quaternion::Identity;
else
{
Float3 euler = rotation.GetEuler();
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockRotationX))
euler.X = 0;
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockRotationY))
euler.Y = 0;
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockRotationZ))
euler.Z = 0;
allowedRotation = Quaternion::Euler(euler);
}
// filter translation according to the constraints
auto allowedTranslation = translation;
if (EnumHasAllFlags(GetConstraints(), RigidbodyConstraints::LockPosition))
allowedTranslation = Vector3::Zero;
else
{
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockPositionX))
allowedTranslation.X = 0;
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockPositionY))
allowedTranslation.Y = 0;
if (EnumHasAnyFlags(GetConstraints(), RigidbodyConstraints::LockPositionZ))
allowedTranslation.Z = 0;
}
Transform t;
t.Translation = _transform.Translation + allowedTranslation;
t.Orientation = _transform.Orientation * allowedRotation;
t.Scale = _transform.Scale;
SetTransform(t);
}
void RigidBody::OnCollisionEnter(const Collision& c) void RigidBody::OnCollisionEnter(const Collision& c)
{ {
CollisionEnter(c); CollisionEnter(c);

1
Source/Engine/Physics/Actors/RigidBody.h
View File

@@ -486,6 +486,7 @@ public:
// [Actor] // [Actor]
void Serialize(SerializeStream& stream, const void* otherObj) override; void Serialize(SerializeStream& stream, const void* otherObj) override;
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override; void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
void AddMovement(const Vector3& translation, const Quaternion& rotation) override;
// [IPhysicsActor] // [IPhysicsActor]
void* GetPhysicsActor() const override; void* GetPhysicsActor() const override;