From 359fb2685b8180642d6331f7c901060a7083d450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 13 Jan 2022 19:09:22 +0100 Subject: [PATCH] ksys/phys: Rename getMotionInfo to getMotionType for clarity --- data/uking_functions.csv | 4 ++-- src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp | 4 ++-- src/KingSystem/Physics/RigidBody/physMotionAccessor.h | 2 +- src/KingSystem/Physics/RigidBody/physRigidBody.cpp | 2 +- src/KingSystem/Physics/RigidBody/physRigidBody.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index bada212a..58292644 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -82981,7 +82981,7 @@ Address,Quality,Size,Name 0x0000007100f8d70c,U,000156,phys::RigidBody::getMotionAccessorType2 0x0000007100f8d7a8,U,000152,phys::RigidBody::motionAccessorType2Stuff2 0x0000007100f8d840,U,001156,phys::RigidBody::x_8 -0x0000007100f8dcc4,O,000056,_ZNK4ksys4phys9RigidBody13getMotionInfoEv +0x0000007100f8dcc4,O,000056,_ZNK4ksys4phys9RigidBody13getMotionTypeEv 0x0000007100f8dcfc,U,001044,phys::RigidBody::x_9 0x0000007100f8e110,U,000748,phys::RigidBody::x_10 0x0000007100f8e3fc,U,000816,phys::RigidBody::x_11 @@ -95372,7 +95372,7 @@ Address,Quality,Size,Name 0x00000071012afb20,O,000028,_ZN4ksys4phys14MotionAccessorC2EPNS0_9RigidBodyE 0x00000071012afb3c,O,000004,_ZN4ksys4phys14MotionAccessorD1Ev 0x00000071012afb40,O,000004,_ZN4ksys4phys14MotionAccessorD0Ev -0x00000071012afb44,O,000008,_ZNK4ksys4phys14MotionAccessor13getMotionInfoEv +0x00000071012afb44,O,000008,_ZNK4ksys4phys14MotionAccessor13getMotionTypeEv 0x00000071012afb4c,O,000008,_ZNK4ksys4phys14MotionAccessor18getRigidBodyMotionEv 0x00000071012afb54,O,000008,_ZN4ksys4phys14MotionAccessor13setMotionFlagENS0_9RigidBody10MotionFlagE 0x00000071012afb5c,O,000020,_ZNK4ksys4phys14MotionAccessor16hasMotionFlagSetENS0_9RigidBody10MotionFlagE diff --git a/src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp b/src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp index e131174f..4d7db2f4 100644 --- a/src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp +++ b/src/KingSystem/Physics/RigidBody/physMotionAccessor.cpp @@ -7,8 +7,8 @@ MotionAccessor::MotionAccessor(RigidBody* body) : mBody(body) {} MotionAccessor::~MotionAccessor() = default; -MotionType MotionAccessor::getMotionInfo() const { - return mBody->getMotionInfo(); +MotionType MotionAccessor::getMotionType() const { + return mBody->getMotionType(); } hkpMotion* MotionAccessor::getRigidBodyMotion() const { diff --git a/src/KingSystem/Physics/RigidBody/physMotionAccessor.h b/src/KingSystem/Physics/RigidBody/physMotionAccessor.h index fb44570f..43254d48 100644 --- a/src/KingSystem/Physics/RigidBody/physMotionAccessor.h +++ b/src/KingSystem/Physics/RigidBody/physMotionAccessor.h @@ -19,7 +19,7 @@ class MotionAccessor { public: explicit MotionAccessor(RigidBody* body); - MotionType getMotionInfo() const; + MotionType getMotionType() const; hkpMotion* getRigidBodyMotion() const; void setMotionFlag(RigidBody::MotionFlag flag); bool hasMotionFlagSet(RigidBody::MotionFlag flag) const; diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp index e5daf903..ac11cfad 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp +++ b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp @@ -75,7 +75,7 @@ void RigidBody::sub_7100F8D21C() { } } -MotionType RigidBody::getMotionInfo() const { +MotionType RigidBody::getMotionType() const { if (mMotionFlags.isOn(MotionFlag::Dynamic)) return MotionType::Dynamic; if (mMotionFlags.isOn(MotionFlag::Keyframed)) diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.h b/src/KingSystem/Physics/RigidBody/physRigidBody.h index 7e071d08..f796ba5e 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBody.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBody.h @@ -110,7 +110,7 @@ public: // 0x0000007100f8d840 void x_8(); - MotionType getMotionInfo() const; + MotionType getMotionType() const; // Motion functions // 0x0000007100f8dcfc