From eca99d22f2629c3bb4aae98eccaf3850be2040bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 3 Mar 2022 15:57:31 +0100 Subject: ksys: Move CollisionMasks out of RigidBody so it can be forward declared --- src/KingSystem/Physics/RigidBody/physRigidBody.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.h b/src/KingSystem/Physics/RigidBody/physRigidBody.h index 404d79df..f8af32d9 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBody.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBody.h @@ -38,18 +38,20 @@ public: virtual ~RigidBase() = default; }; +struct RigidBodyCollisionMasks { + /// See MaterialMaskData. + u32 material_mask; + /// EntityCollisionFilterInfo or ReceiverMask. + u32 collision_filter_info; + /// Contact layers we do not collide with. + /// One bit per ContactLayer -- layers are relative to the layer base value. + u32 ignored_layers; +}; + class RigidBody : public sead::IDisposer, public RigidBase { SEAD_RTTI_BASE(RigidBody) public: - struct CollisionMasks { - /// See MaterialMaskData. - u32 material_mask; - /// EntityCollisionFilterInfo or ReceiverMask. - u32 collision_filter_info; - /// Contact layers we do not collide with. - /// One bit per ContactLayer -- layers are relative to the layer base value. - u32 ignored_layers; - }; + using CollisionMasks = RigidBodyCollisionMasks; enum class Type { FromShape = 0, -- cgit v1.2.3