mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-17 21:13:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Unify ContactPointInfo/CollisionInfo with InstanceSet

Browse Source
This commit is contained in:
Léo Lam
2022-03-01 19:31:44 +01:00
parent 11dafc6ac3
commit 6077a63ea6
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Physics/System/physInstanceSet.h
+4 -12
View File
@@ -18,6 +18,8 @@ class RagdollConfigList;
namespace ksys::phys {
class CollisionInfo;
class ContactPointInfo;
class ParamSet;
class RigidBodySet;
class SystemGroupHandler;
@@ -38,16 +40,6 @@ public:
void enableCollisionMaybe_0(ContactLayer);
};
struct CollisionInfoBase {
u8 filler[0x50];
sead::SafeString mName;
};
struct ContactInfo {
u8 filler[0x8];
sead::SafeString mName;
};
class InstanceSet : public sead::hostio::Node {
public:
enum class Flag : u32 {
@@ -96,8 +88,8 @@ private:
f32 mScale;
u8 _34[0x40 - 0x34];
sead::PtrArray<RigidBodySet> mRigidBodySets;
sead::PtrArray<CollisionInfoBase> mCollisionInfos;
sead::PtrArray<ContactInfo> mContactInfos;
sead::PtrArray<CollisionInfo> mCollisionInfo;
sead::PtrArray<ContactPointInfo> mContactPointInfo;
u8 _70[0x10];
CollisionController* mCollisionController;