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

ksys/phys: Add RigidBodyRequestMgr::calc1

This commit is contained in:
Léo Lam 2022-03-26 12:54:14 +01:00
parent 783e6a510f
commit b3c9e97e00
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
8 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/uking_functions.csv
View File

@ -83134,7 +83134,7 @@ Address,Quality,Size,Name
0x0000007100f96578,O,000008,_ZN4ksys4phys9RigidBody3m11Ev
0x0000007100f96580,O,000240,_ZN4ksys4phys9RigidBody21onMaxPositionExceededEv
0x0000007100f96670,O,000144,_ZN4ksys4phys9RigidBody7getNameEv
0x0000007100f96700,O,000068,_ZNK4ksys4phys9RigidBody11logPositionEv
0x0000007100f96700,O,000068,_ZNK4ksys4phys9RigidBody9onImpulseEPS1_f
0x0000007100f96744,O,000176,_ZNK4ksys4phys9RigidBody14getAabbInLocalEPN4sead9BoundBox3IfEE
0x0000007100f967f4,m,000428,_ZNK4ksys4phys9RigidBody14getAabbInWorldEPN4sead9BoundBox3IfEE
0x0000007100f969a0,O,000072,_ZN4ksys4phys9RigidBody4lockEb
@ -83458,7 +83458,7 @@ Address,Quality,Size,Name
0x0000007100fa6438,U,001636,phys::RigidBodyRequestMgr::x_0
0x0000007100fa6a9c,U,000020,
0x0000007100fa6ab0,U,000020,
0x0000007100fa6ac4,U,000456,phys::RigidBodyRequestMgr::x_1
0x0000007100fa6ac4,M,000456,_ZN4ksys4phys19RigidBodyRequestMgr5calc1ENS0_16ContactLayerTypeEb
0x0000007100fa6c8c,O,000188,_ZN4ksys4phys19RigidBodyRequestMgr13pushRigidBodyENS0_16ContactLayerTypeEPNS0_9RigidBodyE
0x0000007100fa6d48,U,000100,phys::RigidBodyRequestMgr::addEntityToWorld
0x0000007100fa6dac,U,000100,phys::RigidBodyRequestMgr::removeEntityFromWorld
@ -84279,7 +84279,7 @@ Address,Quality,Size,Name
0x0000007100fcd748,O,000036,_ZN4ksys4phys28StaticCompoundRigidBodyGroup4Unk1D0Ev
0x0000007100fcd76c,O,000052,_ZNK4ksys4phys28StaticCompoundRigidBodyGroup12getRigidBodyENS0_13BodyLayerTypeE
0x0000007100fcd7a0,O,000016,_ZN4ksys4phys7UserTag21onMaxPositionExceededEPNS0_9RigidBodyE
0x0000007100fcd7b0,U,000020,phys::UserTag::m3
0x0000007100fcd7b0,O,000020,_ZN4ksys4phys7UserTag9onImpulseEPNS0_9RigidBodyES3_f
0x0000007100fcd7c4,U,000004,phys::UserTag::m4n
0x0000007100fcd7c8,U,000004,phys::UserTag::m5n
0x0000007100fcd7cc,U,000004,phys::UserTag::m7n

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

2
src/KingSystem/ActorSystem/actPhysicsUserTag.h
View File

@ -21,7 +21,7 @@ public:
Actor* getActor() const { return mActor; }
void onMaxPositionExceeded(phys::RigidBody* body) override;
void m3(void* a, void* b, float c) override;
void onImpulse(phys::RigidBody* body_a, phys::RigidBody* body_b, float impulse_a) override;
void onBodyShapeChanged(phys::RigidBody* body) override;
void m5() override;
const sead::SafeString& getName() const override;

2
src/KingSystem/Physics/RigidBody/physRigidBody.cpp
View File

@ -1766,7 +1766,7 @@ const char* RigidBody::getName() {
return mUserTag ? mUserTag->getName().cstr() : getHkBodyName().cstr();
}
void RigidBody::logPosition() const {
void RigidBody::onImpulse(RigidBody* body_b, float impulse) const {
sead::Vector3f position;
getPosition(&position);
// debug logging?

2
src/KingSystem/Physics/RigidBody/physRigidBody.h
View File

@ -283,7 +283,7 @@ public:
void setPosition(const sead::Vector3f& position, bool propagate_to_linked_motions);
void getPosition(sead::Vector3f* position) const;
sead::Vector3f getPosition() const;
virtual void logPosition() const;
virtual void onImpulse(RigidBody* body_b, float impulse) const;
void getAabbInLocal(sead::BoundBox3f* aabb) const;
void getAabbInWorld(sead::BoundBox3f* aabb) const;

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

@ -1,5 +1,8 @@
#include "KingSystem/Physics/RigidBody/physRigidBodyRequestMgr.h"
#include <prim/seadScopedLock.h>
#include "KingSystem/Physics/RigidBody/physRigidBody.h"
#include "KingSystem/Physics/System/physSystem.h"
#include "KingSystem/Physics/System/physUserTag.h"
#include "KingSystem/Physics/physMaterialMask.h"
namespace ksys::phys {
@ -12,18 +15,18 @@ RigidBodyRequestMgr::RigidBodyRequestMgr() = default;
RigidBodyRequestMgr::~RigidBodyRequestMgr() {
for (int i = 0; i < NumRigidBodyBuffers; ++i) {
mRigidBodies1[i].freeBuffer();
mRigidBodies2[i].freeBuffer();
mOobRigidBodies[i].freeBuffer();
}
_38.freeBuffer();
_50.freeBuffer();
_98.freeBuffer();
mImpulseEntries.freeBuffer();
_b0.freeBuffer();
_c8.freeBuffer();
_e0.freeBuffer();
_120.freeBuffer();
_138.freeBuffer();
_108.freeBuffer();
mImpulseEntriesPool.freeBuffer();
mMotionAccessors.freeBuffer();
if (mContactPoints) {
@ -35,7 +38,7 @@ RigidBodyRequestMgr::~RigidBodyRequestMgr() {
void RigidBodyRequestMgr::init(sead::Heap* heap) {
constexpr int Buffer138Size = 0x800;
_108.allocBufferAssert(0x100, heap);
mImpulseEntriesPool.allocBufferAssert(0x100, heap);
_118 = 0;
_120.allocBufferAssert(0x100, heap);
@ -43,12 +46,12 @@ void RigidBodyRequestMgr::init(sead::Heap* heap) {
for (int i = 0; i < NumRigidBodyBuffers; ++i) {
mRigidBodies1[i].alloc(0x2000, heap);
mRigidBodies2[i].alloc(0x100, heap);
mOobRigidBodies[i].alloc(0x100, heap);
}
_38.alloc(0x800, heap);
_50.alloc(0x800, heap);
_98.alloc(0x100, heap);
mImpulseEntries.alloc(0x100, heap);
_b0.alloc(0x100, heap);
mMotionAccessors.allocBuffer(0x400, heap);
_138.allocBufferAssert(Buffer138Size, heap);
@ -83,6 +86,35 @@ void RigidBodyRequestMgr::init(sead::Heap* heap) {
mWaterPoisonSubmatIdx = MaterialMask::getSubMaterialIdx(Material::Water, "Water_Poison");
}
void RigidBodyRequestMgr::calc1(ContactLayerType layer_type, bool paused) {
auto lock = sead::makeScopedLock(mCriticalSections[int(layer_type)]);
ScopedWorldLock world_lock{layer_type};
if (!paused && layer_type == ContactLayerType::Entity)
processImpulseEntries();
processOobRigidBodyEntries(layer_type);
}
void RigidBodyRequestMgr::processImpulseEntries() {
while (auto* impulse = mImpulseEntries.pop()) {
if (auto* tag = impulse->body_a->getUserTag())
tag->onImpulse(impulse->body_a, impulse->body_b, impulse->impulse_a);
else
impulse->body_a->onImpulse(impulse->body_b, impulse->impulse_a);
}
_118 = 0;
}
void RigidBodyRequestMgr::processOobRigidBodyEntries(ContactLayerType layer_type) {
while (auto* body = mOobRigidBodies[int(layer_type)].pop()) {
if (auto* tag = body->getUserTag())
tag->onMaxPositionExceeded(body);
else
body->onMaxPositionExceeded();
}
}
bool RigidBodyRequestMgr::pushRigidBody(ContactLayerType type, RigidBody* body) {
static_cast<void>(mRigidBodies1[int(type)].getSize());
return mRigidBodies1[int(type)].push(body);

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

@ -46,6 +46,10 @@ public:
void init(sead::Heap* heap);
// 0x0000007100fa6ac4
void calc(ContactLayerType layer_type);
void calc1(ContactLayerType layer_type, bool paused);
bool pushRigidBody(ContactLayerType type, RigidBody* body);
// 0x0000007100fa6d48
void addEntityToWorld(ContactLayerType type, hkpEntity* entity);
@ -65,7 +69,6 @@ public:
private:
struct Unk1;
struct Unk2;
struct Unk3;
struct Unk4 {
@ -73,10 +76,12 @@ private:
};
KSYS_CHECK_SIZE_NX150(Unk4, 0x10);
struct Unk5 {
u8 _0[0x18];
struct ImpulseEntry {
RigidBody* body_a;
RigidBody* body_b;
float impulse_a;
};
KSYS_CHECK_SIZE_NX150(Unk5, 0x18);
KSYS_CHECK_SIZE_NX150(ImpulseEntry, 0x18);
struct Unk6 {
sead::Vector3f _0 = sead::Vector3f::zero;
@ -104,18 +109,22 @@ private:
bool someFunction2(const LayerContactPointInfo::ContactEvent& event);
static void someFunction(void* arg);
void processImpulseEntries();
void processOobRigidBodyEntries(ContactLayerType layer_type);
static constexpr int NumRigidBodyBuffers = 2;
sead::SafeArray<util::LockFreeQueue<RigidBody>, NumRigidBodyBuffers> mRigidBodies1;
util::LockFreeQueue<Unk1> _38;
util::LockFreeQueue<Unk1> _50;
sead::SafeArray<util::LockFreeQueue<RigidBody>, NumRigidBodyBuffers> mRigidBodies2;
util::LockFreeQueue<Unk2> _98;
/// Rigid bodies that are out of bounds.
sead::SafeArray<util::LockFreeQueue<RigidBody>, NumRigidBodyBuffers> mOobRigidBodies;
util::LockFreeQueue<ImpulseEntry> mImpulseEntries;
util::LockFreeQueue<Unk3> _b0;
util::LockFreeQueue<Unk4> _c8;
util::LockFreeQueue<Unk4> _e0;
sead::PtrArray<MotionAccessor> mMotionAccessors;
sead::Buffer<Unk5> _108;
sead::Buffer<ImpulseEntry> mImpulseEntriesPool;
sead::Atomic<u32> _118;
sead::Buffer<Unk6> _120;
sead::Atomic<u32> _130;

4
src/KingSystem/Physics/System/physUserTag.cpp
View File

@ -7,8 +7,8 @@ void UserTag::onMaxPositionExceeded(RigidBody* body) {
body->onMaxPositionExceeded();
}
void UserTag::m3(void* a, void* b, float c) {
// FIXME
void UserTag::onImpulse(RigidBody* body_a, RigidBody* body_b, float impulse_a) {
body_a->onImpulse(body_b, impulse_a);
}
void UserTag::onBodyShapeChanged(RigidBody* body) {}

3
src/KingSystem/Physics/System/physUserTag.h
View File

@ -16,8 +16,7 @@ public:
/// Called when a rigid body goes beyond the broadphase border.
/// The default implementation just notifies the rigid body of this callback.
virtual void onMaxPositionExceeded(RigidBody* body);
// a and b are probably physics bodies?
virtual void m3(void* a, void* b, float c);
virtual void onImpulse(RigidBody* body_a, RigidBody* body_b, float impulse_a);
virtual void onBodyShapeChanged(RigidBody* body);
virtual void m5();
virtual const sead::SafeString& getName() const { return sead::SafeString::cEmptyString; }