From b82689a56da33b015d12292d6c5a37f93b7cbd75 Mon Sep 17 00:00:00 2001 From: MonsterDruide1 <5958456@gmail.com> Date: Fri, 29 Nov 2024 15:17:13 +0100 Subject: [PATCH] Library/Collision: Add more `CollisionParts`-members (#199) --- lib/al/Library/Collision/CollisionParts.h | 33 +++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/lib/al/Library/Collision/CollisionParts.h b/lib/al/Library/Collision/CollisionParts.h index 00a3054..791244d 100644 --- a/lib/al/Library/Collision/CollisionParts.h +++ b/lib/al/Library/Collision/CollisionParts.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include @@ -29,18 +30,34 @@ public: const HitSensor* getConnectedSensor() const { return mConnectedSensor; } private: - void* _0[11]; + void* unk[2]; + CollisionParts* _10; // self-reference + sead::TList* mPartsList; + sead::Matrix34f* mJointMtx; + sead::Matrix34f mSyncMtx; sead::Matrix34f mBaseMtx; sead::Matrix34f mBaseInvMtx; sead::Matrix34f mPrevBaseMtx; - void* _88[9]; + sead::Matrix34f mPrevBaseInvMtx; + sead::Vector3f mMtxScaleVec; + f32 mMtxScale; + f32 mInvMtxScale; + s32 mPriority; KCollisionServer* mKCollisionServer; - HitSensor* mConnectedSensor = nullptr; - void* _140[3]; - s32 _158; - s32 _15c = 0; - u8 _160[13]; - bool mIsMoving = false; + HitSensor* mConnectedSensor; + const char* mSpecialPurpose; + const char* mOptionalPurpose; + sead::Vector3f _150; // same as mMtxScaleVec? + s32 _15c; + f32 mBoundingSphereRange; + f32 mBaseMtxScale; + bool mIsValidatedByUser; + bool mIsValidatedBySystem; + bool _16a; + bool _16b; + bool _16c; + bool mIsMoving; + bool _16e; }; } // namespace al