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

Merge remote-tracking branch 'origin/1.11'

Browse Source 
# Conflicts:
#	Source/Tools/Flax.Build/Deps/Downloader.cs
This commit is contained in:
Wojtek Figat
2025-10-16 14:07:49 +02:00
parent e19be4c0c6 08abdc159e
commit d93c32db9c
14 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@
#include "Engine/Physics/Physics.h"
#include "Engine/Physics/PhysicsBackend.h"
#include "Engine/Physics/PhysicsScene.h"
#include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Engine/Time.h"
#define CC_MIN_SIZE 0.001f
@@ -178,6 +179,7 @@ CharacterController::CollisionFlags CharacterController::SimpleMove(const Vector
CharacterController::CollisionFlags CharacterController::Move(const Vector3& displacement)
{
PROFILE_CPU();
CollisionFlags result = CollisionFlags::None;
if (_controller && !_isUpdatingTransform)
{
@@ -377,7 +379,10 @@ void CharacterController::AddMovement(const Vector3& translation, const Quaterni
displacement += GetPhysicsScene()->GetGravity() * deltaTime;
}
Move(displacement);
if (!displacement.IsZero())
{
Move(displacement);
}
if (!rotation.IsIdentity())
{