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

Fix CharacterController::SimpleMove gravity displacement handling

Browse Source
This commit is contained in:
Ari Vuollet
2024-07-13 15:52:57 +03:00
parent 009e1aaebb
commit 35d46e23a8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Physics/Colliders/CharacterController.cpp
View File

@@ -19,6 +19,7 @@ CharacterController::CharacterController(const SpawnParams& params)
, _minMoveDistance(0.0f) , _minMoveDistance(0.0f)
, _isUpdatingTransform(false) , _isUpdatingTransform(false)
, _upDirection(Vector3::Up) , _upDirection(Vector3::Up)
, _gravityDisplacement(Vector3::Zero)
, _nonWalkableMode(NonWalkableModes::PreventClimbing) , _nonWalkableMode(NonWalkableModes::PreventClimbing)
, _lastFlags(CollisionFlags::None) , _lastFlags(CollisionFlags::None)
{ {
@@ -148,10 +149,16 @@ CharacterController::CollisionFlags CharacterController::GetFlags() const
CharacterController::CollisionFlags CharacterController::SimpleMove(const Vector3& speed) CharacterController::CollisionFlags CharacterController::SimpleMove(const Vector3& speed)
{ {
const float deltaTime = Time::GetCurrentSafe()->DeltaTime.GetTotalSeconds(); const float deltaTime = Time::GetCurrentSafe()->DeltaTime.GetTotalSeconds();
Vector3 displacement = speed; Vector3 displacement = speed + _gravityDisplacement;
displacement += GetPhysicsScene()->GetGravity() * deltaTime; CollisionFlags result = Move(displacement * deltaTime);
displacement *= deltaTime; if ((static_cast<int>(result) & static_cast<int>(CollisionFlags::Below)) != 0)
return Move(displacement); {
// Reset accumulated gravity acceleration when we touch the ground
_gravityDisplacement = Vector3::Zero;
}
else
_gravityDisplacement += GetPhysicsScene()->GetGravity() * deltaTime;
return result;
} }
CharacterController::CollisionFlags CharacterController::Move(const Vector3& displacement) CharacterController::CollisionFlags CharacterController::Move(const Vector3& displacement)

1
Source/Engine/Physics/Colliders/CharacterController.h
View File

@@ -66,6 +66,7 @@ private:
float _minMoveDistance; float _minMoveDistance;
bool _isUpdatingTransform; bool _isUpdatingTransform;
Vector3 _upDirection; Vector3 _upDirection;
Vector3 _gravityDisplacement;
NonWalkableModes _nonWalkableMode; NonWalkableModes _nonWalkableMode;
CollisionFlags _lastFlags; CollisionFlags _lastFlags;