diff --git a/data/uking_functions.csv b/data/uking_functions.csv index afbe355b..55573207 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -64816,16 +64816,16 @@ 0x0000007100b4e618,sub_7100B4E618,8, 0x0000007100b4e620,sub_7100B4E620,12, 0x0000007100b4e62c,_ZNK3agl3utl9ParameterIN4sead4QuatIfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE,232, -0x0000007100b4e714,sub_7100B4E714,20, -0x0000007100b4e728,j__ZdlPv_642,4, -0x0000007100b4e72c,sub_7100B4E72C,8, -0x0000007100b4e734,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv_0,48, -0x0000007100b4e764,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv,48, -0x0000007100b4e794,sub_7100B4E794,8, -0x0000007100b4e79c,sub_7100B4E79C,8, -0x0000007100b4e7a4,sub_7100B4E7A4,8, -0x0000007100b4e7ac,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE16calcBinarizeSizeEv,148, -0x0000007100b4e840,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE,136, +0x0000007100b4e714,sub_7100B4E714,20,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEED1Ev +0x0000007100b4e728,j__ZdlPv_642,4,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEED0Ev +0x0000007100b4e72c,sub_7100B4E72C,8,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE16getParameterTypeEv +0x0000007100b4e734,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv,48,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv +0x0000007100b4e764,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv,48,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE3ptrEv +0x0000007100b4e794,sub_7100B4E794,8,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE7typePtrEv +0x0000007100b4e79c,sub_7100B4E79C,8,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE7typePtrEv +0x0000007100b4e7a4,sub_7100B4E7A4,8,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE4sizeEv +0x0000007100b4e7ac,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE16calcBinarizeSizeEv,148,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE16calcBinarizeSizeEv +0x0000007100b4e840,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE,136,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4e8c8,_ZN4sead10StrTreeMapILi256ENS_13FixedPtrArrayINS_8PtrArrayIN4Game3Cmp24RailableStateAnimHandler8AnimDataEEELi2EEEE4NodeC2ERKNS_14SafeStringBaseIcEERKS8_PS9_,412, 0x0000007100b4ea64,sub_7100B4EA64,20, 0x0000007100b4ea78,j__ZdlPv_643,4, @@ -69727,7 +69727,7 @@ 0x0000007100c4f408,sub_7100C4F408,8, 0x0000007100c4f410,sub_7100C4F410,840, 0x0000007100c4f758,_ZN4gsys14ParticleConfigC2Ev,2596, -0x0000007100c5017c,_ZN4sead15FixedSafeStringILi47EEaSERKNS_14SafeStringBaseIcEE,400, +0x0000007100c5017c,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEEC1ERKS4_RKNS2_14SafeStringBaseIcEESB_PNS0_13IParameterObjE,400,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi64EEEEC1ERKS4_RKNS2_14SafeStringBaseIcEESB_PNS0_13IParameterObjE? 0x0000007100c5030c,_ZN4gsys14ParticleConfig12applyResouceEPKv,64, 0x0000007100c5034c,sub_7100C5034C,264, 0x0000007100c50454,_ZN4gsys14ParticleConfig10initializeEPN4sead4HeapES3_,8, @@ -94680,7 +94680,7 @@ 0x000000710127e738,sub_710127E738,296, 0x000000710127e860,sub_710127E860,36, 0x000000710127e884,sub_710127E884,680, -0x000000710127eb2c,sub_710127EB2C,784, +0x000000710127eb2c,sub_710127EB2C,784,_ZN4ksys3chm5RigidC1Ev 0x000000710127ee3c,sub_710127EE3C,8, 0x000000710127ee44,sub_710127EE44,32, 0x000000710127ee64,sub_710127EE64,36, @@ -94727,8 +94727,8 @@ 0x000000710127f40c,sub_710127F40C,36, 0x000000710127f430,sub_710127F430,36, 0x000000710127f454,sub_710127F454,36, -0x000000710127f478,sub_710127F478,56, -0x000000710127f4b0,j__ZdlPv_1277,4, +0x000000710127f478,sub_710127F478,56,_ZN4ksys3chm5RigidD2Ev +0x000000710127f4b0,j__ZdlPv_1277,4,_ZN4ksys3chm5RigidD0Ev 0x000000710127f4b4,EventMgr1Struct1::ctor,200, 0x000000710127f57c,sub_710127F57C,20, 0x000000710127f590,j__ZdlPv_1278,4, diff --git a/src/KingSystem/Chemical/CMakeLists.txt b/src/KingSystem/Chemical/CMakeLists.txt index 5f7253dc..2a1e3268 100644 --- a/src/KingSystem/Chemical/CMakeLists.txt +++ b/src/KingSystem/Chemical/CMakeLists.txt @@ -1,4 +1,6 @@ target_sources(uking PRIVATE chmShape.cpp chmShape.h + chmRigid.cpp + chmRigid.h ) diff --git a/src/KingSystem/Chemical/chmRigid.cpp b/src/KingSystem/Chemical/chmRigid.cpp new file mode 100644 index 00000000..a268bb55 --- /dev/null +++ b/src/KingSystem/Chemical/chmRigid.cpp @@ -0,0 +1,12 @@ +#include "KingSystem/Chemical/chmRigid.h" + +namespace ksys::chm { + +Rigid::Rigid() + : attribute(0, "attribute", "フラグ", this), + rigid_set_name({""}, "rigid_set_name", "剛体セット名", this), + rigid_name({""}, "rigid_name", "剛体名", this), volume(1.0, "volume", "直指定体積", this), + mass(1.0, "mass", "直指定質量", this), + burn_out_time(0.0, "burn_out_time", "燃え尽き時間", this) {} + +} // namespace ksys::chm diff --git a/src/KingSystem/Chemical/chmRigid.h b/src/KingSystem/Chemical/chmRigid.h new file mode 100644 index 00000000..16e10297 --- /dev/null +++ b/src/KingSystem/Chemical/chmRigid.h @@ -0,0 +1,30 @@ +#pragma once + +#include +#include +#include "KingSystem/Utils/Types.h" + +namespace ksys::chm { + +class Rigid : public agl::utl::IParameterObj { +public: + Rigid(); + + u32 getAttribute() const { return attribute.ref(); } + const sead::SafeString& getRigidSetName() const { return rigid_set_name.ref(); } + const sead::SafeString& getRigidName() const { return rigid_name.ref(); } + float getVolume() const { return volume.ref(); } + float getMass() const { return mass.ref(); } + float getBurnOutTime() const { return burn_out_time.ref(); } + +private: + agl::utl::Parameter attribute; + agl::utl::Parameter> rigid_set_name; + agl::utl::Parameter> rigid_name; + agl::utl::Parameter volume; + agl::utl::Parameter mass; + agl::utl::Parameter burn_out_time; +}; +KSYS_CHECK_SIZE_NX150(Rigid, 0x190); + +} // namespace ksys::chm