Skip to content
Open
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c67535c
Class struct, _create and _delete
Azurpourpre Mar 28, 2026
b794ae3
_execute
Azurpourpre Mar 28, 2026
81ab231
_draw matching
Azurpourpre Mar 28, 2026
51e157d
daObjVds::Act_c::SetLoopJointAnimation match
Azurpourpre Mar 28, 2026
3bbb05e
daObjVds::Act_c::PlayLoopJointAnimation match
Azurpourpre Mar 28, 2026
829c5ac
daObjVds::Act_c::set_first_process equivalent (?)
Azurpourpre Mar 28, 2026
a0ef020
daObjVds::Act_c::search_switchCB match
Azurpourpre Mar 28, 2026
2b06ace
daObjVds::Act_c::process_off_init match
Azurpourpre Mar 28, 2026
29346b9
daObjVds::Act_c::process_off_* match
Azurpourpre Mar 28, 2026
9ed5de4
daObjVds::Act_c::process_on_* matching
Azurpourpre Mar 31, 2026
5c2bb50
process init equivalent ?
Azurpourpre Apr 2, 2026
ad2c198
daObjVds::Act_c::process_main equivalent ?
Azurpourpre Apr 2, 2026
578d97d
daObjVds::Act_c::create_point_light almost match
Azurpourpre Apr 2, 2026
16682b8
daObjVds::Act_c::process_common matching
Azurpourpre Apr 2, 2026
207591b
Fixing init_table & main_table section
Azurpourpre Apr 3, 2026
5b55390
daObjVds::Act_c::execute_point_light matching
Azurpourpre Apr 3, 2026
13e995f
daObjVds::Act_c::delete_point_light match
Azurpourpre Apr 3, 2026
253f263
daObjVds::Act_c::Event_*
Azurpourpre Apr 3, 2026
6d7a14c
daObjVds::Act_c::solidHeapCB matching
Azurpourpre Apr 3, 2026
00083ad
daObjVds::Act_c::create_heap matching
Azurpourpre Apr 3, 2026
e9fe53b
daObjVds::Act_c::set_mtx matching
Azurpourpre Apr 3, 2026
2399818
Minor fixes
Azurpourpre Apr 4, 2026
f634068
Merge branch 'zeldaret:main' into daObjVds
Azurpourpre Apr 5, 2026
87ec224
Merge branch 'zeldaret:main' into daObjVds
Azurpourpre Apr 16, 2026
05e8994
Merge branch 'zeldaret:main' into daObjVds
Azurpourpre May 13, 2026
e8f23e3
Merge branch 'main' into daObjVds
Azurpourpre Jun 10, 2026
c239a6f
Updating swlight that gets called by vds
Azurpourpre Jun 21, 2026
1f4d14a
Almost matching !
Azurpourpre Jun 21, 2026
3456d25
Fixing missing data
Azurpourpre Jun 22, 2026
2589d1a
Matching (almost) demo
Azurpourpre Jun 27, 2026
cfb9258
Renaming L_attr fields
Azurpourpre Jun 28, 2026
71ffb47
Merge branch 'main' into daObjVds
Azurpourpre Jun 28, 2026
6ee4528
Demo
Azurpourpre Jul 5, 2026
0cb273e
Merge branch 'zeldaret:main' into daObjVds
Azurpourpre Jul 5, 2026
5196c37
Fixing init_table and main_table initialisation
Azurpourpre Jul 5, 2026
7becdc9
Fixing code style
Azurpourpre Jul 5, 2026
2cc1151
Merge branch 'zeldaret:main' into daObjVds
Azurpourpre Jul 5, 2026
7e4ff0d
Adding suggestion from WilliamArnett
Azurpourpre Jul 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 56 additions & 13 deletions include/d/actor/d_a_obj_Vds.h
Original file line number Diff line number Diff line change
@@ -1,44 +1,87 @@
#ifndef D_A_OBJ_VDS_H
#define D_A_OBJ_VDS_H

#include "f_op/f_op_actor.h"
#include "d/d_a_obj.h"
#include "d/d_bg_w.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"

class J3DAnmTransformKey;

namespace daObjVds {
static void ds_search_switchCB(void*, void*);
static void* ds_search_switchCB(void*, void*);

class Act_c : public fopAc_ac_c {
public:
void is_switch() const {}
// Enums, Structs, Types
typedef BOOL (daObjVds::Act_c::*procInitFun_t)();
typedef void (daObjVds::Act_c::*procMainFun_t)();

enum Prm_e {
PRM_SWSAVE_W = 8,
PRM_SWSAVE_S = 0,
};



// Globals variables
static const char M_arcname[4];

// Methods
bool is_switch() {
return fopAcM_isSwitch(this, daObj::PrmAbstract(this, 8, 0));
}

virtual ~Act_c() {};

void SetLoopJointAnimation(J3DAnmTransformKey*, J3DAnmTransformKey*, float, float);
void PlayLoopJointAnimation();
BOOL SetLoopJointAnimation(J3DAnmTransformKey*, J3DAnmTransformKey*, float, float);
bool PlayLoopJointAnimation();
void set_first_process();
void search_switchCB(fopAc_ac_c*);
void process_off_init();
void* search_switchCB(fopAc_ac_c*);
BOOL process_off_init();
void process_off_main();
void process_on_init();
BOOL process_on_init();
void process_on_main();
void process_init(int);
BOOL process_init(int);
void process_main();
void process_common();
void create_point_light(int, cXyz*);
void execute_point_light();
void delete_point_light();
void Event_init();
void Event_exe();
void solidHeapCB(fopAc_ac_c*);
void create_heap();
static BOOL solidHeapCB(fopAc_ac_c*);
bool create_heap();
cPhs_State _create();
bool _delete();
void set_mtx();
bool _execute();
bool _draw();

public:
/* Place member variables here */
};
/* 0x294 */ request_of_phase_process_class mPhs;
/* 0x29C */ Mtx m29C;
/* 0x2CC */ mDoExt_McaMorf* M_anm0;
/* 0x2D0 */ J3DAnmTransformKey* M_bck_data0;
/* 0x2D4 */ mDoExt_brkAnm mBrkAnm0;
/* 0x2EC */ J3DAnmTevRegKey* M_brk_data0;
/* 0x2F0 */ mDoExt_McaMorf* M_anm1;
/* 0x2F4 */ J3DAnmTransformKey* M_bck_data1;
/* 0x2F8 */ mDoExt_brkAnm mBrkAnm1;
/* 0x310 */ J3DAnmTevRegKey* M_brk_data1;
/* 0x314 */ dBgW* mpBgW;
/* 0x318 */ u32 m318;
/* 0x31C */ s32 mSide;
/* 0x320 */ s32 m320;
/* 0x324 */ fpc_ProcID mEyeID[2];
/* 0x32C */ f32 mEyePower[2];
/* 0x334 */ s16 mEventIdx;
/* 0x336 */ s16 m336;
/* 0x338 */ u16 m338;
/* 0x33A */ u16 m33A;
/* 0x33C */ LIGHT_INFLUENCE mEyeLightInfluence[2];
/* 0x37C */ cXyz m37C[2];
}; // Size : 0x394
};

#endif /* D_A_OBJ_VDS_H */
4 changes: 3 additions & 1 deletion include/d/actor/d_a_obj_swlight.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ namespace daObjSwlight {
PRM_TYPE_S = 0x10,
};

void get_power() const {}
f32 get_power() const {
return this->mF30;
}
bool is_switch() const {
return fopAcM_isSwitch(const_cast<Act_c*>(this), prm_get_swSave());
}
Expand Down
Loading
Loading