mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 21:45:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

some J3D/misc cleanup (#2628)

Browse Source 
* some j3d cleanup

* begin using uintptr_t

* j3dgraphbase cleanup

* j3dgraphanimator cleanup
This commit is contained in:
TakaRikka
2025-09-04 07:56:59 -07:00
committed by GitHub
parent ee8b843996
commit b45a089e15
290 changed files with 4221 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+115 -85
View File
@@ -1,8 +1,3 @@
//
// Generated By: dol2asm
// Translation Unit: J3DMaterialAttach
//
#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -38,13 +33,14 @@ J3DMaterialTable::~J3DMaterialTable() {}
/* 8032F64C-8032F6F8 329F8C 00AC+00 0/0 1/1 5/5 .text
* removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor */
int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
JUT_ASSERT_MSG(208, pAnmColor != NULL, "Error : null pointer.")
J3D_ASSERT_NULLPTR(208, pAnmColor != NULL);
int ret = false;
u16 updateMatNum = pAnmColor->getUpdateMaterialNum();
for (u16 i = 0; i < updateMatNum; i++) {
if (pAnmColor->isValidUpdateMaterialID(i)) {
u16 materialUpdateId = pAnmColor->getUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(materialUpdateId)->getMaterialAnm();
u16 matNo = pAnmColor->getUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
if (materialAnm == NULL) {
ret = true;
} else {
@@ -52,22 +48,23 @@ int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
}
}
}
return ret;
}
/* 8032F6F8-8032F7B4 32A038 00BC+00 0/0 5/5 10/10 .text
* removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern */
int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* anm) {
JUT_ASSERT_MSG(242, anm != NULL, "Error : null pointer.")
int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
J3D_ASSERT_NULLPTR(242, pAnmTexPattern != NULL);
int ret = 0;
u16 materialNum = anm->getUpdateMaterialNum();
J3DAnmTexPatternFullTable* anm_table = (J3DAnmTexPatternFullTable*)anm->getAnmTable();
u16 materialNum = pAnmTexPattern->getUpdateMaterialNum();
J3DAnmTexPatternFullTable* anm_table = (J3DAnmTexPatternFullTable*)pAnmTexPattern->getAnmTable();
for (u16 i = 0; i < materialNum; i++) {
if (anm->isValidUpdateMaterialID(i)) {
u16 materialID = anm->getUpdateMaterialID(i);
J3DMaterialAnm* pMatAnm = getMaterialNodePointer(materialID)->getMaterialAnm();
if (pAnmTexPattern->isValidUpdateMaterialID(i)) {
u16 matNo = pAnmTexPattern->getUpdateMaterialID(i);
J3DMaterialAnm* pMatAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
u8 texNo = anm_table[i].mTexNo;
if (pMatAnm == NULL)
ret = 1;
@@ -81,19 +78,20 @@ int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* anm) {
/* 8032F7B4-8032F880 32A0F4 00CC+00 0/0 4/4 26/26 .text
* removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnm) {
JUT_ASSERT_MSG(278, pAnm != NULL, "Error : null pointer.")
int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
J3D_ASSERT_NULLPTR(278, pAnmTexSRTKey != NULL);
s32 ret = 0;
u16 materialNum = pAnm->getUpdateMaterialNum();
u16 materialNum = pAnmTexSRTKey->getUpdateMaterialNum();
u16 postUpdateMaterialNum[1];
postUpdateMaterialNum[0] = pAnm->getPostUpdateMaterialNum();
postUpdateMaterialNum[0] = pAnmTexSRTKey->getPostUpdateMaterialNum();
for (u16 i = 0; i < materialNum; i++) {
if (pAnm->isValidUpdateMaterialID(i)) {
u16 updateMaterial = pAnm->getUpdateMaterialID(i);
J3DMaterial* pMaterial = getMaterialNodePointer(updateMaterial);
if (pAnmTexSRTKey->isValidUpdateMaterialID(i)) {
u16 matNo = pAnmTexSRTKey->getUpdateMaterialID(i);
J3DMaterial* pMaterial = getMaterialNodePointer(matNo);
J3DMaterialAnm* pMatAnm = pMaterial->getMaterialAnm();
u8 texMtxID = pAnm->getUpdateTexMtxID(i);
u8 texMtxID = pAnmTexSRTKey->getUpdateTexMtxID(i);
if (pMatAnm == NULL) {
ret = 1;
} else if (texMtxID != 0xFF) {
@@ -107,15 +105,19 @@ int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnm) {
/* 8032F880-8032F9C0 32A1C0 0140+00 0/0 7/7 24/24 .text
* removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey */
int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
J3D_ASSERT_NULLPTR(320, pAnmTevRegKey != NULL);
s32 ret = 0;
u16 cRegMaterialNum = pAnm->getCRegUpdateMaterialNum();
u16 kRegMaterialNum = pAnm->getKRegUpdateMaterialNum();
u16 cRegMaterialNum = pAnmTevRegKey->getCRegUpdateMaterialNum();
u16 kRegMaterialNum = pAnmTevRegKey->getKRegUpdateMaterialNum();
for (u16 i = 0; i < cRegMaterialNum; i++) {
if (pAnm->getCRegUpdateMaterialID(i) != 0xFFFF) {
J3DMaterialAnm * pMatAnm = getMaterialNodePointer(pAnm->getCRegUpdateMaterialID(i))->getMaterialAnm();
u32 colorId = pAnm->getAnmCRegKeyTable()[i].mColorId;
if (pAnmTevRegKey->isValidCRegUpdateMaterialID(i)) {
const u16 spC = pAnmTevRegKey->getCRegUpdateMaterialID(i);
J3DMaterialAnm* pMatAnm = getMaterialNodePointer(spC)->getMaterialAnm();
const J3DAnmCRegKeyTable* table = pAnmTevRegKey->getAnmCRegKeyTable();
const u8 colorId = table[i].mColorId;
if (pMatAnm == NULL)
ret = 1;
else
@@ -124,9 +126,11 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
}
for (u16 i = 0; i < kRegMaterialNum; i++) {
if (pAnm->getKRegUpdateMaterialID(i) != 0xFFFF) {
J3DMaterialAnm * pMatAnm = getMaterialNodePointer(pAnm->getKRegUpdateMaterialID(i))->getMaterialAnm();
u32 colorId = pAnm->getAnmKRegKeyTable()[i].mColorId;
if (pAnmTevRegKey->isValidKRegUpdateMaterialID(i)) {
const u16 spA = pAnmTevRegKey->getKRegUpdateMaterialID(i);
J3DMaterialAnm* pMatAnm = getMaterialNodePointer(spA)->getMaterialAnm();
const J3DAnmKRegKeyTable* table = pAnmTevRegKey->getAnmKRegKeyTable();
const u8 colorId = table[i].mColorId;
if (pMatAnm == NULL) {
ret = 1;
} else {
@@ -140,99 +144,117 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnm) {
/* 8032F9C0-8032FAF4 32A300 0134+00 1/1 0/0 0/0 .text
* createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* param_1) {
int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
J3D_ASSERT_NULLPTR(382, pTexSRTKey != NULL);
int rv = 0;
u16 materialNum = param_1->getUpdateMaterialNum();
u16 materialNum = pTexSRTKey->getUpdateMaterialNum();
if (isLocked()) {
return 2;
}
for (u16 i = 0; i < materialNum; i++) {
if (param_1->isValidUpdateMaterialID(i)) {
J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
u8 mtxId = param_1->getUpdateTexMtxID(i);
if (material->getMaterialAnm() == 0) {
if (pTexSRTKey->isValidUpdateMaterialID(i)) {
const u16 matNo = pTexSRTKey->getUpdateMaterialID(i);
J3DMaterial* material = getMaterialNodePointer(matNo);
u8 texMtx = pTexSRTKey->getUpdateTexMtxID(i);
J3DMaterialAnm* pMaterialAnm = material->getMaterialAnm();
if (pMaterialAnm == NULL) {
rv = 1;
} else {
u32 mtxId2 = mtxId;
if (mtxId2 != 0xff && material->getTexMtx(mtxId2) == 0) {
if (texMtx != 0xff && material->getTexMtx(texMtx) == NULL) {
J3DTexMtx* mtx = new J3DTexMtx();
rv = 4;
material->setTexMtx(mtxId2, mtx);
JUT_WARN(420, "matNo<%d> : texMtx%d nothing !\n", i, mtxId);
material->setTexMtx(texMtx, mtx);
JUT_WARN(420, "matNo<%d> : texMtx%d nothing !\n", matNo, texMtx);
}
}
}
}
return rv;
}
/* 8032FAF4-8032FBC8 32A434 00D4+00 0/0 1/1 0/0 .text
* entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor */
int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* param_1) {
int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
J3D_ASSERT_NULLPTR(450, pAnmColor != NULL);
int rv = 0;
u16 materialNum = param_1->getUpdateMaterialNum();
u16 materialNum = pAnmColor->getUpdateMaterialNum();
if (isLocked()) {
return 2;
}
for (u16 i = 0; i < materialNum; i++) {
if (param_1->isValidUpdateMaterialID(i)) {
J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
J3DMaterialAnm* materialAnm = material->getMaterialAnm();
if (materialAnm == 0) {
if (pAnmColor->isValidUpdateMaterialID(i)) {
const u16 matNo = pAnmColor->getUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
if (materialAnm == NULL) {
rv = 1;
} else {
J3DMatColorAnm matColorAnm(i, param_1);
J3DMatColorAnm matColorAnm(i, pAnmColor);
materialAnm->setMatColorAnm(0, &matColorAnm);
}
}
}
return rv;
}
/* 8032FBC8-8032FCC4 32A508 00FC+00 0/0 7/7 1/1 .text
* entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern */
int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* param_1) {
int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
J3D_ASSERT_NULLPTR(489, pAnmTexPattern != NULL);
int rv = 0;
u16 materialNum = param_1->getUpdateMaterialNum();
u16 materialNum = pAnmTexPattern->getUpdateMaterialNum();
if (isLocked()) {
return 2;
}
for (u16 i = 0; i < materialNum; i++) {
if (param_1->isValidUpdateMaterialID(i)) {
J3DMaterial* material = getMaterialNodePointer(param_1->getUpdateMaterialID(i));
J3DMaterialAnm* materialAnm = material->getMaterialAnm();
u8 texNo = param_1->getAnmTable()[i].mTexNo;
if (materialAnm == 0) {
if (pAnmTexPattern->isValidUpdateMaterialID(i)) {
const u16 matNo = pAnmTexPattern->getUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
const J3DAnmTexPatternFullTable* table = pAnmTexPattern->getAnmTable();
const u8 texNo = table[i].mTexNo;
if (materialAnm == NULL) {
rv = 1;
} else {
J3DTexNoAnm texNoAnm(i, param_1);
J3DTexNoAnm texNoAnm(i, pAnmTexPattern);
materialAnm->setTexNoAnm(texNo, &texNoAnm);
}
}
}
return rv;
}
/* 8032FCC4-8032FE70 32A604 01AC+00 0/0 14/14 6/6 .text
* entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* btk) {
JUT_ASSERT_MSG(532, btk != NULL, "Error : null pointer.")
int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
J3D_ASSERT_NULLPTR(532, pAnmTexSRTKey != NULL);
int rv = 0;
u16 materialNum = btk->getUpdateMaterialNum();
rv = createTexMtxForAnimator(btk);
u16 materialNum = pAnmTexSRTKey->getUpdateMaterialNum();
rv = createTexMtxForAnimator(pAnmTexSRTKey);
if (rv != 0) {
return rv;
}
if (isLocked()) {
return 2;
}
for (u16 no = 0; no < materialNum; no++) {
if (btk->isValidUpdateMaterialID(no)) {
u16 updateMaterialId = btk->getUpdateMaterialID(no);
J3DMaterial* material = getMaterialNodePointer((u16)updateMaterialId);
if (pAnmTexSRTKey->isValidUpdateMaterialID(no)) {
const u16 matNo = pAnmTexSRTKey->getUpdateMaterialID(no);
J3DMaterial* material = getMaterialNodePointer(matNo);
J3DMaterialAnm* materialAnm = material->getMaterialAnm();
u8 texMtxID = btk->getUpdateTexMtxID(no);
if (materialAnm == 0) {
u8 texMtxID = pAnmTexSRTKey->getUpdateTexMtxID(no);
if (materialAnm == NULL) {
rv = 1;
} else {
if (texMtxID != 0xff) {
@@ -240,53 +262,61 @@ int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* btk) {
material->getTexCoord(texMtxID)->setTexGenMtx((u8)texMtxID * 3 + 30);
}
J3DTexMtxInfo& tmtxinfo = material->getTexMtx(texMtxID)->getTexMtxInfo();
tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x3f) | (btk->getTexMtxCalcType() << 7);
tmtxinfo.mCenter.x = btk->getSRTCenter(no)->x;
tmtxinfo.mCenter.y = btk->getSRTCenter(no)->y;
tmtxinfo.mCenter.z = btk->getSRTCenter(no)->z;
J3DTexMtxAnm texMtxAnm(no, btk);
tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x3f) | (pAnmTexSRTKey->getTexMtxCalcType() << 7);
tmtxinfo.mCenter.x = pAnmTexSRTKey->getSRTCenter(no)->x;
tmtxinfo.mCenter.y = pAnmTexSRTKey->getSRTCenter(no)->y;
tmtxinfo.mCenter.z = pAnmTexSRTKey->getSRTCenter(no)->z;
J3DTexMtxAnm texMtxAnm(no, pAnmTexSRTKey);
materialAnm->setTexMtxAnm(texMtxID, &texMtxAnm);
}
}
}
}
return rv;
}
/* 8032FE70-8032FFEC 32A7B0 017C+00 0/0 10/10 4/4 .text
* entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey */
int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* param_1) {
int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
J3D_ASSERT_NULLPTR(599, pAnmTevRegKey != NULL);
int rv = 0;
u16 cRegNum = param_1->getCRegUpdateMaterialNum();
u16 kRegNum = param_1->getKRegUpdateMaterialNum();
u16 cRegNum = pAnmTevRegKey->getCRegUpdateMaterialNum();
u16 kRegNum = pAnmTevRegKey->getKRegUpdateMaterialNum();
if (isLocked()) {
return 2;
}
for (u16 i = 0; i < cRegNum; i++) {
if (param_1->isValidCRegUpdateMaterialID(i)) {
J3DMaterial* material = getMaterialNodePointer(param_1->getCRegUpdateMaterialID(i));
J3DMaterialAnm* materialAnm = material->getMaterialAnm();
u8 colorId = param_1->getAnmCRegKeyTable()[i].mColorId;
if (pAnmTevRegKey->isValidCRegUpdateMaterialID(i)) {
const u16 matNo = pAnmTevRegKey->getCRegUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
const J3DAnmCRegKeyTable* table = pAnmTevRegKey->getAnmCRegKeyTable();
u8 colorId = table[i].mColorId;
if (materialAnm == NULL) {
rv = 1;
} else {
J3DTevColorAnm tevColorAnm(i, param_1);
J3DTevColorAnm tevColorAnm(i, pAnmTevRegKey);
materialAnm->setTevColorAnm(colorId, &tevColorAnm);
}
}
}
for (u16 i = 0; i < kRegNum; i++) {
if (param_1->isValidKRegUpdateMaterialID(i)) {
J3DMaterial* material = getMaterialNodePointer(param_1->getKRegUpdateMaterialID(i));
J3DMaterialAnm* materialAnm = material->getMaterialAnm();
u32 colorId = param_1->getAnmKRegKeyTable()[i].mColorId;
if (pAnmTevRegKey->isValidKRegUpdateMaterialID(i)) {
const u16 matNo = pAnmTevRegKey->getKRegUpdateMaterialID(i);
J3DMaterialAnm* materialAnm = getMaterialNodePointer(matNo)->getMaterialAnm();
const J3DAnmKRegKeyTable* table = pAnmTevRegKey->getAnmKRegKeyTable();
const u8 colorId = table[i].mColorId;
if (materialAnm == NULL) {
rv = 1;
} else {
J3DTevKColorAnm tevKColorAnm(i, param_1);
J3DTevKColorAnm tevKColorAnm(i, pAnmTevRegKey);
materialAnm->setTevKColorAnm(colorId, &tevKColorAnm);
}
}
}
return rv;
}