ksys: Fix matching issue in _ZN4ksys4phys13RagdollConfig15PartImpulseInfoC1Ev (missing external constants)

This commit is contained in:
Léo Lam 2021-04-20 15:02:12 +02:00
parent c95a79bbc1
commit 2e966d034c
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 14 additions and 6 deletions

View File

@ -79517,7 +79517,7 @@
0x0000007100e9f98c,sub_7100E9F98C,92,
0x0000007100e9f9e8,sub_7100E9F9E8,608,_ZN4ksys4phys13RagdollConfig15PartImpulseInfo10ReceiveObjC1Ev
0x0000007100e9fc48,sub_7100E9FC48,620,_ZN4ksys4phys13RagdollConfig15PartImpulseInfo10ImpulseObjC1Ev
0x0000007100e9feb4,sub_7100E9FEB4,556,_ZN4ksys4phys13RagdollConfig15PartImpulseInfoC1Ev?
0x0000007100e9feb4,sub_7100E9FEB4,556,_ZN4ksys4phys13RagdollConfig15PartImpulseInfoC1Ev
0x0000007100ea00e0,sub_7100EA00E0,568,_ZN4ksys4phys13RagdollConfig17ImpactImpulseInfoC1Ev
0x0000007100ea0318,sub_7100EA0318,784,_ZN4ksys4phys13RagdollConfigC1Ev
0x0000007100ea0628,sub_7100EA0628,432,_ZN4ksys4phys13RagdollConfigD1Ev

Can't render this file because it is too large.

View File

@ -1,4 +1,5 @@
#include "KingSystem/Physics/Ragdoll/physRagdollConfig.h"
#include "KingSystem/Resource/resResourceRagdollConfig.h"
namespace ksys::phys {
@ -15,19 +16,18 @@ RagdollConfig::PartImpulseInfo::ImpulseObj::ImpulseObj()
mAttackPoint({0, 0, 0}, "AttackPoint", "インパルスを与える点", this),
mImpulsePower(0.1, "ImpulsePower", "インパルスの強さ", this) {}
// NON_MATCHING: loop unrolling
RagdollConfig::PartImpulseInfo::PartImpulseInfo()
: mIsUseReceiveImpulse(true, "IsUseReceiveImpulse", "攻撃インパルスを反映させるかどうか",
&mObj),
mIsUseFixedImpulse(true, "IsUseFixedImpulse", "固定インパルスを反映させるかどうか", &mObj) {
for (int i = 0; i < mReceiveObjs.size(); ++i) {
for (int i = 0; i < res::RagdollConfig::cNumReceiveObjs; ++i) {
sead::FormatFixedSafeString<128> name("ReceiveObj%02d", i + 1);
addObj(&mReceiveObjs[i], name);
addObj(&mReceiveObjs(i), name);
}
for (int i = 0; i < mImpulseObjs.size(); ++i) {
for (int i = 0; i < res::RagdollConfig::cNumImpulseObjs; ++i) {
sead::FormatFixedSafeString<128> name("ImpulseObj%02d", i + 1);
addObj(&mImpulseObjs[i], name);
addObj(&mImpulseObjs(i), name);
}
addObj(&mObj, "PartImpulseData");

View File

@ -2,6 +2,10 @@
namespace ksys::res {
const int RagdollConfig::cNumReceiveObjs = 3;
const int RagdollConfig::cNumImpulseObjs = 5;
const int RagdollConfig::cNumXXX = 10;
RagdollConfig::RagdollConfig() : ParamIO("rgconfig", 0) {}
RagdollConfig::~RagdollConfig() = default;

View File

@ -18,6 +18,10 @@ public:
const phys::RagdollConfig& getConfig() const { return mConfig; }
static const int cNumReceiveObjs;
static const int cNumImpulseObjs;
static const int cNumXXX; // FIXME: rename
private:
phys::RagdollConfig mConfig;
};