d_a_obj_appear_bridge mostly matching (#36)

* d_a_obj_appear_bridge - weak function order issue

* Mark as nonmatching for now

* Name unk IScnObjCallback funcs

---------

Co-authored-by: elijah-thomas774 <elijahthomas774@gmail.com>
This commit is contained in:
robojumper
2024-09-28 02:32:48 +02:00
committed by GitHub
parent 1039b3b239
commit 392145bf3d
12 changed files with 286 additions and 72 deletions
+1
View File
@@ -32,6 +32,7 @@ public:
static CollisionCheckContext* get();
void registerActorBgCollision(ActorCollision&, dAcObjBase_c*);
void destroyActorBgCollision(ActorCollision&);
};
#endif
+10
View File
@@ -0,0 +1,10 @@
#ifndef AREA_UTILS_H
#define AREA_UTILS_H
#include <m/m_vec.h>
/* 800a9b00 */ bool checkPosInArea(void **AREA, const mVec3_c& pos);
/* 800a9bd0 */ void *getAreaForIndexInRoom(s32 areaIndex, s32 roomId);
/* 800a9c50 */ bool *checkPosInArea(s32 areaIndex, s32 roomId, const mVec3_c& pos, void **AREA);
#endif
+1
View File
@@ -17,6 +17,7 @@ public:
public:
/** 0x800A0C40 */
Event(char *eventName, u32 unk, u32 eventFlags, void *callback1, void *callback2);
Event(u32 eventId, s32 roomId, u32 eventFlags, void *callback1, void *callback2);
/** 0x800A1240 */
virtual ~Event();
};
+19
View File
@@ -0,0 +1,19 @@
#ifndef D_STAGE_RENDER_STUFF_H
#define D_STAGE_RENDER_STUFF_H
#include <d/a/obj/d_a_obj_base.h>
#include <nw4r/g3d/g3d_scnobj.h>
#include <m/m3d/m_scnleaf.h>
class dScnCallback_c : public nw4r::g3d::IScnObjCallback {
public:
dScnCallback_c(dAcObjBase_c *arg): mpActor(arg) {}
/* vt 0x10 */ virtual void ExecCallback_CALC_MAT(nw4r::g3d::ScnObj::Timing, nw4r::g3d::ScnObj *, u32, void *) override;
/* 0x04 */ dAcObjBase_c *mpActor;
/* 0x08 */ UNKWORD field_0x08;
/* 8001a230 */ void attach(m3d::scnLeaf_c&);
};
#endif