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

Adds feature for creating multiple physics scenes

Browse Source
This commit is contained in:
Iain Mckay
2021-12-01 15:30:31 +01:00
parent cc3617b5c2
commit a4e102672d
30 changed files with 2312 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,14 @@
#include "RigidBody.h"
#include "PxMaterial.h"
#include <iterator>
#include "Engine/Core/Log.h"
#include "Engine/Physics/Utilities.h"
#include "Engine/Physics/Colliders/Collider.h"
#include "Engine/Physics/Physics.h"
#include "Engine/Physics/PhysicalMaterial.h"
#include "Engine/Physics/PhysicsScene.h"
#include "Engine/Serialization/Serialization.h"
#include <ThirdParty/PhysX/extensions/PxRigidBodyExt.h>
#include <ThirdParty/PhysX/PxRigidActor.h>
@@ -476,7 +480,7 @@ void RigidBody::CreateActor()
// Register actor
const bool putToSleep = !_startAwake && GetEnableSimulation() && !GetIsKinematic() && IsActiveInHierarchy();
Physics::AddActor(_actor, putToSleep);
GetPhysicsScene()->AddActor(_actor, putToSleep);
// Update cached data
UpdateBounds();
@@ -580,7 +584,7 @@ void RigidBody::EndPlay()
if (_actor)
{
// Remove actor
Physics::RemoveActor(_actor);
GetPhysicsScene()->RemoveActor(_actor);
_actor = nullptr;
}
}
@@ -627,3 +631,15 @@ void RigidBody::OnTransformChanged()
PhysicsActor::OnTransformChanged();
}
}
void RigidBody::OnPhysicsSceneChanged(PhysicsScene* previous)
{
ASSERT(previous);
PhysicsActor::OnPhysicsSceneChanged(previous);
previous->UnlinkActor(_actor);
const bool putToSleep = !_startAwake && GetEnableSimulation() && !GetIsKinematic() && IsActiveInHierarchy();
GetPhysicsScene()->AddActor(_actor, putToSleep);
}