diff --git a/lib/gsys/include/gsys/gsysModel.h b/lib/gsys/include/gsys/gsysModel.h index b666b159..7195a65a 100644 --- a/lib/gsys/include/gsys/gsysModel.h +++ b/lib/gsys/include/gsys/gsysModel.h @@ -2,9 +2,12 @@ #include #include +#include #include #include #include +#include +#include #include namespace gsys { @@ -45,9 +48,20 @@ private: sead::Buffer mUnitPool; /// Indices into this array are called "model unit access indices". sead::PtrArray mUnitAccess; - u8 _48[0x140 - 0x48]; + sead::PtrArray _48; + sead::Matrix34f mMatrix = sead::Matrix34f::ident; + sead::Vector3f _88 = sead::Vector3f::ones; + sead::Vector3f _94 = sead::Vector3f::ones; + bool _a0 = true; + bool _a1 = false; + bool _a2 = true; + bool _a3 = false; + u16 mNumModels = 0; + u8 _a6[0x140 - 0xa6]; mutable sead::CriticalSection mCS; - u8 _180[0x2b8 - 0x180]; + sead::OffsetList mHandleList; + sead::FixedSafeString<256> mName{"名称未設定"}; + u8 _2b0[0x2b8 - 0x2b0]; }; } // namespace gsys