mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-08-17 05:01:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: ContactPointInfoEx -> ContactLayerContactPointInfo

Browse Source 
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
10 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/Physics/System/physContactMgr.cpp
+5 -5
View File
@@ -1,9 +1,9 @@
#include "KingSystem/Physics/System/physContactMgr.h"
#include <prim/seadScopedLock.h>
#include "KingSystem/Physics/System/physContactPointInfo.h"
#include "KingSystem/Physics/System/physContactPointInfoEx.h"
#include "KingSystem/Physics/System/physEntityGroupFilter.h"
#include "KingSystem/Physics/System/physGroupFilter.h"
#include "KingSystem/Physics/System/physLayerContactPointInfo.h"
#include "KingSystem/Physics/System/physSystem.h"
namespace ksys::phys {
@@ -84,10 +84,10 @@ ContactPointInfo* ContactMgr::allocContactPoints(sead::Heap* heap, int num,
return points;
}
ContactPointInfoEx* ContactMgr::allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) {
auto* points = new (heap) ContactPointInfoEx(name, a, b, c);
LayerContactPointInfo* ContactMgr::allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) {
auto* points = new (heap) LayerContactPointInfo(name, a, b, c);
points->allocPoints(heap, num, num2);
registerContactPointInfo(points);
return points;
src/KingSystem/Physics/System/physContactMgr.h
+3 -3
View File
@@ -27,7 +27,7 @@ enum class IsIndoorStage;
class ContactPointInfoBase;
class RigidBody;
class ContactPointInfo;
class ContactPointInfoEx;
class LayerContactPointInfo;
struct ContactInfoTable {
struct Receiver : agl::utl::ParameterObj {
@@ -83,8 +83,8 @@ public:
ContactPointInfo* allocContactPoints(sead::Heap* heap, int num, const sead::SafeString& name,
int a, int b, int c);
ContactPointInfoEx* allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c);
LayerContactPointInfo* allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c);
void registerContactPointInfo(ContactPointInfoBase* info);
void freeContactPointInfo(ContactPointInfoBase* info);
src/KingSystem/Physics/System/physContactPointInfoEx.cpp → src/KingSystem/Physics/System/physLayerContactPointInfo.cpp
+20 -17
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/physSystem.h"
namespace ksys::phys {
ContactPointInfoEx* ContactPointInfoEx::make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c) {
return System::instance()->allocContactPointsEx(heap, num, num2, name, a, b, c);
LayerContactPointInfo* LayerContactPointInfo::make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) {
return System::instance()->allocLayerContactPointInfo(heap, num, num2, name, a, b, c);
}
void ContactPointInfoEx::free(ContactPointInfoEx* instance) {
System::instance()->freeContactPointInfoEx(instance);
void LayerContactPointInfo::free(LayerContactPointInfo* 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)
mLayerType = getContactLayerType(layer1);
@@ -32,7 +34,7 @@ bool ContactPointInfoEx::registerLayerPair(ContactLayer layer1, ContactLayer lay
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) {
const auto* entry = mLayerEntries[i];
if (int(layer1) == entry->layer1 && int(layer2) == entry->layer2)
@@ -43,23 +45,23 @@ bool ContactPointInfoEx::isPairUnknown(ContactLayer layer1, ContactLayer layer2)
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) {}
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);
mLayerEntries.allocBuffer(num2, heap);
}
void ContactPointInfoEx::freePoints() {
void LayerContactPointInfo::freePoints() {
mPoints.freeBuffer();
mLayerEntries.freeBuffer();
}
void ContactPointInfoEx::Iterator::getData(sead::Vector3f* out,
ContactPointInfoEx::Iterator::Mode mode) const {
void LayerContactPointInfo::Iterator::getData(sead::Vector3f* out,
LayerContactPointInfo::Iterator::Mode mode) const {
const float scale = getPoint()->scale;
out->e = getPoint()->_10.e;
@@ -87,13 +89,13 @@ void ContactPointInfoEx::Iterator::getData(sead::Vector3f* out,
}
sead::Vector3f
ContactPointInfoEx::Iterator::getData(ContactPointInfoEx::Iterator::Mode mode) const {
LayerContactPointInfo::Iterator::getData(LayerContactPointInfo::Iterator::Mode mode) const {
sead::Vector3f out;
getData(&out, mode);
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()) {
for (int i = 0; i != count; ++i) {
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),
mPointsStart(points.getBufferPtr()) {}
src/KingSystem/Physics/System/physContactPointInfoEx.h → src/KingSystem/Physics/System/physLayerContactPointInfo.h
+7 -7
View File
@@ -12,7 +12,7 @@ namespace ksys::phys {
struct ContactPoint;
class ContactPointInfoEx : public ContactPointInfoBase {
class LayerContactPointInfo : public ContactPointInfoBase {
public:
using Points = sead::Buffer<ContactPoint*>;
@@ -83,12 +83,12 @@ public:
// FIXME: figure out the types
using Callback = sead::IDelegate1<void*>;
static ContactPointInfoEx* make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c);
static void free(ContactPointInfoEx* instance);
static LayerContactPointInfo* make(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b, int c);
static void free(LayerContactPointInfo* instance);
ContactPointInfoEx(const sead::SafeString& name, int a, int b, int c);
~ContactPointInfoEx() override;
LayerContactPointInfo(const sead::SafeString& name, int a, int b, int c);
~LayerContactPointInfo() override;
void freePoints() override;
virtual void allocPoints(sead::Heap* heap, int num, int num2);
@@ -112,6 +112,6 @@ private:
ContactLayerType mLayerType = ContactLayerType::Invalid;
Callback* mCallback = nullptr;
};
KSYS_CHECK_SIZE_NX150(ContactPointInfoEx, 0x88);
KSYS_CHECK_SIZE_NX150(LayerContactPointInfo, 0x88);
} // namespace ksys::phys
src/KingSystem/Physics/System/physSystem.cpp
+3 -3
View File
@@ -57,9 +57,9 @@ void System::freeContactPointInfo(ContactPointInfo* info) const {
mContactMgr->freeContactPointInfo(info);
}
ContactPointInfoEx* System::allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) const {
LayerContactPointInfo* System::allocLayerContactPointInfo(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) const {
return mContactMgr->allocContactPointsEx(heap, num, num2, name, a, b, c);
}
src/KingSystem/Physics/System/physSystem.h
+6 -6
View File
@@ -16,7 +16,7 @@ class MaterialTable;
class RigidBody;
class RigidBodyRequestMgr;
class ContactPointInfo;
class ContactPointInfoEx;
class LayerContactPointInfo;
class SystemData;
class SystemGroupHandler;
@@ -47,16 +47,16 @@ public:
int a, int b, int c) const;
void freeContactPointInfo(ContactPointInfo* info) const;
ContactPointInfoEx* allocContactPointsEx(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) const;
void freeContactPointInfoEx(ContactPointInfoEx* info) const;
LayerContactPointInfo* allocLayerContactPointInfo(sead::Heap* heap, int num, int num2,
const sead::SafeString& name, int a, int b,
int c) const;
void freeLayerContactPointInfo(LayerContactPointInfo* info) const;
void registerContactPointInfo(ContactPointInfo* info) const;
// 0x000000710121696c
void registerCollisionInfo(CollisionInfo* info) const;
// 0x0000007101216974
void registerContactPointLayerPair(ContactPointInfoEx* info, ContactLayer layer1,
void registerContactPointLayerPair(LayerContactPointInfo* info, ContactLayer layer1,
ContactLayer layer2, bool enabled);
// 0x00000071012169a4