This commit is contained in:
robojumper
2024-11-23 19:13:36 +01:00
parent 39ec25ed8a
commit 4bc35a05c5
6 changed files with 80 additions and 81 deletions
+25 -25
View File
@@ -6,7 +6,7 @@
#include "d/col/cc/d_cc_s.h"
void ColliderLinkedList::postInit(cCcD_Obj &ccD) {
void dColliderLinkedList::postInit(cCcD_Obj &ccD) {
if (ccD.ChkAtSet()) {
ccD.SetAt_0x40000000();
}
@@ -18,35 +18,35 @@ void ColliderLinkedList::postInit(cCcD_Obj &ccD) {
}
}
void ColliderLinkedList::addCc(LinkedColliderCyl &ccD, const dCcD_SrcCyl &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Cyl &ccD, const dCcD_SrcCyl &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderSph &ccD, const dCcD_SrcSph &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Sph &ccD, const dCcD_SrcSph &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderCps &ccD, const dCcD_SrcCps &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Cps &ccD, const dCcD_SrcCps &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::addCc(LinkedColliderUnk &ccD, const dCcD_SrcUnk &src) {
void dColliderLinkedList::addCc(dCcD_Linked_Unk &ccD, const dCcD_SrcUnk &src) {
ccD.Set(src);
mList.append(&ccD.mNode);
ccD.mNode.mpList = &mList;
postInit(ccD);
}
void ColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
void dColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
f(nd->mpCcDObj, cbArg);
@@ -55,7 +55,7 @@ void ColliderLinkedList::foreachCc(ccCbFunc f, void *cbArg) const {
}
// What's the difference between these two?
void ColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
void dColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
f(nd->mpCcDObj, cbArg);
@@ -63,23 +63,23 @@ void ColliderLinkedList::foreachCc2(ccCbFunc f, void *cbArg) const {
}
}
void ColliderLinkedList::Set(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::Set(cCcD_Obj *obj, void *cbArg) {
dCcS::GetInstance()->Set(obj);
}
void ColliderLinkedList::registerColliders() {
void dColliderLinkedList::registerColliders() {
foreachCc(Set, nullptr);
}
void ColliderLinkedList::SetStts(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::SetStts(cCcD_Obj *obj, void *cbArg) {
obj->SetStts(*static_cast<cCcD_Stts *>(cbArg));
}
void ColliderLinkedList::SetStts(cCcD_Stts &stts) {
void dColliderLinkedList::SetStts(cCcD_Stts &stts) {
foreachCc(SetStts, &stts);
}
cCcD_Obj *ColliderLinkedList::find(ccPtmf f) const {
cCcD_Obj *dColliderLinkedList::find(ccPtmf f) const {
cCcD_Obj *o;
LinkedColliderNode *nd = static_cast<LinkedColliderNode *>(mList.getFirst());
while (nd != nullptr) {
@@ -92,66 +92,66 @@ cCcD_Obj *ColliderLinkedList::find(ccPtmf f) const {
return nullptr;
}
void ColliderLinkedList::AtSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::AtSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkAt_0x40000000()) {
return;
}
obj->OnAtSet();
}
void ColliderLinkedList::AtSet() {
void dColliderLinkedList::AtSet() {
foreachCc(AtSet, nullptr);
}
void ColliderLinkedList::ClrAt(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrAt(cCcD_Obj *obj, void *cbArg) {
obj->ClrAtSet();
obj->ClrAtHit();
}
void ColliderLinkedList::ClrAt() {
void dColliderLinkedList::ClrAt() {
foreachCc(ClrAt, nullptr);
}
void ColliderLinkedList::TgSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::TgSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkTg_0x40000000()) {
return;
}
obj->OnTgSet();
}
void ColliderLinkedList::TgSet() {
void dColliderLinkedList::TgSet() {
foreachCc(TgSet, nullptr);
}
void ColliderLinkedList::ClrTg(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrTg(cCcD_Obj *obj, void *cbArg) {
obj->ClrTgSet();
obj->ClrTgHit();
}
void ColliderLinkedList::ClrTg() {
void dColliderLinkedList::ClrTg() {
foreachCc(ClrTg, nullptr);
}
void ColliderLinkedList::CoSet(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::CoSet(cCcD_Obj *obj, void *cbArg) {
if (!obj->ChkCo_0x40000000()) {
return;
}
obj->OnCoSet();
}
void ColliderLinkedList::CoSet() {
void dColliderLinkedList::CoSet() {
foreachCc(CoSet, nullptr);
}
void ColliderLinkedList::ClrCo(cCcD_Obj *obj, void *cbArg) {
void dColliderLinkedList::ClrCo(cCcD_Obj *obj, void *cbArg) {
obj->ClrCoSet();
obj->ClrCoHit();
}
void ColliderLinkedList::ClrCo() {
void dColliderLinkedList::ClrCo() {
foreachCc(ClrCo, nullptr);
}
ColliderLinkedList::~ColliderLinkedList() {
dColliderLinkedList::~dColliderLinkedList() {
mList.clear();
}