mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-27 23:31:36 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -5,16 +5,12 @@
|
||||
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
|
||||
/* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss sNoUseDrawMtx__12J3DMtxBuffer */
|
||||
Mtx J3DMtxBuffer::sNoUseDrawMtx;
|
||||
|
||||
/* 804371F0-80437218 063F10 0024+04 1/0 0/0 0/0 .bss sNoUseNrmMtx__12J3DMtxBuffer */
|
||||
Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
|
||||
|
||||
/* 80450970-80450974 -00001 0004+00 1/1 0/0 0/0 .sdata sNoUseDrawMtxPtr__12J3DMtxBuffer */
|
||||
Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
|
||||
|
||||
/* 80450974-80450978 -00001 0004+00 1/1 0/0 0/0 .sdata sNoUseNrmMtxPtr__12J3DMtxBuffer */
|
||||
Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
|
||||
|
||||
// force .sdata2 order
|
||||
@@ -26,7 +22,6 @@ f32 dummy0() {
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
/* 80326214-80326258 320B54 0044+00 0/0 1/1 0/0 .text initialize__12J3DMtxBufferFv */
|
||||
void J3DMtxBuffer::initialize() {
|
||||
mJointTree = NULL;
|
||||
mpScaleFlagArr = NULL;
|
||||
@@ -44,7 +39,6 @@ void J3DMtxBuffer::initialize() {
|
||||
mpUserAnmMtx = NULL;
|
||||
}
|
||||
|
||||
/* 80326258-80326364 320B98 010C+00 0/0 1/1 0/0 .text create__12J3DMtxBufferFP12J3DModelDataUl */
|
||||
enum {
|
||||
J3DMdlDataFlag_ConcatView = 0x10,
|
||||
J3DMdlDataFlag_NoAnimation = 0x100,
|
||||
@@ -96,8 +90,6 @@ s32 J3DMtxBuffer::create(J3DModelData* pModelData, u32 mtxNum) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* 80326364-803263F0 320CA4 008C+00 1/1 0/0 0/0 .text createAnmMtx__12J3DMtxBufferFP12J3DModelData
|
||||
*/
|
||||
J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
|
||||
if (pModelData->getJointNum() != 0) {
|
||||
mpScaleFlagArr = new u8[pModelData->getJointNum()];
|
||||
@@ -115,8 +107,6 @@ J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
|
||||
return kJ3DError_Success;
|
||||
}
|
||||
|
||||
/* 803263F0-8032648C 320D30 009C+00 1/1 0/0 0/0 .text
|
||||
* createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData */
|
||||
s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
|
||||
if (pModelData->getWEvlpMtxNum() != 0) {
|
||||
mpEvlpScaleFlagArr = new u8[pModelData->getWEvlpMtxNum()];
|
||||
@@ -131,8 +121,6 @@ s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
|
||||
return kJ3DError_Success;
|
||||
}
|
||||
|
||||
/* 8032648C-803264B8 320DCC 002C+00 1/1 0/0 0/0 .text setNoUseDrawMtx__12J3DMtxBufferFv
|
||||
*/
|
||||
s32 J3DMtxBuffer::setNoUseDrawMtx() {
|
||||
mpDrawMtxArr[0] = mpDrawMtxArr[1] = &sNoUseDrawMtxPtr;
|
||||
mpNrmMtxArr[0] = mpNrmMtxArr[1] = &sNoUseNrmMtxPtr;
|
||||
@@ -140,8 +128,6 @@ s32 J3DMtxBuffer::setNoUseDrawMtx() {
|
||||
return kJ3DError_Success;
|
||||
}
|
||||
|
||||
/* 803264B8-80326664 320DF8 01AC+00 1/1 0/0 0/0 .text
|
||||
* createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl */
|
||||
s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
|
||||
if (mtxNum != 0) {
|
||||
for (s32 i = 0; i < 2; i++) {
|
||||
@@ -183,8 +169,6 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
|
||||
return kJ3DError_Success;
|
||||
}
|
||||
|
||||
/* 80326664-803268D4 320FA4 0270+00 1/1 0/0 0/0 .text
|
||||
* createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl */
|
||||
s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
|
||||
J3D_ASSERT_NULLPTR(295, i_modelData != NULL);
|
||||
|
||||
@@ -250,10 +234,8 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
|
||||
return kJ3DError_Success;
|
||||
}
|
||||
|
||||
/* 80450978-80450980 0003F8 0008+00 1/1 0/0 0/0 .sdata J3DUnit01 */
|
||||
static f32 J3DUnit01[] = { 0.0f, 1.0f };
|
||||
|
||||
/* 803268D4-80326ACC 321214 01F8+00 0/0 1/1 0/0 .text calcWeightEnvelopeMtx__12J3DMtxBufferFv */
|
||||
void J3DMtxBuffer::calcWeightEnvelopeMtx() {
|
||||
register MtxP weightAnmMtx;
|
||||
register Mtx* worldMtx;
|
||||
@@ -418,8 +400,6 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80326ACC-80326D3C 32140C 0270+00 0/0 1/1 0/0 .text
|
||||
* calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf */
|
||||
void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param_2) {
|
||||
Mtx* sp24, *sp20;
|
||||
int sp1C = 0;
|
||||
@@ -469,7 +449,6 @@ void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param
|
||||
}
|
||||
}
|
||||
|
||||
/* 80326D3C-80326EF0 32167C 01B4+00 0/0 1/1 0/0 .text calcNrmMtx__12J3DMtxBufferFv */
|
||||
void J3DMtxBuffer::calcNrmMtx() {
|
||||
u16 drawMtxNum = mJointTree->getDrawMtxNum();
|
||||
for (u16 i = 0; i < drawMtxNum; i++) {
|
||||
@@ -489,7 +468,6 @@ void J3DMtxBuffer::calcNrmMtx() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80326EF0-80327048 321830 0158+00 0/0 1/1 0/0 .text calcBBoardMtx__12J3DMtxBufferFv */
|
||||
void J3DMtxBuffer::calcBBoardMtx() {
|
||||
u16 drawMtxNum = mJointTree->getDrawMtxNum();
|
||||
for (u16 i = 0; i < drawMtxNum; i++) {
|
||||
@@ -519,8 +497,6 @@ void J3DMtxBuffer::calcBBoardMtx() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80327048-80327100 321988 00B8+00 1/1 1/1 0/0 .text
|
||||
* J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f */
|
||||
void J3DCalcViewBaseMtx(Mtx view, Vec const& scale, const Mtx& base, Mtx dst) {
|
||||
Mtx m;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user