mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 14:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add comments to scene profile structs

Browse Source
This commit is contained in:
LagoLunatic
2025-03-15 19:29:10 -04:00
parent a9e1527253
commit e9afe4c428
10 changed files with 132 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+2 -13
View File
@@ -66,16 +66,6 @@ public:
/* 0x00 */ cM3dGAab mAab;
/* 0x1C vtable */
struct Shape {
~Shape();
/* 0x00 */ int _0;
/* 0x04 */ f32 _4;
/* 0x08 */ f32 _8;
/* 0x0C */ f32 _C;
/* 0x10 */ f32 _10;
/* 0x14 */ f32 _14;
};
cCcD_ShapeAttr() {}
virtual ~cCcD_ShapeAttr() {}
virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const {
@@ -140,7 +130,7 @@ public:
virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; }
virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; }
virtual ~cCcD_TriAttr() {}
};
}; // Size: 0x58
struct cCcD_SrcCpsAttr {
cM3dGCpsS mCps;
@@ -180,7 +170,7 @@ public:
virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
virtual void CalcAabBox();
virtual bool GetNVec(cXyz const&, cXyz*) const;
};
}; // Size: 0x40
STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr));
@@ -219,7 +209,6 @@ public:
virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
virtual void CalcAabBox();
virtual bool GetNVec(cXyz const&, cXyz*) const;
}; // Size = 0x34
STATIC_ASSERT(0x34 == sizeof(cCcD_SphAttr));
include/d/d_cc_d.h
+9 -1
View File
@@ -353,6 +353,7 @@ private:
// Correction (Co) Collider
class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
public:
/* 0x00 */ /* dCcD_GAtTgCoCommonBase */
virtual ~dCcD_GObjCo() {}
void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); }
void ClrHit() { ClrActorInfo(); }
@@ -474,6 +475,7 @@ public:
cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); }
protected:
/* 0x000 */ /* cCcD_GObjInf */
/* 0x050 */ dCcD_GObjAt mGObjAt;
/* 0x094 */ dCcD_GObjTg mGObjTg;
/* 0x0DC */ dCcD_GObjCo mGObjCo;
@@ -503,6 +505,9 @@ STATIC_ASSERT(sizeof(dCcD_Cyl) == 0x130);
// Sphere
class dCcD_Sph : public dCcD_GObjInf, public cCcD_SphAttr {
public:
/* 0x000 */ /* dCcD_GObjInf */
/* 0x0F8 */ /* cCcD_SphAttr */
dCcD_Sph() {}
void Set(dCcD_SrcSph const&);
void StartCAt(cXyz&);
@@ -531,11 +536,14 @@ public:
// Triangle
class dCcD_Tri : public dCcD_GObjInf, public cCcD_TriAttr {
public:
/* 0x00 */ /* dCcD_GObjInf */
/* 0xF8 */ /* cCcD_TriAttr */
void Set(dCcD_SrcTri const&);
virtual cCcD_ShapeAttr* GetShapeAttr() { return this; }
virtual ~dCcD_Tri() {}
dCcD_Tri() {}
};
}; // Size: 0x150
dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0);
src/d/actor/d_a_bk.cpp
+1 -1
View File
@@ -4010,7 +4010,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK800,
/* SrcObjAt Atp */ 2,
/* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e,
/* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_GrpAll_e,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/d_s_logo.cpp
+10 -11
View File
@@ -932,15 +932,14 @@ scene_method_class l_dScnLogo_Method = {
};
scene_process_profile_definition g_profile_LOGO_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_LOGO_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnLogo_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnLogo_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_LOGO_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnLogo_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnLogo_Method,
};
src/d/d_s_menu.cpp
+10 -11
View File
@@ -320,15 +320,14 @@ scene_method_class l_dScnMenu_Method = {
};
scene_process_profile_definition g_profile_MENU_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_MENU_SCENE,
&g_fpcNd_Method.base,
sizeof(menu_of_scene_class),
0,
0,
&g_fopScn_Method.base,
&l_dScnMenu_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_MENU_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(menu_of_scene_class),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnMenu_Method,
};
src/d/d_s_name.cpp
+20 -22
View File
@@ -971,29 +971,27 @@ scene_method_class l_dScnName_Method = {
};
scene_process_profile_definition g_profile_NAME_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_NAME_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnName_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnName_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_NAME_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnName_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnName_Method,
};
scene_process_profile_definition g_profile_NAMEEX_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_NAMEEX_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnName_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnName_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_NAMEEX_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnName_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnName_Method,
};
src/d/d_s_open.cpp
+20 -23
View File
@@ -8,7 +8,6 @@
#include "f_op/f_op_draw_iter.h"
#include "f_op/f_op_scene_mng.h"
#include "f_op/f_op_overlap_mng.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "m_Do/m_Do_audio.h"
@@ -132,29 +131,27 @@ scene_method_class l_dScnOpen_Method = {
};
scene_process_profile_definition g_profile_OPEN_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_OPEN_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnOpen_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnOpen_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_OPEN_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnOpen_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnOpen_Method,
};
scene_process_profile_definition g_profile_OPEN2_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_OPEN2_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnOpen_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnOpen_Method,
NULL,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_OPEN2_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnOpen_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnOpen_Method,
};
src/d/d_s_play.cpp
+30 -30
View File
@@ -1506,40 +1506,40 @@ static scene_method_class l_dScnPly_Method = {
};
scene_process_profile_definition g_profile_PLAY_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_PLAY_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnPly_ply_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnPly_Method,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_PLAY_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnPly_ply_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnPly_Method,
};
scene_process_profile_definition g_profile_OPENING_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_OPENING_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnPly_ply_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnPly_Method,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_OPENING_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnPly_ply_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnPly_Method,
};
scene_process_profile_definition g_profile_OPENING2_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_OPENING2_SCENE,
&g_fpcNd_Method.base,
sizeof(dScnPly_ply_c),
0,
0,
&g_fopScn_Method.base,
&l_dScnPly_Method,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_OPENING2_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(dScnPly_ply_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnPly_Method,
};
src/d/d_s_room.cpp
+10 -11
View File
@@ -308,15 +308,14 @@ scene_method_class l_dScnRoom_Method = {
};
scene_process_profile_definition g_profile_ROOM_SCENE = {
fpcLy_CURRENT_e,
0,
fpcPi_CURRENT_e,
PROC_ROOM_SCENE,
&g_fpcNd_Method.base,
sizeof(room_of_scene_class),
0,
0,
&g_fopScn_Method.base,
&l_dScnRoom_Method,
NULL,
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ROOM_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(room_of_scene_class),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnRoom_Method,
};
src/d/d_s_title.cpp
+20 -20
View File
@@ -134,27 +134,27 @@ static scene_method_class l_dScnTitle_Method = {
};
scene_process_profile_definition g_profile_TITLE_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_TITLE_SCENE,
&g_fpcNd_Method.base,
sizeof(title_of_scene_class),
0,
0,
&g_fopScn_Method.base,
&l_dScnTitle_Method,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_TITLE_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(title_of_scene_class),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnTitle_Method,
};
scene_process_profile_definition g_profile_ENDING_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
PROC_ENDING_SCENE,
&g_fpcNd_Method.base,
sizeof(title_of_scene_class),
0,
0,
&g_fopScn_Method.base,
&l_dScnTitle_Method,
/* LayerID */ fpcLy_ROOT_e,
/* ListID */ 1,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ENDING_SCENE,
/* Proc SubMtd */ &g_fpcNd_Method.base,
/* Size */ sizeof(title_of_scene_class),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Node SubMtd */ &g_fopScn_Method.base,
/* Scene SubMtd */ &l_dScnTitle_Method,
};