summaryrefslogtreecommitdiff
path: root/src/KingSystem/Physics/System/physInstanceSet.h
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-01-23 01:07:28 +0100
committerLéo Lam <leo@leolam.fr>2022-01-25 00:15:29 +0100
commitb728917ef4753bcf7d54070947cc71785523130c (patch)
tree915792fd7ab4108bab7de51976e1afcded5e722b /src/KingSystem/Physics/System/physInstanceSet.h
parent4531c033a38af5db1e7ef2c7a1acd663a643b4b9 (diff)
ksys/phys: Add RigidBody collision filter info functions
Including a bunch of BitFields additions so we can get the desired codegen without sacrificing readability or flexibility. (The alternative would be building masks and masking manually.) getCollisionFilterInfo was changed to return a u32 instead of EntityCollisionFilterInfo because a collision filter info mask can be either an EntityCollisionFilterInfo or a ReceiverMask. (Also at some point we'll probably want to rename EntityCollisionFilterInfo because that is also used for sensor rigid bodies and not just for entities.)
Diffstat (limited to 'src/KingSystem/Physics/System/physInstanceSet.h')
-rw-r--r--src/KingSystem/Physics/System/physInstanceSet.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/KingSystem/Physics/System/physInstanceSet.h b/src/KingSystem/Physics/System/physInstanceSet.h
index 76b31d5e..e6aa9238 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.h
+++ b/src/KingSystem/Physics/System/physInstanceSet.h
@@ -18,6 +18,8 @@ public:
namespace ksys::phys {
+class SystemGroupHandler;
+
class Ragdoll {};
class RagdollController {
@@ -117,7 +119,7 @@ private:
u8 _e0[0x148 - 0xe0];
sead::TList<RigidBody*> mList;
u8 _160[0x188 - 0x160];
- void* _188[2];
+ SystemGroupHandler* _188[2];
};
KSYS_CHECK_SIZE_NX150(InstanceSet, 0x198);