d_a_obj_amber almost OK

This commit is contained in:
swekka
2025-09-07 15:30:24 +02:00
parent 897de53b2d
commit 561dd733ee
3 changed files with 106 additions and 15 deletions
+15 -15
View File
@@ -2,22 +2,22 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dAcOAmber_c_classInit__Fv = .text:0x00000070; // type:function size:0x68
fn_626_E0 = .text:0x000000E0; // type:function size:0x58
AcOAmber__initModels = .text:0x00000140; // type:function size:0x98
fn_626_1E0 = .text:0x000001E0; // type:function size:0x8
fn_626_1F0 = .text:0x000001F0; // type:function size:0x24C
AcOAmber__draw = .text:0x00000440; // type:function size:0x7C
fn_626_4C0 = .text:0x000004C0; // type:function size:0xA4
fn_626_570 = .text:0x00000570; // type:function size:0x10
__dt__15dShadowCircle_cFv = .text:0x000000E0; // type:function size:0x58
createHeap__11dAcOAmber_cFv = .text:0x00000140; // type:function size:0x98
actorCreate__11dAcOAmber_cFv = .text:0x000001E0; // type:function size:0x8
actorPostCreate__11dAcOAmber_cFv = .text:0x000001F0; // type:function size:0x24C
draw__11dAcOAmber_cFv = .text:0x00000440; // type:function size:0x7C
registerInEvent__11dAcOAmber_cFv = .text:0x000004C0; // type:function size:0xA4
unkVirtFunc_0x6C__11dAcOAmber_cFv = .text:0x00000570; // type:function size:0x10
__dt__11dAcOAmber_cFv = .text:0x00000580; // type:function size:0x78
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_626_rodata_0 = .rodata:0x00000000; // type:object size:0xC data:float
lbl_626_rodata_C = .rodata:0x0000000C; // type:object size:0x4 align:4 data:float
lbl_626_rodata_0 = .rodata:0x00000000; // type:object size:0xC scope:local data:float
lbl_626_rodata_C = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float
g_profile_OBJ_AMBER = .data:0x00000000; // type:object size:0x10
lbl_626_data_10 = .data:0x00000010; // type:object size:0x8
lbl_626_data_18 = .data:0x00000018; // type:object size:0x1C
lbl_626_data_34 = .data:0x00000034; // type:object size:0xC
lbl_626_data_40 = .data:0x00000040; // type:object size:0x10
lbl_626_data_50 = .data:0x00000050; // type:object size:0x80
lbl_626_data_D0 = .data:0x000000D0; // type:object size:0xC
lbl_626_data_10 = .data:0x00000010; // type:object size:0x8 scope:local
lbl_626_data_18 = .data:0x00000018; // type:object size:0x1C scope:local
lbl_626_data_34 = .data:0x00000034; // type:object size:0xC scope:local
lbl_626_data_40 = .data:0x00000040; // type:object size:0x10 scope:local
__vt__11dAcOAmber_c = .data:0x00000050; // type:object size:0x80
__vt__15dShadowCircle_c = .data:0x000000D0; // type:object size:0xC
+17
View File
@@ -2,13 +2,30 @@
#define D_A_OBJ_AMBER_H
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_shadow.h"
#include "m/m3d/m_smdl.h"
#include "m/m_quat.h"
#include "m/m_vec.h"
class dAcOAmber_c : public dAcObjBase_c {
public:
dAcOAmber_c() {}
virtual ~dAcOAmber_c() {}
virtual bool createHeap() override;
virtual int actorCreate() override;
virtual int actorPostCreate() override;
virtual int draw() override;
virtual void registerInEvent() override;
virtual void unkVirtFunc_0x6C() override;
private:
/* 0x330 */ m3d::smdl_c mMdl;
/* 0x34C */ dShadowCircle_c mShadowCircle;
/* 0x354 */ mVec3_c mMin;
/* 0x360 */ mVec3_c mMax;
/* 0x36C */ mQuat_c mShadowRot;
/* 0x37C */ f32 field_0x37c;
};
#endif
+74
View File
@@ -1,3 +1,77 @@
#include "d/a/obj/d_a_obj_amber.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s_gnd_chk.h"
#include "f/f_base.h"
#include "m/m_quat.h"
#include "m/m_vec.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "nw4r/g3d/res/g3d_resmdl.h"
#include "sized_string.h"
#include "toBeSorted/event_manager.h"
SPECIAL_ACTOR_PROFILE(OBJ_AMBER, dAcOAmber_c, fProfile::OBJ_AMBER, 0x284, 0, 3);
bool dAcOAmber_c::createHeap() {
void *data = getOarcResFile("Amber");
if (data == nullptr) {
return false;
}
nw4r::g3d::ResFile resFile(data);
if (!resFile.IsValid()) {
return false;
}
nw4r::g3d::ResMdl mdl = resFile.GetResMdl("Amber");
if (!mdl.IsValid()) {
return false;
}
return mMdl.create(mdl, &heap_allocator, 0x120, 1, nullptr);
}
int dAcOAmber_c::actorCreate() {
return SUCCEEDED;
}
int dAcOAmber_c::actorPostCreate() {
CREATE_ALLOCATOR(dAcOAmber_c);
if (dBgS_ObjGndChk::CheckPos(position + mVec3_c::Ey * 10.0f)) {
mLightingInfo.mLightingCode = dBgS_ObjGndChk::GetLightingCode();
if (&dBgS_ObjGndChk::GetInstance() != nullptr) {
setPolyAttrs(dBgS_ObjGndChk::GetInstance());
}
}
mMdl.getBounds(&mMin, &mMax);
boundingBox.Set(mMin, mMax);
mShadowRot.v = (mMin + mMax) * 0.5f;
mShadowRot.w = ((mMax - mMin) * 0.5f).mag();
updateMatrix();
mMdl.setLocalMtx(mWorldMtx);
if (dBgS_ObjGndChk::CheckPos(position + mVec3_c::Ey * mMax.y)) {
field_0x37c = position.y - dBgS_ObjGndChk::GetGroundHeight() < 0.0f ? 0.0f : dBgS_ObjGndChk::GetGroundHeight();
} else {
field_0x37c = 1.0e+9f;
}
return SUCCEEDED;
}
int dAcOAmber_c::draw() {
drawModelType1(&mMdl);
if (field_0x37c != 1.0e+9f) {
drawShadow(mShadowCircle, nullptr, mWorldMtx, &mShadowRot, -1, -1, -1, -1, -1, field_0x37c);
}
return SUCCEEDED;
}
void dAcOAmber_c::registerInEvent() {
const char *eventName = EventManager::sInstance->getCurrentEventName();
if (strequals(eventName, "TimeDoorIn") || strequals(eventName, "TimeDoorOut")) {
mObjectActorFlags |= 0x200;
}
}
void dAcOAmber_c::unkVirtFunc_0x6C() {
mObjectActorFlags &= ~0x200;
}