mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3D setup (#155)

Browse Source 
* setup j3d classes

* remove asm

* fixes

* fix newDifferedDisplayList
This commit is contained in:
TakaRikka
2021-10-11 09:38:53 -07:00
committed by GitHub
parent f51c495cf4
commit f51935c034
134 changed files with 3399 additions and 4786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+15 -49
View File
@@ -26,8 +26,6 @@ struct mDoMtx_stack_c {
static u8 now[48];
};
struct J3DAnmCluster {};
struct mDoExt_blkAnm {
/* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
};
@@ -98,8 +96,6 @@ struct daCrod_c {
/* 80141A94 */ void setControllActorData();
};
struct J3DMaterial {};
struct daAlink_matAnm_c {
/* 8009D8E4 */ void init();
/* 8009D90C */ void calc(J3DMaterial*) const;
@@ -677,49 +673,12 @@ struct JAISeq {
/* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
};
struct J3DTexNoAnm {
/* 8003B1F8 */ ~J3DTexNoAnm();
/* 8003B240 */ J3DTexNoAnm();
};
struct J3DTexMtxAnm {
/* 8003B264 */ ~J3DTexMtxAnm();
/* 8003B2A0 */ J3DTexMtxAnm();
};
struct J3DTevKColorAnm {
/* 8003B150 */ ~J3DTevKColorAnm();
/* 8003B18C */ J3DTevKColorAnm();
};
struct J3DTevColorAnm {
/* 8003B1A4 */ ~J3DTevColorAnm();
/* 8003B1E0 */ J3DTevColorAnm();
};
struct J3DTevBlock {
/* 80110E80 */ void setTevColor(u32, J3DGXColorS10 const*);
};
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
static u8 sOldVcdVatCmd[4];
};
struct J3DMaterialAnm {
/* 800A4820 */ ~J3DMaterialAnm();
/* 8032C320 */ void initialize();
/* 8032C3C4 */ void calc(J3DMaterial*) const;
};
struct J3DMatColorAnm {
/* 8003B2B8 */ ~J3DMatColorAnm();
/* 8003B2F4 */ J3DMatColorAnm();
};
struct J3DJoint {};
struct J3DAnmLoaderDataBaseFlag {};
struct J3DAnmLoaderDataBase {
@@ -17697,9 +17656,9 @@ asm void daAlink_c::setFrontRollCrashShock(u8 param_0) {
#pragma pop
/* 800C1DAC-800C1DE0 0BC6EC 0034+00 1/0 0/0 0/0 .text getModelJointMtx__9daAlink_cFUs */
Mtx* daAlink_c::getModelJointMtx(u16 param_0) {
MtxP daAlink_c::getModelJointMtx(u16 param_0) {
if (param_0 >= field_0x30c6) {
return &field_0x0650->mBaseTransformMtx;
return field_0x0650->mBaseTransformMtx;
}
return field_0x0650->i_getAnmMtx(param_0);
}
@@ -20115,7 +20074,8 @@ asm bool daAlink_c::checkWolfDownAttackPullOut() const {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool daAlink_c::getMidnaAtnPos() const {
extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() {
// asm bool daAlink_c::getMidnaAtnPos() const {
nofralloc
#include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s"
}
@@ -31544,7 +31504,9 @@ asm void daAlink_c::setRunSplash() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
extern "C" asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle() {
// asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle*
// param_1) {
nofralloc
#include "asm/d/a/d_a_alink/execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle.s"
}
@@ -31714,7 +31676,8 @@ SECTION_SDATA static u8 nColor0[4] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_blur_c::draw() {
extern "C" asm void draw__14daAlink_blur_cFv() {
// asm void daAlink_blur_c::draw() {
nofralloc
#include "asm/d/a/d_a_alink/draw__14daAlink_blur_cFv.s"
}
@@ -31754,7 +31717,8 @@ asm void daAlink_lockCursor_c::update() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_lockCursor_c::draw() {
extern "C" asm void draw__20daAlink_lockCursor_cFv() {
// asm void daAlink_lockCursor_c::draw() {
nofralloc
#include "asm/d/a/d_a_alink/draw__20daAlink_lockCursor_cFv.s"
}
@@ -31774,7 +31738,8 @@ asm void daAlink_sight_c::create() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_sight_c::draw() {
extern "C" asm void draw__15daAlink_sight_cFv() {
// asm void daAlink_sight_c::draw() {
nofralloc
#include "asm/d/a/d_a_alink/draw__15daAlink_sight_cFv.s"
}
@@ -35130,7 +35095,8 @@ int daPy_py_c::checkEndResetFlg0(daPy_ERFLG0 pFlag) const {
}
/* 80141500-80141508 13BE40 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daPy_py_cCFv */
bool daPy_py_c::getMidnaAtnPos() const {
extern "C" bool getMidnaAtnPos__9daPy_py_cCFv() {
// bool daPy_py_c::getMidnaAtnPos() const {
return false;
}
src/d/a/d_a_player.cpp
+2 -5
View File
@@ -25,10 +25,6 @@ struct JMath {
static u8 sincosTable_[65536];
};
struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct J3DAnmLoaderDataBaseFlag {};
struct J3DAnmLoaderDataBase {
@@ -748,7 +744,8 @@ SECTION_SDATA2 static u32 lit_4669 = 0x321400FF;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_sightPacket_c::draw() {
extern "C" asm void draw__18daPy_sightPacket_cFv() {
// asm void daPy_sightPacket_c::draw() {
nofralloc
#include "asm/d/a/d_a_player/draw__18daPy_sightPacket_cFv.s"
}
src/d/d_attention.cpp
-6
View File
@@ -35,12 +35,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct J3DGXColor {};
struct J3DTevBlock {
/* 800732AC */ void setTevKColor(u32, J3DGXColor const*);
};
//
// Forward References:
//
src/d/d_eye_hl.cpp
-8
View File
@@ -7,14 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JUTNameTab {
/* 802DEAF8 */ void getName(u16) const;
};
//
// Forward References:
//
src/d/d_resorce.cpp
+30 -98
View File
@@ -4,6 +4,13 @@
//
#include "d/d_resorce.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "JSystem/J3DGraphBase/J3DTevs.h"
#include "JSystem/J3DGraphBase/J3DTexture.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
@@ -32,84 +39,6 @@ struct dBgWKCol {
/* 8007E7D0 */ void initKCollision(void*);
};
struct J3DTexture {
/* 8031221C */ void addResTIMG(u16, ResTIMG const*);
};
struct J3DTexNoAnm {
/* 8003B1F8 */ ~J3DTexNoAnm();
/* 8003B240 */ J3DTexNoAnm();
/* 8003C82C */ void calc(u16*) const;
};
struct J3DTexMtxInfo {
/* 80325718 */ void operator=(J3DTexMtxInfo const&);
};
struct J3DTexMtxAnm {
/* 8003B264 */ ~J3DTexMtxAnm();
/* 8003B2A0 */ J3DTexMtxAnm();
};
struct J3DTexMtx {};
struct J3DTexGenBlock {
/* 8003AB2C */ void setTexMtx(u32, J3DTexMtx*);
};
struct J3DTevStageInfo {};
struct J3DTevStage {
/* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
/* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
};
struct J3DTevKColorAnm {
/* 8003B150 */ ~J3DTevKColorAnm();
/* 8003B18C */ J3DTevKColorAnm();
};
struct J3DTevColorAnm {
/* 8003B1A4 */ ~J3DTevColorAnm();
/* 8003B1E0 */ J3DTevColorAnm();
};
struct J3DShape {
/* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
/* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
};
struct J3DModelLoaderDataBase {
/* 803346BC */ void load(void const*, u32);
};
struct J3DMaterialAnm {
/* 8032C320 */ void initialize();
};
struct J3DMatColorAnm {
/* 8003B2B8 */ ~J3DMatColorAnm();
/* 8003B2F4 */ J3DMatColorAnm();
};
struct J3DClusterLoaderDataBase {
/* 80334130 */ void load(void const*);
};
struct J3DAnmTransformKey {
/* 8003B8D0 */ ~J3DAnmTransformKey();
/* 8003C800 */ s32 getKind() const;
/* 8003C808 */ void getTransform(u16, J3DTransformInfo*) const;
/* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
};
struct J3DAnmLoaderDataBaseFlag {};
struct J3DAnmLoaderDataBase {
/* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag);
/* 80338134 */ void setResource(J3DAnmBase*, void const*);
};
//
// Forward References:
//
@@ -232,7 +161,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void memcmp();
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_env_light[4880];
@@ -289,14 +217,20 @@ int dRes_info_c::set(char const* pArcName, char const* pArcPath, u8 param_2, JKR
}
/* 8003A3F0-8003A490 034D30 00A0+00 1/1 0/0 0/0 .text setAlpha__FP16J3DMaterialTable */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void setAlpha(J3DMaterialTable* param_0) {
nofralloc
#include "asm/d/d_resorce/setAlpha__FP16J3DMaterialTable.s"
static void setAlpha(J3DMaterialTable* pMatTable) {
for (u16 i = 0; i < pMatTable->getMaterialNum(); i++) {
J3DMaterial* mat = pMatTable->getMaterialNodePointer(i);
J3DTevBlock* tevBlock = mat->getTevBlock();
if (tevBlock != NULL) {
_GXColorS10* tevColor = tevBlock->getTevColor(3);
if (tevColor != NULL) {
u8 tevStageNum = tevBlock->getTevStageNum();
tevColor->a = tevStageNum;
}
}
}
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
@@ -318,14 +252,9 @@ static asm void setIndirectTex(J3DModelData* param_0) {
#pragma pop
/* 8003A81C-8003A840 03515C 0024+00 1/1 0/0 0/0 .text setAlpha__FP12J3DModelData */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void setAlpha(J3DModelData* param_0) {
nofralloc
#include "asm/d/d_resorce/setAlpha__FP12J3DModelData.s"
static void setAlpha(J3DModelData* pModelData) {
setAlpha(&pModelData->getMaterialTable());
}
#pragma pop
/* ############################################################################################## */
/* 80379840-803798A4 005EA0 0064+00 2/2 0/0 0/0 .rodata l_texMtxInfo */
@@ -624,7 +553,8 @@ asm int dRes_info_c::loadResource() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DAnmTransformKey::~J3DAnmTransformKey() {
extern "C" asm void __dt__18J3DAnmTransformKeyFv() {
// asm J3DAnmTransformKey::~J3DAnmTransformKey() {
nofralloc
#include "asm/d/d_resorce/__dt__18J3DAnmTransformKeyFv.s"
}
@@ -634,7 +564,8 @@ asm J3DAnmTransformKey::~J3DAnmTransformKey() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DAnmTransform::~J3DAnmTransform() {
extern "C" asm void __dt__15J3DAnmTransformFv() {
// asm J3DAnmTransform::~J3DAnmTransform() {
nofralloc
#include "asm/d/d_resorce/__dt__15J3DAnmTransformFv.s"
}
@@ -1149,15 +1080,16 @@ int dRes_control_c::getObjectResName2Index(char const* arcName, char const* para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DAnmBase::~J3DAnmBase() {
extern "C" asm void __dt__10J3DAnmBaseFv() {
// asm J3DAnmBase::~J3DAnmBase() {
nofralloc
#include "asm/d/d_resorce/__dt__10J3DAnmBaseFv.s"
}
#pragma pop
/* 8003C77C-8003C784 0370BC 0008+00 1/0 0/0 0/0 .text getKind__15J3DAnmTransformCFv */
bool J3DAnmTransform::getKind() const {
return false;
s32 J3DAnmTransform::getKind() const {
return 0;
}
/* 8003C784-8003C800 0370C4 007C+00 1/0 0/0 0/0 .text __dt__18mDoExt_transAnmBasFv */
src/d/kankyo/d_kankyo.cpp
-14
View File
@@ -63,19 +63,6 @@ struct JMath {
static u8 sincosTable_[65536];
};
struct J3DTexMtxInfo {
/* 80325794 */ void setEffectMtx(f32 (*)[4]);
};
struct J3DMaterial {};
struct J3DGXColor {};
struct J3DColorBlock {
/* 801A4C08 */ void setLight(u32, J3DLightObj*);
/* 801A4C0C */ void setAmbColor(u32, J3DGXColor const*);
};
//
// Forward References:
//
@@ -403,7 +390,6 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void memcmp();
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
src/d/particle/d_particle.cpp
-12
View File
@@ -50,8 +50,6 @@ struct dPa_wbPcallBack_c {
struct JPADrawInfo {};
struct ResTIMG {};
struct JPAResourceManager {
/* 80273E10 */ JPAResourceManager(void const*, JKRHeap*);
/* 80273EA8 */ void checkUserIndexDuplication(u16) const;
@@ -306,16 +304,6 @@ struct J3DUClipper {
/* 802738FC */ void clip(f32 const (*)[4], Vec, f32) const;
};
struct J3DTexture {
/* 8031204C */ void loadGX(u16, _GXTexMapID) const;
};
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
static u8 sOldVcdVatCmd[4];
};
//
// Forward References:
//