birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove physics world body notification bus (#576)

Browse Source
This commit is contained in:
amzn-sean
2021-05-07 14:12:07 +01:00
committed by GitHub
parent cb44a7ebb2
commit cb4e394784
43 changed files with 203 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/Scene/PhysXSceneSimulationEventCallback.cpp
+4 -4
View File
@@ -83,8 +83,8 @@ namespace PhysX
continue;
}
AzPhysics::SimulatedBody* body1 = actorData1->GetWorldBody();
AzPhysics::SimulatedBody* body2 = actorData2->GetWorldBody();
AzPhysics::SimulatedBody* body1 = actorData1->GetSimulatedBody();
AzPhysics::SimulatedBody* body2 = actorData2->GetSimulatedBody();
if (!body1 || !body2)
{
@@ -161,7 +161,7 @@ namespace PhysX
}
ActorData* triggerBodyActorData = Utils::GetUserData(triggerPair.triggerActor);
AzPhysics::SimulatedBody* triggerBody = triggerBodyActorData->GetWorldBody();
AzPhysics::SimulatedBody* triggerBody = triggerBodyActorData->GetSimulatedBody();
if (!triggerBody)
{
AZ_Error("PhysX", false, "onTrigger:: trigger body was invalid");
@@ -174,7 +174,7 @@ namespace PhysX
}
ActorData* otherActorData = Utils::GetUserData(triggerPair.otherActor);
AzPhysics::SimulatedBody* otherBody = otherActorData->GetWorldBody();
AzPhysics::SimulatedBody* otherBody = otherActorData->GetSimulatedBody();
if (!otherBody)
{
AZ_Error("PhysX", false, "onTrigger:: otherBody was invalid");