falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Add more InstanceSet members

This commit is contained in:
Léo Lam 2022-01-30 00:31:18 +01:00
parent d9eeeb6ecc
commit a1a283acf7
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/KingSystem/Physics/System/physInstanceSet.cpp
View File

@ -1,5 +1,6 @@
#include "KingSystem/Physics/System/physInstanceSet.h" #include "KingSystem/Physics/System/physInstanceSet.h"
#include "KingSystem/Physics/RigidBody/physRigidBodySet.h" #include "KingSystem/Physics/RigidBody/physRigidBodySet.h"
#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
namespace ksys::phys { namespace ksys::phys {

27
src/KingSystem/Physics/System/physInstanceSet.h
View File

@ -7,17 +7,18 @@
#include "KingSystem/Physics/RigidBody/physRigidBody.h" #include "KingSystem/Physics/RigidBody/physRigidBody.h"
#include "KingSystem/Physics/RigidBody/physRigidBodyParam.h" #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
namespace gsys {
class Model;
}
namespace ksys::res { namespace ksys::res {
class RagdollBlendWeight;
class RagdollBlendWeight { class RagdollConfigList;
public:
s32 findStateIdx(const sead::SafeString& name) const;
};
} // namespace ksys::res } // namespace ksys::res
namespace ksys::phys { namespace ksys::phys {
class ParamSet;
class RigidBodySet; class RigidBodySet;
class SystemGroupHandler; class SystemGroupHandler;
@ -62,6 +63,9 @@ public:
_80000000 = 1u << 31, _80000000 = 1u << 31,
}; };
const sead::SafeString& getName() const { return mName; }
ParamSet* getParamSet() const { return mParamSet; }
void setFlag2(); void setFlag2();
void clothVisibleStuff(); void clothVisibleStuff();
void setInDemo(); void setInDemo();
@ -85,9 +89,10 @@ public:
s32 sub_7100FBDA2C(const sead::SafeString& name) const; s32 sub_7100FBDA2C(const sead::SafeString& name) const;
private: private:
u8 _8[0x18]; sead::SafeString mName;
ParamSet* mParamSet;
sead::TypedBitFlag<Flag> mFlags; sead::TypedBitFlag<Flag> mFlags;
void* _28; gsys::Model* mModel;
f32 mScale; f32 mScale;
u8 _34[0x40 - 0x34]; u8 _34[0x40 - 0x34];
sead::PtrArray<RigidBodySet> mRigidBodySets; sead::PtrArray<RigidBodySet> mRigidBodySets;
@ -100,11 +105,13 @@ private:
RagdollController* mRagdollController; RagdollController* mRagdollController;
u8 _98[0xb8 - 0x98]; u8 _98[0xb8 - 0x98];
res::RagdollBlendWeight* mRagdollBlendWt; res::RagdollBlendWeight* mRagdollBlendWt;
u8 _c0[0xd8 - 0xc0]; res::RagdollConfigList* mRagdollConfigList;
u8 _c8[0xd8 - 0xc8];
void* _d8; void* _d8;
u8 _e0[0x148 - 0xe0]; u8 _e0[0x148 - 0xe0];
sead::TList<RigidBody*> mList; sead::TList<RigidBody*> mList;
u8 _160[0x188 - 0x160]; u8 _160[0x178 - 0x160];
SystemGroupHandler* _178[2];
SystemGroupHandler* _188[2]; SystemGroupHandler* _188[2];
}; };
KSYS_CHECK_SIZE_NX150(InstanceSet, 0x198); KSYS_CHECK_SIZE_NX150(InstanceSet, 0x198);