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

combined the 2 physics shape collider config pair types into 1(#778)

Browse Source
This commit is contained in:
amzn-sean
2021-05-18 12:39:07 +01:00
committed by GitHub
parent c4fa373e43
commit 672dad7fea
41 changed files with 225 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp
+4 -1
View File
@@ -18,6 +18,7 @@
#include <AzCore/Component/TransformBus.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/std/smart_ptr/make_shared.h>
#include <AzFramework/Physics/PhysicsScene.h>
#include <AzFramework/Physics/SystemBus.h>
#include <AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h>
@@ -150,7 +151,9 @@ namespace WhiteBox
bodyConfiguration.m_entityId = GetEntityId();
bodyConfiguration.m_orientation = GetTransform()->GetWorldRotationQuaternion();
bodyConfiguration.m_position = GetTransform()->GetWorldTranslation();
bodyConfiguration.m_colliderAndShapeData = AzPhysics::ShapeColliderPair(&m_physicsColliderConfiguration, &m_meshShapeConfiguration);
bodyConfiguration.m_colliderAndShapeData = AzPhysics::ShapeColliderPair(
AZStd::make_shared<Physics::ColliderConfiguration>(m_physicsColliderConfiguration),
AZStd::make_shared<Physics::CookedMeshShapeConfiguration>(m_meshShapeConfiguration));
if (m_sceneInterface)
{