encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

c_cc_d (#132)

Browse Source 
* gnd check

* more c_bg_s

* start adding static asserts for size

* Add more size checks

* c_cc

* c_cc progress

* failed implementing cCcD_*Attr

* progress

* format

* try destructor

* data

* remove unused asm

* remove inlineCross

* remove functions that didn't belong there

* naming fix

* match cCcD_SphAttr::CalcAabBox

* cCcD_Stts::ClrTg

* c_cc_s and mass fixes
This commit is contained in:
lepelog
2021-06-12 18:20:45 -04:00
committed by GitHub
parent b728ec1ef5
commit 5be309a186
111 changed files with 1167 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp
+13 -100
View File
@@ -3,7 +3,8 @@
// Translation Unit: c_bg_s_gnd_chk
//
// #include "SSystem/SComponent/c_bg_s_gnd_chk.h"
#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -11,120 +12,32 @@
// Types:
//
struct cXyz {
static f32 Zero[3];
};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
};
struct Vec {};
struct cBgS_GndChk {
/* 80267C1C */ cBgS_GndChk();
/* 80267C94 */ ~cBgS_GndChk();
/* 80267D28 */ void SetPos(cXyz const*);
/* 80267D0C */ void SetPos(Vec const*);
/* 80267D44 */ void PreCheck();
};
struct cBgS_Chk {
/* 80267B4C */ cBgS_Chk();
/* 80267B70 */ ~cBgS_Chk();
};
//
// Forward References:
//
extern "C" void __ct__11cBgS_GndChkFv();
extern "C" void __dt__11cBgS_GndChkFv();
extern "C" void SetPos__11cBgS_GndChkFPC3Vec();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void PreCheck__11cBgS_GndChkFv();
extern "C" void func_80267D54();
//
// External References:
//
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dl__FPv();
extern "C" f32 Zero__4cXyz[3];
//
// Declarations:
//
/* ############################################################################################## */
/* 803C3F90-803C3FA8 0210B0 0018+00 2/2 0/0 0/0 .data __vt__11cBgS_GndChk */
SECTION_DATA extern void* __vt__11cBgS_GndChk[6] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__11cBgS_GndChkFv, (void*)NULL, (void*)NULL,
(void*)func_80267D54,
};
/* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text __ct__11cBgS_GndChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_GndChk::cBgS_GndChk() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/__ct__11cBgS_GndChkFv.s"
cBgS_GndChk::cBgS_GndChk() {
mPosition = cXyz::Zero;
setActorPid(0xFFFFFFFF);
_30 = 2;
}
#pragma pop
/* 80267C94-80267D0C 2625D4 0078+00 2/1 4/4 110/110 .text __dt__11cBgS_GndChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_GndChk::~cBgS_GndChk() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/__dt__11cBgS_GndChkFv.s"
}
#pragma pop
cBgS_GndChk::~cBgS_GndChk() {}
/* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text SetPos__11cBgS_GndChkFPC3Vec */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_GndChk::SetPos(Vec const* param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC3Vec.s"
void cBgS_GndChk::SetPos(Vec const* pVec) {
mPosition = *pVec;
}
#pragma pop
/* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text SetPos__11cBgS_GndChkFPC4cXyz
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_GndChk::SetPos(cXyz const* param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/SetPos__11cBgS_GndChkFPC4cXyz.s"
void cBgS_GndChk::SetPos(cXyz const* pVec) {
mPosition = *pVec;
}
#pragma pop
/* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text PreCheck__11cBgS_GndChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_GndChk::PreCheck() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/PreCheck__11cBgS_GndChkFv.s"
void cBgS_GndChk::PreCheck() {
mWallPrecheck = _30 & 2;
}
#pragma pop
/* 80267D54-80267D5C 262694 0008+00 1/0 0/0 0/0 .text @20@__dt__11cBgS_GndChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void func_80267D54() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_gnd_chk/func_80267D54.s"
}
#pragma pop
libs/SSystem/SComponent/c_bg_s_lin_chk.cpp
+21 -80
View File
@@ -9,100 +9,41 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__11cBgS_LinChkFv();
extern "C" void __dt__11cBgS_LinChkFv();
extern "C" void ct__11cBgS_LinChkFv();
extern "C" void Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi();
extern "C" void PreCalc__11cBgS_LinChkFv();
extern "C" static void func_80267F80();
//
// External References:
//
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void ClearPi__13cBgS_PolyInfoFv();
extern "C" void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz();
extern "C" void __dl__FPv();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" f32 Zero__4cXyz[3];
//
// Declarations:
//
/* ############################################################################################## */
/* 803C3FA8-803C3FC0 0210C8 0018+00 2/2 0/0 0/0 .data __vt__11cBgS_LinChk */
SECTION_DATA extern void* __vt__11cBgS_LinChk[6] = {
(void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__11cBgS_LinChkFv, (void*)NULL, (void*)NULL,
(void*)func_80267F80,
};
/* 80267D5C-80267DBC 26269C 0060+00 0/0 2/2 0/0 .text __ct__11cBgS_LinChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_LinChk::cBgS_LinChk() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/__ct__11cBgS_LinChkFv.s"
cBgS_LinChk::cBgS_LinChk() {
this->ct();
}
#pragma pop
/* 80267DBC-80267E48 2626FC 008C+00 2/1 2/2 0/0 .text __dt__11cBgS_LinChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_LinChk::~cBgS_LinChk() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/__dt__11cBgS_LinChkFv.s"
}
#pragma pop
cBgS_LinChk::~cBgS_LinChk() {}
/* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text ct__11cBgS_LinChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_LinChk::ct() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/ct__11cBgS_LinChkFv.s"
void cBgS_LinChk::ct() {
cXyz xyz(cXyz::Zero);
mLin.SetStartEnd(xyz, xyz);
field_0x40 = xyz;
setActorPid(0xFFFFFFFF);
field_0x4c = 0;
mFrontFlag = 1;
mBackFlag = 0;
}
#pragma pop
/* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_LinChk::Set2(cXyz const* param_0, cXyz const* param_1, unsigned int param_2) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi.s"
void cBgS_LinChk::Set2(cXyz const* pStart, cXyz const* pEnd, unsigned int actorPid) {
mLin.SetStartEnd(*pStart, *pEnd);
field_0x40 = *pEnd;
setActorPid(actorPid);
field_0x4c &= ~0x10;
ClearPi();
}
#pragma pop
/* 80267F40-80267F80 262880 0040+00 0/0 1/1 0/0 .text PreCalc__11cBgS_LinChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_LinChk::PreCalc() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/PreCalc__11cBgS_LinChkFv.s"
void cBgS_LinChk::PreCalc() {
mPreWallChk = !(field_0x4c & 0x40000000);
mPreGroundChk = !(field_0x4c & 0x80000000);
mPreRoofChk = !(field_0x4c & 0x20000000);
}
#pragma pop
/* 80267F80-80267F88 2628C0 0008+00 1/0 0/0 0/0 .text @20@__dt__11cBgS_LinChkFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80267F80() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_lin_chk/func_80267F80.s"
}
#pragma pop
libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp
+6 -55
View File
@@ -10,73 +10,24 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__13cBgS_ShdwDrawFv();
extern "C" void __dt__13cBgS_ShdwDrawFv();
extern "C" void Set__13cBgS_ShdwDrawFR4cXyzR4cXyz();
extern "C" void SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i();
//
// External References:
//
extern "C" void __ct__8cBgS_ChkFv();
extern "C" void __dt__8cBgS_ChkFv();
extern "C" void Set__8cM3dGAabFPC4cXyzPC4cXyz();
extern "C" void __dl__FPv();
extern "C" extern void* __vt__8cM3dGAab[3];
//
// Declarations:
//
/* ############################################################################################## */
/* 803C3FC0-803C3FD0 0210E0 000C+04 2/2 0/0 0/0 .data __vt__13cBgS_ShdwDraw */
SECTION_DATA extern void* __vt__13cBgS_ShdwDraw[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__13cBgS_ShdwDrawFv,
/* padding */
NULL,
};
/* 80267F88-80267FD0 2628C8 0048+00 0/0 1/1 0/0 .text __ct__13cBgS_ShdwDrawFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_ShdwDraw::cBgS_ShdwDraw() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/__ct__13cBgS_ShdwDrawFv.s"
}
#pragma pop
cBgS_ShdwDraw::cBgS_ShdwDraw() {}
/* 80267FD0-80268048 262910 0078+00 1/0 2/2 0/0 .text __dt__13cBgS_ShdwDrawFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cBgS_ShdwDraw::~cBgS_ShdwDraw() {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/__dt__13cBgS_ShdwDrawFv.s"
}
#pragma pop
cBgS_ShdwDraw::~cBgS_ShdwDraw() {}
/* 80268048-8026806C 262988 0024+00 0/0 1/1 0/0 .text Set__13cBgS_ShdwDrawFR4cXyzR4cXyz
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) {
nofralloc
#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/Set__13cBgS_ShdwDrawFR4cXyzR4cXyz.s"
void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) {
mM3dGAab.Set(&param_0, &param_1);
}
#pragma pop
/* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text
* SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */
void cBgS_ShdwDraw::SetCallback(int (*param_0)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int,
cM3dGPla*)) {
*(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0);
void cBgS_ShdwDraw::SetCallback(cBgS_ShdwDraw_Callback pCallback) {
mCallbackFun = pCallback;
}
libs/SSystem/SComponent/c_cc_d.cpp
+533 -492
View File
File diff suppressed because it is too large Load Diff
libs/SSystem/SComponent/c_cc_s.cpp
+107 -88
View File
@@ -5,7 +5,7 @@
#include "SSystem/SComponent/c_cc_s.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "global.h"
//
// Forward References:
@@ -76,9 +76,7 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__15cCcD_DivideArea[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern u32 __float_nan;
extern "C" extern u8 data_80451158[8];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
// Declarations:
@@ -88,115 +86,134 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
/* 80451158-80451160 0008+00 s=0 e=1 z=0 None .sbss None */
u8 data_80451158[8];
/* ############################################################################################## */
/* 803C3748-803C3778 020868 0030+00 1/1 2/2 0/0 .data __vt__4cCcS */
SECTION_DATA extern void* __vt__4cCcS[12] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts,
(void*)SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf,
(void*)
SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts,
(void*)
SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz,
(void*)ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts,
(void*)
ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts,
(void*)ChkNoHitGCo__4cCcSFP8cCcD_ObjP8cCcD_Obj,
(void*)__dt__4cCcSFv,
(void*)MoveAfterCheck__4cCcSFv,
(void*)SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj,
};
/* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcS::cCcS() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/__ct__4cCcSFv.s"
}
#pragma pop
cCcS::cCcS() {}
/* 80264A94-80264B60 25F3D4 00CC+00 1/1 1/1 0/0 .text Ct__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::Ct() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/Ct__4cCcSFv.s"
void cCcS::Ct() {
for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + ARRAY_SIZE(this->mpObjAt); ++obj) {
*obj = NULL;
}
this->mObjAtCount = 0;
for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + ARRAY_SIZE(this->mpObjTg); ++obj) {
*obj = NULL;
}
this->mObjTgCount = 0;
for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + ARRAY_SIZE(this->mpObjCo); ++obj) {
*obj = NULL;
}
this->mObjCoCount = 0;
for (cCcD_Obj** obj = this->mpObj; obj < this->mpObj + ARRAY_SIZE(this->mpObj); ++obj) {
*obj = NULL;
}
this->mObjCount = 0;
}
#pragma pop
/* 80264B60-80264B80 25F4A0 0020+00 0/0 1/1 0/0 .text Dt__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::Dt() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/Dt__4cCcSFv.s"
void cCcS::Dt() {
this->Ct();
}
#pragma pop
/* 80264B80-80264BA8 25F4C0 0028+00 1/1 0/0 0/0 .text GetWt__4cCcSCFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::GetWt(u8 param_0) const {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/GetWt__4cCcSCFUc.s"
WeightType cCcS::GetWt(u8 param_0) const {
if (param_0 == 0xFF) {
return WeightType_0;
}
if (param_0 == 0xFE) {
return WeightType_1;
}
return WeightType_2;
}
#pragma pop
/* 80264BA8-80264C5C 25F4E8 00B4+00 0/0 7/7 454/454 .text Set__4cCcSFP8cCcD_Obj */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::Set(cCcD_Obj* param_0) {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/Set__4cCcSFP8cCcD_Obj.s"
void cCcS::Set(cCcD_Obj* obj) {
if (obj->GetObjAt().getSPrm() & 1) {
if (mObjAtCount < ARRAY_SIZE(mpObjAt)) {
mpObjAt[mObjAtCount] = obj;
mObjAtCount++;
}
}
if (obj->GetObjTg().getSPrm() & 1) {
if (mObjTgCount < ARRAY_SIZE(mpObjTg)) {
mpObjTg[mObjTgCount] = obj;
mObjTgCount++;
}
}
if (obj->GetObjCo().getSPrm() & 1) {
if (mObjCoCount < ARRAY_SIZE(mpObjCo)) {
mpObjCo[mObjCoCount] = obj;
mObjCoCount++;
}
}
if (mObjCount < ARRAY_SIZE(mpObj)) {
mpObj[mObjCount] = obj;
mObjCount++;
}
}
#pragma pop
/* 80264C5C-80264CF0 25F59C 0094+00 1/1 0/0 0/0 .text ClrCoHitInf__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::ClrCoHitInf() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/ClrCoHitInf__4cCcSFv.s"
void cCcS::ClrCoHitInf() {
for (cCcD_Obj** obj = this->mpObjCo; obj < this->mpObjCo + this->mObjCoCount; ++obj) {
if (*obj != NULL) {
(*obj)->GetGObjInf()->ClrCoHit();
cCcD_Stts* stts = (*obj)->GetStts();
if (stts != NULL) {
stts->ClrCcMove();
}
}
}
}
#pragma pop
/* 80264CF0-80264D90 25F630 00A0+00 1/1 0/0 0/0 .text ClrTgHitInf__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::ClrTgHitInf() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/ClrTgHitInf__4cCcSFv.s"
void cCcS::ClrTgHitInf() {
for (cCcD_Obj** obj = this->mpObjTg; obj < this->mpObjTg + this->mObjTgCount; ++obj) {
if (*obj != NULL) {
(*obj)->GetGObjInf()->ClrTgHit();
cCcD_Stts* stts = (*obj)->GetStts();
if (stts != NULL) {
stts->ClrTg();
}
}
}
}
#pragma pop
/* 80264D90-80264E2C 25F6D0 009C+00 1/1 0/0 0/0 .text ClrAtHitInf__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::ClrAtHitInf() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/ClrAtHitInf__4cCcSFv.s"
void cCcS::ClrAtHitInf() {
for (cCcD_Obj** obj = this->mpObjAt; obj < this->mpObjAt + this->mObjAtCount; ++obj) {
if (*obj != NULL) {
(*obj)->GetGObjInf()->ClrAtHit();
cCcD_Stts* stts = (*obj)->GetStts();
if (stts != NULL) {
stts->ClrAt();
}
}
}
}
#pragma pop
/* 80264E2C-80264F40 25F76C 0114+00 1/1 0/0 0/0 .text ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj */
#ifdef NON_MATCHING
int cCcS::ChkNoHitAtTg(cCcD_Obj* obj1, cCcD_Obj* obj2) {
fopAc_ac_c* ac1 = obj1->GetAc();
fopAc_ac_c* ac2 = obj2->GetAc();
if (((ac1 != NULL && ac2 != NULL) && ac1 == ac2) ||
(obj1->GetObjAt().getSPrm() & 0x1E & obj2->GetObjTg().getSPrm() & 0x1E) == 0 ||
(obj1->GetObjAt().GetType() & obj2->GetObjTg().GetType()) == 0) {
return 1;
} else {
return this->ChkNoHitGAtTg(obj1->GetGObjInf(), obj2->GetGObjInf(),
obj1->GetStts()->GetGStts(), obj2->GetStts()->GetGStts());
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::ChkNoHitAtTg(cCcD_Obj* param_0, cCcD_Obj* param_1) {
asm int cCcS::ChkNoHitAtTg(cCcD_Obj* param_0, cCcD_Obj* param_1) {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80430CC0-80430CCC 05D9E0 000C+00 1/1 0/0 0/0 .bss @2492 */
@@ -336,14 +353,16 @@ asm void cCcS::CalcArea() {
#pragma pop
/* 80265CCC-80265D30 26060C 0064+00 0/0 1/1 0/0 .text Move__4cCcSFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void cCcS::Move() {
nofralloc
#include "asm/SSystem/SComponent/c_cc_s/Move__4cCcSFv.s"
void cCcS::Move() {
this->CalcArea();
this->ChkAtTg();
this->ChkCo();
this->MoveAfterCheck();
mObjAtCount = 0;
mObjTgCount = 0;
mObjCoCount = 0;
mObjCount = 0;
}
#pragma pop
/* 80265D30-80265DF4 260670 00C4+00 0/0 1/1 0/0 .text DrawClear__4cCcSFv */
#pragma push
libs/SSystem/SComponent/c_m3d.cpp
-4
View File
@@ -142,10 +142,6 @@ f32 cM3d_Len2dSq(f32 pX1, f32 pY1, f32 pX2, f32 pY2) {
/* 80451180-80451188 000680 0004+04 29/29 44/44 65/65 .sbss G_CM3D_F_ABS_MIN */
extern f32 G_CM3D_F_ABS_MIN;
inline bool cM3d_IsZero(f32 pF) {
return fabsf(pF) < G_CM3D_F_ABS_MIN;
}
/* 80455118-80455120 003718 0004+04 28/28 0/0 0/0 .sdata2 @2256 */
SECTION_SDATA2 static f32 lit_2256[1 + 1 /* padding */] = {
0.0f,
libs/SSystem/SComponent/c_m3d_g_cps.cpp
+3 -3
View File
@@ -20,16 +20,16 @@ cM3dGCps::~cM3dGCps(void) {}
/* 8026F000-8026F03C 269940 003C+00 1/1 2/2 10/10 .text Set__8cM3dGCpsFRC4cXyzRC4cXyzf */
void cM3dGCps::Set(const cXyz& pStart, const cXyz& pEnd, f32 pUnkF) {
this->SetStartEnd(pStart, pEnd);
unk_0x1c = pUnkF;
mRadius = pUnkF;
}
/* 8026F03C-8026F080 26997C 0044+00 0/0 1/1 10/10 .text Set__8cM3dGCpsFRC9cM3dGCpsS */
void cM3dGCps::Set(const cM3dGCpsS& other) {
this->SetStartEnd(other.mStart, other.mEnd);
unk_0x1c = other.unk_0x1c;
mRadius = other.mRadius;
}
/* 8026F080-8026F0A8 2699C0 0028+00 0/0 1/1 0/0 .text SetCps__8cM3dGCpsFRC8cM3dGCps */
void cM3dGCps::SetCps(const cM3dGCps& other) {
this->Set(other.GetStartP(), other.GetEndP(), other.unk_0x1c);
this->Set(other.GetStartP(), other.GetEndP(), other.mRadius);
}
libs/SSystem/SComponent/c_m3d_g_tri.cpp
+3 -3
View File
@@ -23,7 +23,7 @@ void cM3dGTri::setPos(const Vec* pA, const Vec* pB, const Vec* pC) {
mA = *pA;
mB = *pB;
mC = *pC;
cM3d_CalcPla(&mA, &mB, &mC, &mPlane.mNormal, &mPlane.mD);
cM3d_CalcPla(&mA, &mB, &mC, &mNormal, &mD);
}
/* 8026F85C-8026F8C8 26A19C 006C+00 0/0 2/2 0/0 .text
@@ -32,7 +32,7 @@ void cM3dGTri::setBg(const Vec* pA, const Vec* pB, const Vec* pC, const cM3dGPla
mA = *pA;
mB = *pB;
mC = *pC;
mPlane.Set(pPlane);
Set(pPlane);
}
/* 8026F8C8-8026F93C 26A208 0074+00 0/0 1/1 0/0 .text set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec */
@@ -40,5 +40,5 @@ void cM3dGTri::set(const Vec* pA, const Vec* pB, const Vec* pC, const Vec* pNorm
mA = *pA;
mB = *pB;
mC = *pC;
mPlane.SetupNP(*pNormal, *pA);
SetupNP(*pNormal, *pA);
}