falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: ContactPointInfoEx -> ContactLayerContactPointInfo 

Turns out it's the equivalent to ContactLayerCollisionInfo.
This commit is contained in:
Léo Lam 2022-03-02 01:18:25 +01:00
parent 220cb53468
commit b2a66ca858
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
10 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/uking_functions.csv
View File

@ -84320,18 +84320,18 @@ Address,Quality,Size,Name
0x0000007100fcf854,O,000092,_ZNK4ksys4phys15ContactListener18getRuntimeTypeInfoEv 0x0000007100fcf854,O,000092,_ZNK4ksys4phys15ContactListener18getRuntimeTypeInfoEv
0x0000007100fcf8b0,O,000004,_ZN4ksys4phys15ContactListener3m11Ev 0x0000007100fcf8b0,O,000004,_ZN4ksys4phys15ContactListener3m11Ev
0x0000007100fcf8b4,O,000008,_ZN4ksys4phys15ContactListener3m15Ev 0x0000007100fcf8b4,O,000008,_ZN4ksys4phys15ContactListener3m15Ev
0x0000007100fcf8bc,O,000072,_ZN4ksys4phys18ContactPointInfoEx4makeEPN4sead4HeapEiiRKNS2_14SafeStringBaseIcEEiii 0x0000007100fcf8bc,O,000072,_ZN4ksys4phys21LayerContactPointInfo4makeEPN4sead4HeapEiiRKNS2_14SafeStringBaseIcEEiii
0x0000007100fcf904,O,000348,_ZN4ksys4phys18ContactPointInfoEx17registerLayerPairENS0_12ContactLayerES2_b 0x0000007100fcf904,O,000348,_ZN4ksys4phys21LayerContactPointInfo17registerLayerPairENS0_12ContactLayerES2_b
0x0000007100fcfa60,O,000024,_ZN4ksys4phys18ContactPointInfoEx4freeEPS1_ 0x0000007100fcfa60,O,000024,_ZN4ksys4phys21LayerContactPointInfo4freeEPS1_
0x0000007100fcfa78,O,000096,_ZN4ksys4phys18ContactPointInfoExC1ERKN4sead14SafeStringBaseIcEEiii 0x0000007100fcfa78,O,000096,_ZN4ksys4phys21LayerContactPointInfoC1ERKN4sead14SafeStringBaseIcEEiii
0x0000007100fcfad8,O,000004,_ZN4ksys4phys18ContactPointInfoExD1Ev 0x0000007100fcfad8,O,000004,_ZN4ksys4phys21LayerContactPointInfoD1Ev
0x0000007100fcfadc,O,000004,_ZN4ksys4phys18ContactPointInfoExD0Ev 0x0000007100fcfadc,O,000004,_ZN4ksys4phys21LayerContactPointInfoD0Ev
0x0000007100fcfae0,O,000300,_ZN4ksys4phys18ContactPointInfoEx11allocPointsEPN4sead4HeapEii 0x0000007100fcfae0,O,000300,_ZN4ksys4phys21LayerContactPointInfo11allocPointsEPN4sead4HeapEii
0x0000007100fcfc0c,O,000168,_ZN4ksys4phys18ContactPointInfoEx10freePointsEv 0x0000007100fcfc0c,O,000168,_ZN4ksys4phys21LayerContactPointInfo10freePointsEv
0x0000007100fcfcb4,O,000260,_ZNK4ksys4phys18ContactPointInfoEx8Iterator7getDataEPN4sead7Vector3IfEENS2_4ModeE 0x0000007100fcfcb4,O,000260,_ZNK4ksys4phys21LayerContactPointInfo8Iterator7getDataEPN4sead7Vector3IfEENS2_4ModeE
0x0000007100fcfdb8,O,000048,_ZNK4ksys4phys18ContactPointInfoEx8Iterator7getDataENS2_4ModeE 0x0000007100fcfdb8,O,000048,_ZNK4ksys4phys21LayerContactPointInfo8Iterator7getDataENS2_4ModeE
0x0000007100fcfde8,O,000068,_ZN4ksys4phys18ContactPointInfoEx8IteratorC1ERKN4sead6BufferIPNS0_12ContactPointEEEi 0x0000007100fcfde8,O,000068,_ZN4ksys4phys21LayerContactPointInfo8IteratorC1ERKN4sead6BufferIPNS0_12ContactPointEEEi
0x0000007100fcfe2c,O,000028,_ZN4ksys4phys18ContactPointInfoEx11IteratorEndC1ERKN4sead6BufferIPNS0_12ContactPointEEEi 0x0000007100fcfe2c,O,000028,_ZN4ksys4phys21LayerContactPointInfo11IteratorEndC1ERKN4sead6BufferIPNS0_12ContactPointEEEi
0x0000007100fcfe48,U,000112, 0x0000007100fcfe48,U,000112,
0x0000007100fcfeb8,U,000072, 0x0000007100fcfeb8,U,000072,
0x0000007100fcff00,U,000692, 0x0000007100fcff00,U,000692,
@ -93448,8 +93448,8 @@ Address,Quality,Size,Name
0x00000071012168c8,U,000052, 0x00000071012168c8,U,000052,
0x00000071012168fc,O,000008,_ZNK4ksys4phys6System21allocContactPointInfoEPN4sead4HeapEiRKNS2_14SafeStringBaseIcEEiii 0x00000071012168fc,O,000008,_ZNK4ksys4phys6System21allocContactPointInfoEPN4sead4HeapEiRKNS2_14SafeStringBaseIcEEiii
0x0000007101216904,O,000008,_ZNK4ksys4phys6System20freeContactPointInfoEPNS0_16ContactPointInfoE 0x0000007101216904,O,000008,_ZNK4ksys4phys6System20freeContactPointInfoEPNS0_16ContactPointInfoE
0x000000710121690c,O,000008,_ZNK4ksys4phys6System20allocContactPointsExEPN4sead4HeapEiiRKNS2_14SafeStringBaseIcEEiii 0x000000710121690c,O,000008,_ZNK4ksys4phys6System26allocLayerContactPointInfoEPN4sead4HeapEiiRKNS2_14SafeStringBaseIcEEiii
0x0000007101216914,U,000080,PhysicsMemSys::freeContactPoints2 0x0000007101216914,U,000080,ksys::phys::System::freeLayerContactPointInfo
0x0000007101216964,O,000008,_ZNK4ksys4phys6System24registerContactPointInfoEPNS0_16ContactPointInfoE 0x0000007101216964,O,000008,_ZNK4ksys4phys6System24registerContactPointInfoEPNS0_16ContactPointInfoE
0x000000710121696c,U,000008,PhysicsMemSys::x_3 0x000000710121696c,U,000008,PhysicsMemSys::x_3
0x0000007101216974,U,000048,PhysicsMemSys::x_2 0x0000007101216974,U,000048,PhysicsMemSys::x_2

Can't render this file because it is too large.

4
src/KingSystem/Physics/CMakeLists.txt
View File

@ -113,8 +113,8 @@ target_sources(uking PRIVATE
System/physContactMgr.h System/physContactMgr.h
System/physContactPointInfo.cpp System/physContactPointInfo.cpp
System/physContactPointInfo.h System/physContactPointInfo.h
System/physContactPointInfoEx.cpp System/physLayerContactPointInfo.cpp
System/physContactPointInfoEx.h System/physLayerContactPointInfo.h
System/physEntityGroupFilter.cpp System/physEntityGroupFilter.cpp
System/physEntityGroupFilter.h System/physEntityGroupFilter.h
System/physGroupFilter.cpp System/physGroupFilter.cpp

4
src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.cpp
View File

@ -27,7 +27,7 @@ RigidBodyRequestMgr::~RigidBodyRequestMgr() {
mMotionAccessors.freeBuffer(); mMotionAccessors.freeBuffer();
if (mContactPoints) { if (mContactPoints) {
ksys::phys::ContactPointInfoEx::free(mContactPoints); ksys::phys::LayerContactPointInfo::free(mContactPoints);
mContactPoints = nullptr; mContactPoints = nullptr;
} }
} }
@ -62,7 +62,7 @@ void RigidBodyRequestMgr::init(sead::Heap* heap) {
mNumEntitiesInWorld = 0; mNumEntitiesInWorld = 0;
mContactPoints = mContactPoints =
ContactPointInfoEx::make(heap, 0x1000, 11, "RigidBodyRequestMgr::Water", 0, 0, 0); LayerContactPointInfo::make(heap, 0x1000, 11, "RigidBodyRequestMgr::Water", 0, 0, 0);
mContactPoints->setCallback(&mCallback); mContactPoints->setCallback(&mCallback);
mContactPoints->set30(1); mContactPoints->set30(1);

6
src/KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h
View File

@ -9,7 +9,7 @@
#include <prim/seadDelegate.h> #include <prim/seadDelegate.h>
#include <thread/seadAtomic.h> #include <thread/seadAtomic.h>
#include <thread/seadCriticalSection.h> #include <thread/seadCriticalSection.h>
#include "KingSystem/Physics/System/physContactPointInfoEx.h" #include "KingSystem/Physics/System/physLayerContactPointInfo.h"
#include "KingSystem/Physics/physDefines.h" #include "KingSystem/Physics/physDefines.h"
#include "KingSystem/Utils/Container/LockFreeQueue.h" #include "KingSystem/Utils/Container/LockFreeQueue.h"
#include "KingSystem/Utils/Types.h" #include "KingSystem/Utils/Types.h"
@ -84,7 +84,7 @@ private:
}; };
KSYS_CHECK_SIZE_NX150(Unk6, 0x48); KSYS_CHECK_SIZE_NX150(Unk6, 0x48);
struct PointCallback : ContactPointInfoEx::Callback { struct PointCallback : LayerContactPointInfo::Callback {
explicit PointCallback(RigidBodyRequestMgr* mgr_) : mgr(mgr_) {} explicit PointCallback(RigidBodyRequestMgr* mgr_) : mgr(mgr_) {}
void invoke(void* arg) override { mgr->someFunction2(arg); } void invoke(void* arg) override { mgr->someFunction2(arg); }
@ -112,7 +112,7 @@ private:
sead::Atomic<u32> _130; sead::Atomic<u32> _130;
sead::Buffer<Unk4> _138; sead::Buffer<Unk4> _138;
u32 mNumEntitiesInWorld{}; u32 mNumEntitiesInWorld{};
ContactPointInfoEx* mContactPoints{}; LayerContactPointInfo* mContactPoints{};
sead::SafeArray<sead::CriticalSection, NumRigidBodyBuffers> mCriticalSections; sead::SafeArray<sead::CriticalSection, NumRigidBodyBuffers> mCriticalSections;
sead::CriticalSection mCS; sead::CriticalSection mCS;
float _218 = 1.0; float _218 = 1.0;

10
src/KingSystem/Physics/System/physContactMgr.cpp
View File

@ -1,9 +1,9 @@
#include "KingSystem/Physics/System/physContactMgr.h" #include "KingSystem/Physics/System/physContactMgr.h"
#include <prim/seadScopedLock.h> #include <prim/seadScopedLock.h>
#include "KingSystem/Physics/System/physContactPointInfo.h" #include "KingSystem/Physics/System/physContactPointInfo.h"
#include "KingSystem/Physics/System/physContactPointInfoEx.h"
#include "KingSystem/Physics/System/physEntityGroupFilter.h" #include "KingSystem/Physics/System/physEntityGroupFilter.h"
#include "KingSystem/Physics/System/physGroupFilter.h" #include "KingSystem/Physics/System/physGroupFilter.h"
#include "KingSystem/Physics/System/physLayerContactPointInfo.h"
#include "KingSystem/Physics/System/physSystem.h" #include "KingSystem/Physics/System/physSystem.h"
namespace ksys::phys { namespace ksys::phys {
@ -84,10 +84,10 @@ ContactPointInfo* ContactMgr::allocContactPoints(sead::Heap* heap, int num,
return points; return points;
} }
ContactPointInfoEx* ContactMgr::allocContactPointsEx(sead::Heap* heap, int num, int num2, LayerContactPointInfo* ContactMgr::allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, const sead::SafeString& name, int a, int b,
int c) { int c) {
auto* points = new (heap) ContactPointInfoEx(name, a, b, c); auto* points = new (heap) LayerContactPointInfo(name, a, b, c);
points->allocPoints(heap, num, num2); points->allocPoints(heap, num, num2);
registerContactPointInfo(points); registerContactPointInfo(points);
return points; return points;

6
src/KingSystem/Physics/System/physContactMgr.h
View File

@ -27,7 +27,7 @@ enum class IsIndoorStage;
class ContactPointInfoBase; class ContactPointInfoBase;
class RigidBody; class RigidBody;
class ContactPointInfo; class ContactPointInfo;
class ContactPointInfoEx; class LayerContactPointInfo;
struct ContactInfoTable { struct ContactInfoTable {
struct Receiver : agl::utl::ParameterObj { struct Receiver : agl::utl::ParameterObj {
@ -83,8 +83,8 @@ public:
ContactPointInfo* allocContactPoints(sead::Heap* heap, int num, const sead::SafeString& name, ContactPointInfo* allocContactPoints(sead::Heap* heap, int num, const sead::SafeString& name,
int a, int b, int c); int a, int b, int c);
ContactPointInfoEx* allocContactPointsEx(sead::Heap* heap, int num, int num2, LayerContactPointInfo* allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c); const sead::SafeString& name, int a, int b, int c);
void registerContactPointInfo(ContactPointInfoBase* info); void registerContactPointInfo(ContactPointInfoBase* info);
void freeContactPointInfo(ContactPointInfoBase* info); void freeContactPointInfo(ContactPointInfoBase* info);

37
src/KingSystem/Physics/System/physContactPointInfoEx.cpp → src/KingSystem/Physics/System/physLayerContactPointInfo.cpp
View File

@ -1,19 +1,21 @@
#include "KingSystem/Physics/System/physContactPointInfoEx.h" #include "KingSystem/Physics/System/physLayerContactPointInfo.h"
#include "KingSystem/Physics/System/physContactMgr.h" #include "KingSystem/Physics/System/physContactMgr.h"
#include "KingSystem/Physics/System/physSystem.h" #include "KingSystem/Physics/System/physSystem.h"
namespace ksys::phys { namespace ksys::phys {
ContactPointInfoEx* ContactPointInfoEx::make(sead::Heap* heap, int num, int num2, LayerContactPointInfo* LayerContactPointInfo::make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c) { const sead::SafeString& name, int a, int b,
return System::instance()->allocContactPointsEx(heap, num, num2, name, a, b, c); int c) {
return System::instance()->allocLayerContactPointInfo(heap, num, num2, name, a, b, c);
} }
void ContactPointInfoEx::free(ContactPointInfoEx* instance) { void LayerContactPointInfo::free(LayerContactPointInfo* instance) {
System::instance()->freeContactPointInfoEx(instance); System::instance()->freeLayerContactPointInfo(instance);
} }
bool ContactPointInfoEx::registerLayerPair(ContactLayer layer1, ContactLayer layer2, bool enabled) { bool LayerContactPointInfo::registerLayerPair(ContactLayer layer1, ContactLayer layer2,
bool enabled) {
if (mLayerType == ContactLayerType::Invalid) if (mLayerType == ContactLayerType::Invalid)
mLayerType = getContactLayerType(layer1); mLayerType = getContactLayerType(layer1);
@ -32,7 +34,7 @@ bool ContactPointInfoEx::registerLayerPair(ContactLayer layer1, ContactLayer lay
return true; return true;
} }
bool ContactPointInfoEx::isPairUnknown(ContactLayer layer1, ContactLayer layer2) const { bool LayerContactPointInfo::isPairUnknown(ContactLayer layer1, ContactLayer layer2) const {
for (int i = 0; i < mLayerEntries.size(); ++i) { for (int i = 0; i < mLayerEntries.size(); ++i) {
const auto* entry = mLayerEntries[i]; const auto* entry = mLayerEntries[i];
if (int(layer1) == entry->layer1 && int(layer2) == entry->layer2) if (int(layer1) == entry->layer1 && int(layer2) == entry->layer2)
@ -43,23 +45,23 @@ bool ContactPointInfoEx::isPairUnknown(ContactLayer layer1, ContactLayer layer2)
return true; return true;
} }
ContactPointInfoEx::ContactPointInfoEx(const sead::SafeString& name, int a, int b, int c) LayerContactPointInfo::LayerContactPointInfo(const sead::SafeString& name, int a, int b, int c)
: ContactPointInfoBase(name, a, b, c) {} : ContactPointInfoBase(name, a, b, c) {}
ContactPointInfoEx::~ContactPointInfoEx() = default; LayerContactPointInfo::~LayerContactPointInfo() = default;
void ContactPointInfoEx::allocPoints(sead::Heap* heap, int num, int num2) { void LayerContactPointInfo::allocPoints(sead::Heap* heap, int num, int num2) {
mPoints.allocBufferAssert(num, heap); mPoints.allocBufferAssert(num, heap);
mLayerEntries.allocBuffer(num2, heap); mLayerEntries.allocBuffer(num2, heap);
} }
void ContactPointInfoEx::freePoints() { void LayerContactPointInfo::freePoints() {
mPoints.freeBuffer(); mPoints.freeBuffer();
mLayerEntries.freeBuffer(); mLayerEntries.freeBuffer();
} }
void ContactPointInfoEx::Iterator::getData(sead::Vector3f* out, void LayerContactPointInfo::Iterator::getData(sead::Vector3f* out,
ContactPointInfoEx::Iterator::Mode mode) const { LayerContactPointInfo::Iterator::Mode mode) const {
const float scale = getPoint()->scale; const float scale = getPoint()->scale;
out->e = getPoint()->_10.e; out->e = getPoint()->_10.e;
@ -87,13 +89,13 @@ void ContactPointInfoEx::Iterator::getData(sead::Vector3f* out,
} }
sead::Vector3f sead::Vector3f
ContactPointInfoEx::Iterator::getData(ContactPointInfoEx::Iterator::Mode mode) const { LayerContactPointInfo::Iterator::getData(LayerContactPointInfo::Iterator::Mode mode) const {
sead::Vector3f out; sead::Vector3f out;
getData(&out, mode); getData(&out, mode);
return out; return out;
} }
ContactPointInfoEx::Iterator::Iterator(const ContactPointInfoEx::Points& points, int count) LayerContactPointInfo::Iterator::Iterator(const LayerContactPointInfo::Points& points, int count)
: mPoints(points.getBufferPtr()), mPointsNum(count), mPointsStart(points.getBufferPtr()) { : mPoints(points.getBufferPtr()), mPointsNum(count), mPointsStart(points.getBufferPtr()) {
for (int i = 0; i != count; ++i) { for (int i = 0; i != count; ++i) {
if (!mPoints[i]->flags.isOn(ContactPoint::Flag::_1)) if (!mPoints[i]->flags.isOn(ContactPoint::Flag::_1))
@ -102,7 +104,8 @@ ContactPointInfoEx::Iterator::Iterator(const ContactPointInfoEx::Points& points,
} }
} }
ContactPointInfoEx::IteratorEnd::IteratorEnd(const ContactPointInfoEx::Points& points, int count) LayerContactPointInfo::IteratorEnd::IteratorEnd(const LayerContactPointInfo::Points& points,
int count)
: mIdx(count), mPoints(points.getBufferPtr()), mPointsNum(count), : mIdx(count), mPoints(points.getBufferPtr()), mPointsNum(count),
mPointsStart(points.getBufferPtr()) {} mPointsStart(points.getBufferPtr()) {}

14
src/KingSystem/Physics/System/physContactPointInfoEx.h → src/KingSystem/Physics/System/physLayerContactPointInfo.h
View File

@ -12,7 +12,7 @@ namespace ksys::phys {
struct ContactPoint; struct ContactPoint;
class ContactPointInfoEx : public ContactPointInfoBase { class LayerContactPointInfo : public ContactPointInfoBase {
public: public:
using Points = sead::Buffer<ContactPoint*>; using Points = sead::Buffer<ContactPoint*>;
@ -83,12 +83,12 @@ public:
// FIXME: figure out the types // FIXME: figure out the types
using Callback = sead::IDelegate1<void*>; using Callback = sead::IDelegate1<void*>;
static ContactPointInfoEx* make(sead::Heap* heap, int num, int num2, static LayerContactPointInfo* make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c); const sead::SafeString& name, int a, int b, int c);
static void free(ContactPointInfoEx* instance); static void free(LayerContactPointInfo* instance);
ContactPointInfoEx(const sead::SafeString& name, int a, int b, int c); LayerContactPointInfo(const sead::SafeString& name, int a, int b, int c);
~ContactPointInfoEx() override; ~LayerContactPointInfo() override;
void freePoints() override; void freePoints() override;
virtual void allocPoints(sead::Heap* heap, int num, int num2); virtual void allocPoints(sead::Heap* heap, int num, int num2);
@ -112,6 +112,6 @@ private:
ContactLayerType mLayerType = ContactLayerType::Invalid; ContactLayerType mLayerType = ContactLayerType::Invalid;
Callback* mCallback = nullptr; Callback* mCallback = nullptr;
}; };
KSYS_CHECK_SIZE_NX150(ContactPointInfoEx, 0x88); KSYS_CHECK_SIZE_NX150(LayerContactPointInfo, 0x88);
} // namespace ksys::phys } // namespace ksys::phys

6
src/KingSystem/Physics/System/physSystem.cpp
View File

@ -57,9 +57,9 @@ void System::freeContactPointInfo(ContactPointInfo* info) const {
mContactMgr->freeContactPointInfo(info); mContactMgr->freeContactPointInfo(info);
} }
ContactPointInfoEx* System::allocContactPointsEx(sead::Heap* heap, int num, int num2, LayerContactPointInfo* System::allocLayerContactPointInfo(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, const sead::SafeString& name, int a, int b,
int c) const { int c) const {
return mContactMgr->allocContactPointsEx(heap, num, num2, name, a, b, c); return mContactMgr->allocContactPointsEx(heap, num, num2, name, a, b, c);
} }

12
src/KingSystem/Physics/System/physSystem.h
View File

@ -16,7 +16,7 @@ class MaterialTable;
class RigidBody; class RigidBody;
class RigidBodyRequestMgr; class RigidBodyRequestMgr;
class ContactPointInfo; class ContactPointInfo;
class ContactPointInfoEx; class LayerContactPointInfo;
class SystemData; class SystemData;
class SystemGroupHandler; class SystemGroupHandler;
@ -47,16 +47,16 @@ public:
int a, int b, int c) const; int a, int b, int c) const;
void freeContactPointInfo(ContactPointInfo* info) const; void freeContactPointInfo(ContactPointInfo* info) const;
ContactPointInfoEx* allocContactPointsEx(sead::Heap* heap, int num, int num2, LayerContactPointInfo* allocLayerContactPointInfo(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, const sead::SafeString& name, int a, int b,
int c) const; int c) const;
void freeContactPointInfoEx(ContactPointInfoEx* info) const; void freeLayerContactPointInfo(LayerContactPointInfo* info) const;
void registerContactPointInfo(ContactPointInfo* info) const; void registerContactPointInfo(ContactPointInfo* info) const;
// 0x000000710121696c // 0x000000710121696c
void registerCollisionInfo(CollisionInfo* info) const; void registerCollisionInfo(CollisionInfo* info) const;
// 0x0000007101216974 // 0x0000007101216974
void registerContactPointLayerPair(ContactPointInfoEx* info, ContactLayer layer1, void registerContactPointLayerPair(LayerContactPointInfo* info, ContactLayer layer1,
ContactLayer layer2, bool enabled); ContactLayer layer2, bool enabled);
// 0x00000071012169a4 // 0x00000071012169a4