diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 2cbd23ba..f76e6eb0 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -96754,31 +96754,31 @@ 0x00000071012faf04,sub_71012FAF04,152,_ZThn664_N4ksys3res3LodD1Ev 0x00000071012faf9c,sub_71012FAF9C,140,_ZThn664_N4ksys3res3LodD0Ev 0x00000071012fb028,_ZN4ksys3res3Lod33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE,0x174,_ZN4ksys3res3Lod33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071012fb19c,sub_71012FB19C,492, -0x00000071012fb388,sub_71012FB388,324, -0x00000071012fb4cc,sub_71012FB4CC,8, -0x00000071012fb4d4,sub_71012FB4D4,8, -0x00000071012fb4dc,sub_71012FB4DC,36, -0x00000071012fb500,sub_71012FB500,40, -0x00000071012fb528,sub_71012FB528,40, -0x00000071012fb550,nullsub_4841,4, -0x00000071012fb554,nullsub_4842,4, -0x00000071012fb558,sub_71012FB558,1148, -0x00000071012fb9d4,sub_71012FB9D4,8, -0x00000071012fb9dc,sub_71012FB9DC,8, -0x00000071012fb9e4,sub_71012FB9E4,8, -0x00000071012fb9ec,sub_71012FB9EC,108, -0x00000071012fba58,sub_71012FBA58,108, -0x00000071012fbac4,sub_71012FBAC4,8, -0x00000071012fbacc,sub_71012FBACC,92, -0x00000071012fbb28,sub_71012FBB28,8, -0x00000071012fbb30,sub_71012FBB30,8, -0x00000071012fbb38,sub_71012FBB38,92, -0x00000071012fbb94,sub_71012FBB94,8, -0x00000071012fbb9c,sub_71012FBB9C,372, -0x00000071012fbd10,sub_71012FBD10,44, -0x00000071012fbd3c,j__ZdlPv_1322,4, -0x00000071012fbd40,sub_71012FBD40,304, +0x00000071012fb19c,sub_71012FB19C,492,_ZN4ksys3res17RagdollConfigListC1Ev +0x00000071012fb388,sub_71012FB388,324,_ZN4ksys3res17RagdollConfigListD1Ev +0x00000071012fb4cc,sub_71012FB4CC,8,_ZThn632_N4ksys3res17RagdollConfigListD1Ev +0x00000071012fb4d4,sub_71012FB4D4,8,_ZThn664_N4ksys3res17RagdollConfigListD1Ev +0x00000071012fb4dc,sub_71012FB4DC,36,_ZN4ksys3res17RagdollConfigListD0Ev +0x00000071012fb500,sub_71012FB500,40,_ZThn632_N4ksys3res17RagdollConfigListD0Ev +0x00000071012fb528,sub_71012FB528,40,_ZThn664_N4ksys3res17RagdollConfigListD0Ev +0x00000071012fb550,nullsub_4841,4,_ZN4ksys3res17RagdollConfigList9doCreate_EPhjPN4sead4HeapE +0x00000071012fb554,nullsub_4842,4,_ZThn632_N4ksys3res17RagdollConfigList9doCreate_EPhjPN4sead4HeapE +0x00000071012fb558,sub_71012FB558,1148,_ZN4ksys3res17RagdollConfigList6parse_EPhmPN4sead4HeapE +0x00000071012fb9d4,sub_71012FB9D4,8,_ZThn632_N4ksys3res17RagdollConfigList6parse_EPhmPN4sead4HeapE +0x00000071012fb9dc,sub_71012FB9DC,8,_ZN4ksys3res17RagdollConfigList14finishParsing_Ev +0x00000071012fb9e4,sub_71012FB9E4,8,_ZThn632_N4ksys3res17RagdollConfigList14finishParsing_Ev +0x00000071012fb9ec,sub_71012FB9EC,108,_ZN4ksys3res17RagdollConfigList3m7_Ev +0x00000071012fba58,sub_71012FBA58,108,_ZThn632_N4ksys3res17RagdollConfigList3m7_Ev +0x00000071012fbac4,sub_71012FBAC4,8,_ZNK4ksys3res17RagdollConfigList27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071012fbacc,sub_71012FBACC,92,_ZNK4ksys3res17RagdollConfigList18getRuntimeTypeInfoEv +0x00000071012fbb28,sub_71012FBB28,8,_ZNK4ksys3res17RagdollConfigList10needsParseEv +0x00000071012fbb30,sub_71012FBB30,8,_ZThn632_NK4ksys3res17RagdollConfigList27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071012fbb38,sub_71012FBB38,92,_ZThn632_NK4ksys3res17RagdollConfigList18getRuntimeTypeInfoEv +0x00000071012fbb94,sub_71012FBB94,8,_ZThn632_NK4ksys3res17RagdollConfigList10needsParseEv +0x00000071012fbb9c,sub_71012FBB9C,372,_ZN4ksys3res17RagdollConfigList33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071012fbd10,sub_71012FBD10,44,_ZN4ksys3res17RagdollConfigList9BodyParamD2Ev +0x00000071012fbd3c,j__ZdlPv_1322,4,_ZN4ksys3res17RagdollConfigList9BodyParamD0Ev +0x00000071012fbd40,sub_71012FBD40,304,_ZN4sead6BufferIN4ksys3res17RagdollConfigList9BodyParamEE14tryAllocBufferEiPNS_4HeapEi 0x00000071012fbe70,sub_71012FBE70,236,_ZN4ksys3res13RagdollConfigC1Ev 0x00000071012fbf5c,sub_71012FBF5C,104,_ZN4ksys3res13RagdollConfigD1Ev 0x00000071012fbfc4,sub_71012FBFC4,104,_ZThn632_N4ksys3res13RagdollConfigD1Ev diff --git a/src/KingSystem/Resource/resResourceRagdollConfig.cpp b/src/KingSystem/Resource/resResourceRagdollConfig.cpp index fa9874d0..3c61dcd9 100644 --- a/src/KingSystem/Resource/resResourceRagdollConfig.cpp +++ b/src/KingSystem/Resource/resResourceRagdollConfig.cpp @@ -4,7 +4,11 @@ namespace ksys::res { const int RagdollConfig::cNumReceiveObjs = 3; const int RagdollConfig::cNumImpulseObjs = 5; -const int RagdollConfig::cNumXXX = 10; +const int RagdollConfig::cNumImpulseParams = 10; +const std::array RagdollConfig::cImpulseParamNames[10] = { + {"Default"}, {"Sword"}, {"LargeSword"}, {"Spear"}, {"Arrow"}, + {"Bomb"}, {"HeadShot"}, {"ShockWave"}, {"SilentKill"}, {"Gust"}, +}; RagdollConfig::RagdollConfig() : ParamIO("rgconfig", 0) {} diff --git a/src/KingSystem/Resource/resResourceRagdollConfig.h b/src/KingSystem/Resource/resResourceRagdollConfig.h index 9b148720..46e71cf4 100644 --- a/src/KingSystem/Resource/resResourceRagdollConfig.h +++ b/src/KingSystem/Resource/resResourceRagdollConfig.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "KingSystem/Physics/Ragdoll/physRagdollConfig.h" #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" @@ -20,7 +22,8 @@ public: static const int cNumReceiveObjs; static const int cNumImpulseObjs; - static const int cNumXXX; // FIXME: rename + static const int cNumImpulseParams; + static const std::array cImpulseParamNames[10]; private: phys::RagdollConfig mConfig; diff --git a/src/KingSystem/Resource/resResourceRagdollConfigList.cpp b/src/KingSystem/Resource/resResourceRagdollConfigList.cpp index 218c20b8..c9b8b77a 100644 --- a/src/KingSystem/Resource/resResourceRagdollConfigList.cpp +++ b/src/KingSystem/Resource/resResourceRagdollConfigList.cpp @@ -1 +1,80 @@ #include "KingSystem/Resource/resResourceRagdollConfigList.h" +#include "KingSystem/Resource/resResourceRagdollConfig.h" + +namespace ksys::res { + +RagdollConfigList::RagdollConfigList() + : ParamIO("rgconfiglist", 0), + mUpperLimitHeight(0.0, "UpperLimitHight" /*sic*/, "ヒット位置判定の境界(上)", &mCommonData), + mLowerLimitHeight(0.0, "LowerLimitHight" /*sic*/, "ヒット位置判定の境界(下)", + &mCommonData) {} + +RagdollConfigList::~RagdollConfigList() { + mImpulseParams.freeBuffer(); + mBodyParams.freeBuffer(); +} + +void RagdollConfigList::doCreate_(u8*, u32, sead::Heap*) {} + +bool RagdollConfigList::parse_(u8* data, size_t size, sead::Heap* heap) { + if (!data) + return false; + + if (RagdollConfig::cNumImpulseParams > 0) { + mImpulseParams.allocBufferAssert(RagdollConfig::cNumImpulseParams, heap); + if (!mImpulseParams.isBufferReady()) + return false; + +#ifdef MATCHING_HACK_NX_CLANG + __builtin_assume(RagdollConfig::cNumImpulseParams != 0); +#endif + + for (int i = 0; i != RagdollConfig::cNumImpulseParams; ++i) { + mImpulseParams[i].config = nullptr; + mImpulseParams[i].file_name.init("", "FileName", "データファイル名", "", + &mImpulseParams[i].obj); + mImpulseParamList.addObj( + &mImpulseParams[i].obj, + sead::FormatFixedSafeString<32>("%s%s", "ImpulseParam_", + RagdollConfig::cImpulseParamNames[i].data())); + } + } + addList(&mImpulseParamList, "ImpulseParamList"); + + addObj(&mCommonData, "CommonData"); + + agl::utl::ResParameterArchive archive{data}; + const auto root = archive.getRootList(); + const auto BodyParamList = agl::utl::getResParameterList(root, "BodyParamList"); + if (int num_params; + BodyParamList && (num_params = BodyParamList.getResParameterObjNum()) != 0) { + mBodyParams.allocBufferAssert(num_params, heap); + for (int i = 0; i < num_params; ++i) { + mBodyParams[i].rigid_name.init(sead::SafeString::cEmptyString, "RigidName", "RigidName", + "RigidName", &mBodyParams[i]); + mBodyParams[i].friction_scale.init(1.0, "FrictionScale", "FrictionScale", + "FrictionScale", &mBodyParams[i]); + mBodyParams[i].buoyancy_scale.init(1.0, "BuoyancyScale", "BuoyancyScale", + "BuoyancyScale", &mBodyParams[i]); + mBodyParamList.addObj(&mBodyParams[i], + sead::FormatFixedSafeString<32>("BodyParam_%d", i)); + } + } + addList(&mBodyParamList, "BodyParamList"); + + applyResParameterArchive(archive); + return true; +} + +bool RagdollConfigList::finishParsing_() { + return true; +} + +bool RagdollConfigList::m7_() { + for (auto& param : mImpulseParams) + param.config = nullptr; + + return true; +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceRagdollConfigList.h b/src/KingSystem/Resource/resResourceRagdollConfigList.h index f5975628..9b207189 100644 --- a/src/KingSystem/Resource/resResourceRagdollConfigList.h +++ b/src/KingSystem/Resource/resResourceRagdollConfigList.h @@ -33,8 +33,10 @@ public: RagdollConfigList(); ~RagdollConfigList() override; + RagdollConfigList(const RagdollConfigList&) = delete; + auto operator=(const RagdollConfigList&) = delete; - void doCreate_(u8*, u32, sead::Heap*) override {} + void doCreate_(u8*, u32, sead::Heap*) override; bool needsParse() const override { return true; } bool parse_(u8* data, size_t size, sead::Heap* heap) override; bool finishParsing_() override;