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

Merge branch 'GoaLitiuM-physicsscene_change_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-14 17:32:05 +01:00
parent 13bf15198b a549733811
commit c6bb8f1784
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,7 +569,7 @@ void RigidBody::OnTransformChanged()
void RigidBody::OnPhysicsSceneChanged(PhysicsScene* previous)
{
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _actor);
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _actor, true);
void* scene = GetPhysicsScene()->GetPhysicsScene();
PhysicsBackend::AddSceneActor(scene, _actor);
const bool putToSleep = !_startAwake && GetEnableSimulation() && !GetIsKinematic() && IsActiveInHierarchy();

2
Source/Engine/Physics/Colliders/Collider.cpp
View File

@@ -438,7 +438,7 @@ void Collider::OnPhysicsSceneChanged(PhysicsScene* previous)
if (_staticActor != nullptr)
{
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _staticActor);
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _staticActor, true);
void* scene = GetPhysicsScene()->GetPhysicsScene();
PhysicsBackend::AddSceneActor(scene, _staticActor);
}

7
Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
View File

@@ -1998,11 +1998,14 @@ void PhysicsBackend::AddSceneActor(void* scene, void* actor)
FlushLocker.Unlock();
}
void PhysicsBackend::RemoveSceneActor(void* scene, void* actor)
void PhysicsBackend::RemoveSceneActor(void* scene, void* actor, bool immediately)
{
auto scenePhysX = (ScenePhysX*)scene;
FlushLocker.Lock();
scenePhysX->RemoveActors.Add((PxActor*)actor);
if (immediately)
scenePhysX->Scene->removeActor(*(PxActor*)actor);
else
scenePhysX->RemoveActors.Add((PxActor*)actor);
FlushLocker.Unlock();
}

2
Source/Engine/Physics/PhysicsBackend.h
View File

@@ -113,7 +113,7 @@ public:
static void SetSceneBounceThresholdVelocity(void* scene, float value);
static void SetSceneOrigin(void* scene, const Vector3& oldOrigin, const Vector3& newOrigin);
static void AddSceneActor(void* scene, void* actor);
static void RemoveSceneActor(void* scene, void* actor);
static void RemoveSceneActor(void* scene, void* actor, bool immediately = false);
static void AddSceneActorAction(void* scene, void* actor, ActionType action);
#if COMPILE_WITH_PROFILER
static void GetSceneStatistics(void* scene, PhysicsStatistics& result);

2
Source/Engine/Physics/PhysicsBackendEmpty.cpp
View File

@@ -115,7 +115,7 @@ void PhysicsBackend::AddSceneActor(void* scene, void* actor)
{
}
void PhysicsBackend::RemoveSceneActor(void* scene, void* actor)
void PhysicsBackend::RemoveSceneActor(void* scene, void* actor, bool immediately)
{
}

2
Source/Engine/Terrain/TerrainPatch.cpp
View File

@@ -2582,7 +2582,7 @@ void TerrainPatch::Deserialize(DeserializeStream& stream, ISerializeModifier* mo
void TerrainPatch::OnPhysicsSceneChanged(PhysicsScene* previous)
{
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _physicsActor);
PhysicsBackend::RemoveSceneActor(previous->GetPhysicsScene(), _physicsActor, true);
void* scene = _terrain->GetPhysicsScene()->GetPhysicsScene();
PhysicsBackend::AddSceneActor(scene, _physicsActor);
}