From 0e69423ecb968faee1197484524018208ad78f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 19 Sep 2020 22:38:25 +0200 Subject: [PATCH] ksys/res: Implement GParamList BindBone --- CMakeLists.txt | 1 + data/uking_functions.csv | 4 +-- .../resGParamListObjectBindBone.h | 28 +++++++++++++++++++ .../Resource/resResourceGParamList.cpp | 2 ++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 781f56a3..9192e2fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObject.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 6cdb9e1c..b6ee988e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89064,7 +89064,7 @@ 0x000000710118c89c,BgparamlistObjectEnemyRace::ctor,2780,_ZN4ksys3res25GParamListObjectEnemyRaceC2Ev 0x000000710118d378,BgparamlistObjectAttackInterval::ctor,564,_ZN4ksys3res30GParamListObjectAttackIntervalC2Ev 0x000000710118d5ac,BgparamlistObjectEnemyShown::ctor,404,_ZN4ksys3res26GParamListObjectEnemyShownC2Ev -0x000000710118d740,BgparamlistObjectBindBone::ctor,392, +0x000000710118d740,BgparamlistObjectBindBone::ctor,392,_ZN4ksys3res24GParamListObjectBindBoneC2Ev 0x000000710118d8c8,BgparamlistObjectAttack::ctor,900, 0x000000710118dc4c,BgparamlistObjectWeaponCommon::ctor,3288, 0x000000710118e924,BgparamlistObjectWeaponThrow::ctor,432, @@ -89152,7 +89152,7 @@ 0x00000071011a7bcc,sub_71011A7BCC,12,_ZNK4ksys3res25GParamListObjectEnemyRace7getNameEv 0x00000071011a7bd8,sub_71011A7BD8,12,_ZNK4ksys3res30GParamListObjectAttackInterval7getNameEv 0x00000071011a7be4,sub_71011A7BE4,12,_ZNK4ksys3res26GParamListObjectEnemyShown7getNameEv -0x00000071011a7bf0,sub_71011A7BF0,12, +0x00000071011a7bf0,sub_71011A7BF0,12,_ZNK4ksys3res24GParamListObjectBindBone7getNameEv 0x00000071011a7bfc,sub_71011A7BFC,12, 0x00000071011a7c08,sub_71011A7C08,12, 0x00000071011a7c14,sub_71011A7C14,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h new file mode 100644 index 00000000..be66c9cf --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h @@ -0,0 +1,28 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectBindBone : public GParamListObject { +public: + GParamListObjectBindBone(); + const char* getName() const override { return "BindBone"; } + + agl::utl::Parameter mBoneName; + agl::utl::Parameter mBoneOffset; + agl::utl::Parameter mBoneRotate; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectBindBone, 0xb0); + +inline GParamListObjectBindBone::GParamListObjectBindBone() { + auto* const obj = &mObj; + + mBoneName.init("", "BoneName", "", obj); + mBoneOffset.init({0.0, 0.0, 0.0}, "BoneOffset", "", obj); + mBoneRotate.init({0.0, 0.0, 0.0}, "BoneRotate", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 5dc27993..4ef2c335 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -4,6 +4,7 @@ #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" @@ -52,6 +53,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "AttackInterval", heap, dummy_list); add(archive.getRootList(), "EnemyShown", heap, dummy_list); + add(archive.getRootList(), "BindBone", heap, dummy_list); // TODO: the rest