diff options
| author | Léo Lam <leo@leolam.fr> | 2021-12-30 00:39:17 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-01-03 23:53:40 +0100 |
| commit | eb16cbaf55931853533d4e0ed2c71e643bc54c33 (patch) | |
| tree | 9efe14bece5cd25dd801c79328f41b93002c1966 /src/KingSystem/Physics/System/physMemSystem.h | |
| parent | 75a270118adfc1e4838cd776a8b2adb11dad06f0 (diff) | |
ksys/phys: Add MaterialMask
Diffstat (limited to 'src/KingSystem/Physics/System/physMemSystem.h')
| -rw-r--r-- | src/KingSystem/Physics/System/physMemSystem.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/KingSystem/Physics/System/physMemSystem.h b/src/KingSystem/Physics/System/physMemSystem.h index 4b2d3dca..cdaaba5e 100644 --- a/src/KingSystem/Physics/System/physMemSystem.h +++ b/src/KingSystem/Physics/System/physMemSystem.h @@ -9,9 +9,11 @@ namespace ksys::phys { class ContactMgr; class GroupFilter; +class MaterialTable; class RigidBody; class RigidContactPoints; class RigidContactPointsEx; +class SystemData; class SystemGroupHandler; // FIXME: obviously incomplete. Also this should be moved to its own header @@ -28,6 +30,8 @@ public: GroupFilter* getGroupFilter(ContactLayerType type) const; ContactMgr* getContactMgr() const { return mContactMgr; } RigidBodyRequestMgr* getRigidBodyRequestMgr() const { return mRigidBodyRequestMgr; } + SystemData* getSystemData() const { return mSystemData; } + MaterialTable* getMaterialTable() const { return mMaterialTable; } RigidContactPoints* allocContactPoints(sead::Heap* heap, int num, const sead::SafeString& name, int a, int b, int c) const; @@ -48,7 +52,11 @@ private: void* _150; void* _158; RigidBodyRequestMgr* mRigidBodyRequestMgr; - u8 _168[0x480 - 0x168]; + void* _168; + void* mRigidBodyDividedMeshShapeMgr; + SystemData* mSystemData; + MaterialTable* mMaterialTable; + u8 _188[0x480 - 0x188]; }; KSYS_CHECK_SIZE_NX150(MemSystem, 0x480); |
