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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
+14 -5
View File
@@ -28,13 +28,22 @@ namespace PhysXEditorTests
{
int GetEditorStaticRigidBodyCount()
{
AZStd::shared_ptr<Physics::World> world;
Physics::EditorWorldBus::BroadcastResult(world, &Physics::EditorWorldRequests::GetEditorWorld);
AzPhysics::SceneHandle sceneHandle;
Physics::EditorWorldBus::BroadcastResult(sceneHandle, &Physics::EditorWorldRequests::GetEditorSceneHandle);
auto* scene = static_cast<physx::PxScene*>(world->GetNativePointer());
PHYSX_SCENE_READ_LOCK(scene);
physx::PxScene* pxScene = nullptr;
return scene->getNbActors(physx::PxActorTypeFlag::eRIGID_STATIC);
if (auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
{
if (AzPhysics::Scene* scene = physicsSystem->GetScene(sceneHandle))
{
pxScene = static_cast<physx::PxScene*>(scene->GetNativePointer());
}
}
PHYSX_SCENE_READ_LOCK(pxScene);
return pxScene->getNbActors(physx::PxActorTypeFlag::eRIGID_STATIC);
}
void AddEditorBoxShapeComponent(EntityPtr& editorEntity)