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

ksys/phys: Unify ContactPointInfo/CollisionInfo with InstanceSet

This commit is contained in:
Léo Lam 2022-03-01 19:31:44 +01:00
parent 11dafc6ac3
commit 6077a63ea6
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
#include "KingSystem/Physics/System/physInstanceSet.h"
#include "KingSystem/Physics/RigidBody/physRigidBodySet.h"
#include "KingSystem/Physics/System/physCollisionInfo.h"
#include "KingSystem/Physics/System/physContactPointInfo.h"
#include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
namespace ksys::phys {
@ -154,8 +156,8 @@ void* InstanceSet::sub_7100FBBC28(const sead::SafeString& name) const {
s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
s32 idx = 0;
for (auto& info : mContactInfos) {
if (name == info.mName)
for (auto& info : mContactPointInfo) {
if (name == info.getName())
return idx;
idx++;
}
@ -164,8 +166,8 @@ s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
s32 InstanceSet::sub_7100FBBD9C(const sead::SafeString& name) const {
s32 idx = 0;
for (auto& info : mCollisionInfos) {
if (name == info.mName)
for (auto& info : mCollisionInfo) {
if (name == info.getName())
return idx;
idx++;
}

16
src/KingSystem/Physics/System/physInstanceSet.h
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;