diff --git a/CMakeLists.txt b/CMakeLists.txt index 72793ea3..5974f788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ add_executable(uking src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h + src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.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 8f32fe36..00ca5ca4 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -89079,7 +89079,7 @@ 0x0000007101191fe4,BgparamlistObjectMasterSword::ctor,772,_ZN4ksys3res27GParamListObjectMasterSwordC2Ev 0x00000071011922e8,BgparamlistObjectGuardianMiniWeapon::ctor,608,_ZN4ksys3res34GParamListObjectGuardianMiniWeaponC2Ev 0x0000007101192548,BgparamlistObjectPlayer::ctor,11236,_ZN4ksys3res22GParamListObjectPlayerC2Ev -0x000000710119512c,BgparamlistObjectCamera::ctor,884, +0x000000710119512c,BgparamlistObjectCamera::ctor,884,_ZN4ksys3res22GParamListObjectCameraC2Ev 0x00000071011954a0,BgparamlistObjectGrab::ctor,1188, 0x0000007101195944,BgparamlistObjectArmor::ctor,700, 0x0000007101195c00,BgparamlistObjectArmorEffect::ctor,540, @@ -89167,7 +89167,7 @@ 0x00000071011a7c80,sub_71011A7C80,12,_ZNK4ksys3res27GParamListObjectMasterSword7getNameEv 0x00000071011a7c8c,sub_71011A7C8C,12,_ZNK4ksys3res34GParamListObjectGuardianMiniWeapon7getNameEv 0x00000071011a7c98,sub_71011A7C98,12,_ZNK4ksys3res22GParamListObjectPlayer7getNameEv -0x00000071011a7ca4,sub_71011A7CA4,12, +0x00000071011a7ca4,sub_71011A7CA4,12,_ZNK4ksys3res22GParamListObjectCamera7getNameEv 0x00000071011a7cb0,sub_71011A7CB0,12, 0x00000071011a7cbc,sub_71011A7CBC,12, 0x00000071011a7cc8,sub_71011A7CC8,12, diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h new file mode 100644 index 00000000..3e1e1eeb --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h @@ -0,0 +1,44 @@ +#pragma once + +#include +#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::res { + +class GParamListObjectCamera : public GParamListObject { +public: + GParamListObjectCamera(); + const char* getName() const override { return "Camera"; } + + agl::utl::Parameter mDefaultConnectScaleAfterEvent; + agl::utl::Parameter mLatConnectRateAfterEvent; + agl::utl::Parameter mLngConnectRateAfterEvent; + agl::utl::Parameter mDistConnectRateAfterEvent; + agl::utl::Parameter mFovyConnectRateAfterEvent; + agl::utl::Parameter mConnectAfterEventMin; + agl::utl::Parameter mConnectAfterEventMax; + agl::utl::Parameter mRoofGradientNearHighWeight; + agl::utl::Parameter mRoofGradientFarHighWeight; + agl::utl::Parameter mRoofGradientNearLowWeight; + agl::utl::Parameter mRoofGradientFarLowWeight; +}; +KSYS_CHECK_SIZE_NX150(GParamListObjectCamera, 0x198); + +inline GParamListObjectCamera::GParamListObjectCamera() { + auto* const obj = &mObj; + + mDefaultConnectScaleAfterEvent.init(1.0, "DefaultConnectScaleAfterEvent", "", obj); + mLatConnectRateAfterEvent.init(1.5, "LatConnectRateAfterEvent", "", obj); + mLngConnectRateAfterEvent.init(0.75, "LngConnectRateAfterEvent", "", obj); + mDistConnectRateAfterEvent.init(3.0, "DistConnectRateAfterEvent", "", obj); + mFovyConnectRateAfterEvent.init(0.0, "FovyConnectRateAfterEvent", "", obj); + mConnectAfterEventMin.init(30.0, "ConnectAfterEventMin", "", obj); + mConnectAfterEventMax.init(1000.0, "ConnectAfterEventMax", "", obj); + mRoofGradientNearHighWeight.init(0.0, "RoofGradientNearHighWeight", "", obj); + mRoofGradientFarHighWeight.init(0.0, "RoofGradientFarHighWeight", "", obj); + mRoofGradientNearLowWeight.init(0.0, "RoofGradientNearLowWeight", "", obj); + mRoofGradientFarLowWeight.init(0.0, "RoofGradientFarLowWeight", "", obj); +} + +} // namespace ksys::res diff --git a/src/KingSystem/Resource/resResourceGParamList.cpp b/src/KingSystem/Resource/resResourceGParamList.cpp index 1bb47b75..d491a2c4 100644 --- a/src/KingSystem/Resource/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/resResourceGParamList.cpp @@ -7,6 +7,7 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h" +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h" @@ -83,6 +84,7 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { add(archive.getRootList(), "GuardianMiniWeapon", heap, dummy_list); add(archive.getRootList(), "Player", heap, dummy_list); + add(archive.getRootList(), "Camera", heap, dummy_list); // TODO: the rest