summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-03-03 15:57:31 +0100
committerLéo Lam <leo@leolam.fr>2022-03-03 15:59:49 +0100
commiteca99d22f2629c3bb4aae98eccaf3850be2040bd (patch)
tree4daa25023107cc484d9b268b910086a4be31330a /src
parent9b35b6236828076a443b1c0544129c7aecaba5ab (diff)
ksys: Move CollisionMasks out of RigidBody so it can be forward declared
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Physics/RigidBody/physRigidBody.h20
1 files changed, 11 insertions, 9 deletions
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,