diff options
| author | Léo Lam <leo@leolam.fr> | 2022-01-07 01:30:35 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-01-07 01:51:13 +0100 |
| commit | b4bbaf141f871352fe4eac1eb1ef9c7522ca8154 (patch) | |
| tree | bc479fde849b250f1d4a52f903e782265fa555d5 /src/KingSystem/Physics/System/physMemSystem.h | |
| parent | 53c5d0342027160ab9c0f7fb2f9fd44d8dd7ac1a (diff) | |
ksys/phys: Add MemSystem::initSystemData
Diffstat (limited to 'src/KingSystem/Physics/System/physMemSystem.h')
| -rw-r--r-- | src/KingSystem/Physics/System/physMemSystem.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/KingSystem/Physics/System/physMemSystem.h b/src/KingSystem/Physics/System/physMemSystem.h index a6a12625..908940f1 100644 --- a/src/KingSystem/Physics/System/physMemSystem.h +++ b/src/KingSystem/Physics/System/physMemSystem.h @@ -1,7 +1,9 @@ #pragma once #include <basis/seadTypes.h> +#include <container/seadPtrArray.h> #include <heap/seadDisposer.h> +#include <thread/seadCriticalSection.h> #include "KingSystem/Physics/System/physDefines.h" #include "KingSystem/Utils/Types.h" @@ -38,6 +40,8 @@ public: SystemData* getSystemData() const { return mSystemData; } MaterialTable* getMaterialTable() const { return mMaterialTable; } + void initSystemData(sead::Heap* heap); + RigidContactPoints* allocContactPoints(sead::Heap* heap, int num, const sead::SafeString& name, int a, int b, int c) const; void freeContactPoints(RigidContactPoints* points) const; @@ -52,7 +56,15 @@ public: void removeSystemGroupHandler(SystemGroupHandler* handler); private: - u8 _28[0x148 - 0x28]; + u8 _28[0xa8 - 0x28]; + sead::CriticalSection mCS; + void* _e8{}; + void* _f0{}; + GroupFilter* mEntityGroupFilter{}; + GroupFilter* mSensorGroupFilter{}; + sead::FixedPtrArray<GroupFilter, 2> mGroupFilters; + // FIXME: type + sead::FixedPtrArray<void*, 2> _128; ContactMgr* mContactMgr; void* _150; void* _158; @@ -61,7 +73,15 @@ private: void* mRigidBodyDividedMeshShapeMgr; SystemData* mSystemData; MaterialTable* mMaterialTable; - u8 _188[0x480 - 0x188]; + void* _188{}; + void* _190{}; + void* _198{}; + void* _1a0{}; + sead::Heap* mPhysicsSystemHeap{}; + sead::Heap* mDebugHeap{}; + sead::Heap* mPhysicsTempDefaultHeap{}; + sead::Heap* mPhysicsTempLowHeap{}; + u8 _1c8[0x480 - 0x1c8]; }; KSYS_CHECK_SIZE_NX150(MemSystem, 0x480); |
