mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-09 13:36:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3DSys enum usage

Browse Source
This commit is contained in:
LagoLunatic
2026-09-24 15:58:39 -04:00
parent bb9271a9b8
commit 39f3cfdf14
17 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_ext.h
+2 -2
View File
@@ -557,7 +557,7 @@ public:
void draw();
void entryOpa() { j3dSys.getDrawBuffer(0)->entryImm(this, 0); }
void entryOpa() { j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); }
};
class mDoExt_onCupOffAupPacket : public J3DPacket {
@@ -566,7 +566,7 @@ public:
void draw();
void entryOpa() { j3dSys.getDrawBuffer(0)->entryImm(this, 0); }
void entryOpa() { j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0); }
};
class mDoExt_3Dline_c {
src/JSystem/J3DGraphAnimator/J3DJoint.cpp
+2 -2
View File
@@ -229,8 +229,8 @@ void J3DJoint::calcOut() {
/* 802F58D8-802F5A78 .text entryIn__8J3DJointFv */
void J3DJoint::entryIn() {
MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo);
j3dSys.getDrawBuffer(0)->setZMtx(anmMtx);
j3dSys.getDrawBuffer(1)->setZMtx(anmMtx);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->setZMtx(anmMtx);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->setZMtx(anmMtx);
for (J3DMaterial* mesh = mMesh; mesh != NULL; ) {
if (mesh->getShape()->checkFlag(J3DShpFlag_Hide)) {
mesh = mesh->getNext();
src/d/actor/d_a_bwdg.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ static BOOL daBwdg_Draw(bwdg_class* i_this) {
MtxTrans(0.0f, 10.0f + f1, 0.0f, 0);
cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, i_this->mBwdgPacket.getMtx());
i_this->mBwdgPacket.setTevStr(&i_this->tevStr);
j3dSys.getDrawBuffer(0)->entryImm(&i_this->mBwdgPacket, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mBwdgPacket, 0);
return TRUE;
}
src/d/actor/d_a_goal_flag.cpp
+1 -1
View File
@@ -934,7 +934,7 @@ bool daGoal_Flag_c::_draw() {
cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, mFlagPacket.getMtx());
mFlagPacket.setTevStr(&tevStr);
j3dSys.getDrawBuffer(0)->entryImm(&mFlagPacket, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&mFlagPacket, 0);
for (int i = 0; i < mNumRopes; i++) {
GXColor rope_color;
src/d/actor/d_a_majuu_flag.cpp
+1 -1
View File
@@ -493,7 +493,7 @@ static BOOL daMajuu_Flag_Draw(daMajuu_Flag_c* i_this) {
} else {
i_this->mPacket.setTevStr(&i_this->tevStr);
}
j3dSys.getDrawBuffer(0)->entryImm(&i_this->mPacket, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mPacket, 0);
return TRUE;
}
src/d/actor/d_a_pirate_flag.cpp
+1 -1
View File
@@ -277,7 +277,7 @@ static BOOL daPirate_Flag_Draw(pirate_flag_class* i_this) {
cMtx_concat(j3dSys.getViewMtx(), *calc_mtx, i_this->mPacket.getMtx());
i_this->mPacket.setTevStr(&i_this->tevStr);
j3dSys.getDrawBuffer(0)->entryImm(&i_this->mPacket, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mPacket, 0);
if (l_HIO.m05 != 0) {
s16 tmp_r29 = i_this->current.angle.y;
src/d/actor/d_a_sail.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ static BOOL daSail_Draw(sail_class* i_this) {
i_this->mSailPacket.setTevStr(&i_this->tevStr);
j3dSys.getDrawBuffer(0)->entryImm(&i_this->mSailPacket, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(&i_this->mSailPacket, 0);
return TRUE;
}
src/d/actor/d_a_sea.cpp
+1 -1
View File
@@ -1140,7 +1140,7 @@ void daSea_packet_c::draw() {
/* 8015D80C-8015D87C .text daSea_Draw__FP9sea_class */
static BOOL daSea_Draw(sea_class* i_this) {
dComIfGd_setListSky();
j3dSys.getDrawBuffer(1)->entryImm(&l_cloth, 31);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(&l_cloth, 31);
dComIfGd_setList();
return TRUE;
}
src/d/d_drawlist.cpp
+6 -6
View File
@@ -1356,17 +1356,17 @@ u32 dDlst_shadowReal_c::set(u32 key, s8 shouldFade, J3DModel* model, cXyz* pos,
mModelNum = 0;
}
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
j3dSys.setViewMtx(mViewMtx);
j3dSys.setDrawBuffer(mpDrawBuffer, 0);
j3dSys.setDrawBuffer(mpDrawBuffer, 1);
j3dSys.setDrawBuffer(mpDrawBuffer, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(mpDrawBuffer, J3DSysDrawBuf_Xlu);
model->entry();
model->lock();
model->viewCalc();
j3dSys.setViewMtx(dComIfGd_getView()->mViewMtx);
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
return mKey;
}
src/d/d_flower.cpp
+1 -1
View File
@@ -477,7 +477,7 @@ void dFlower_packet_c::update() {
}
}
j3dSys.getDrawBuffer(0)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0);
}
/* 800C0EF4-800C10D4 .text setData__16dFlower_packet_cFP14dFlower_data_ciScR4cXyziSc */
src/d/d_grass.cpp
+1 -1
View File
@@ -411,7 +411,7 @@ void dGrass_packet_c::update() {
data++;
}
mDoLib_clipper::resetFar();
j3dSys.getDrawBuffer(0)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0);
}
/* 800784E8-800785C0 .text setData__15dGrass_packet_cFP13dGrass_data_ciR4cXyziSc */
src/d/d_magma.cpp
+1 -1
View File
@@ -366,7 +366,7 @@ void dMagma_packet_c::update() {
if (floor->getBall() != NULL)
floor->update();
}
j3dSys.getDrawBuffer(0)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0);
}
/* 800767E4-80076924 .text checkYpos__15dMagma_packet_cFR4cXyz */
src/d/d_material.cpp
+16 -16
View File
@@ -53,8 +53,8 @@ void dMat_ice_c::copy(J3DModelData* modelData) {
/* 8006F83C-8006F90C .text updateDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */
void dMat_ice_c::updateDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
J3DModelData* modelData = model->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
@@ -69,14 +69,14 @@ void dMat_ice_c::updateDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* i
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
/* 8006F90C-8006F9E0 .text updateDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */
void dMat_ice_c::updateDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
J3DModelData* modelData = morf->getModel()->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
@@ -91,14 +91,14 @@ void dMat_ice_c::updateDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleMod
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
/* 8006F9E0-8006FAB0 .text entryDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */
void dMat_ice_c::entryDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
J3DModelData* modelData = model->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
@@ -113,14 +113,14 @@ void dMat_ice_c::entryDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* in
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
/* 8006FAB0-8006FB84 .text entryDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */
void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
J3DModelData* modelData = morf->getModel()->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
@@ -135,8 +135,8 @@ void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleMode
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
/* 8006FB84-8006FCF0 .text create__14dMat_control_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
src/d/d_snap.cpp
+1 -1
View File
@@ -2248,7 +2248,7 @@ void dSnap_RegistFig(u8 photoNo, fopAc_ac_c* actor, const Vec& pos, s16 angleY,
void dSnap_DebugDraw() {
if (l_snap.ChkReleaseShutter()) {
dComIfGd_setListMaskOff();
j3dSys.getDrawBuffer(1)->entryImm(&l_snap, 0xFF);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(&l_snap, 0xFF);
dComIfGd_setList();
}
}
src/d/d_tree.cpp
+1 -1
View File
@@ -599,7 +599,7 @@ void dTree_packet_c::update() {
mDoLib_clipper::resetFar();
dComIfGd_setXluListBG();
j3dSys.getDrawBuffer(1)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu)->entryImm(this, 0);
dComIfGd_setXluList();
}
src/d/d_wood.cpp
+1 -1
View File
@@ -853,7 +853,7 @@ void dWood::Packet_c::update() {
}
dComIfGd_setXluListBG();
j3dSys.getDrawBuffer(0)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0);
dComIfGd_setXluList();
}
src/m_Do/m_Do_ext.cpp
+9 -9
View File
@@ -824,24 +824,24 @@ void mDoExt_invisibleModel::entryMaskOff() {
/* 80011654-800116C4 .text updateDL__21mDoExt_invisibleModelFP8J3DModel */
void mDoExt_invisibleModel::updateDL(J3DModel* model) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
dComIfGd_setList();
mDoExt_modelUpdateDL(model);
entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
/* 800116C4-80011734 .text updateDL__21mDoExt_invisibleModelFP14mDoExt_McaMorf */
void mDoExt_invisibleModel::updateDL(mDoExt_McaMorf* param_0) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(J3DSysDrawBuf_Xlu);
dComIfGd_setList();
param_0->updateDL();
entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
j3dSys.setDrawBuffer(buffer0, J3DSysDrawBuf_Opa);
j3dSys.setDrawBuffer(buffer1, J3DSysDrawBuf_Xlu);
}
JKRExpHeap* gameHeap;
@@ -2521,7 +2521,7 @@ void mDoExt_3DlineMat1_c::update(u16 i_segs, GXColor& i_color, dKy_tevstr_c* i_t
/* 80016518-8001657C .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */
void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* i_3DlineMat) {
if (mp3DlineMat == NULL) {
j3dSys.getDrawBuffer(0)->entryImm(this, 0);
j3dSys.getDrawBuffer(J3DSysDrawBuf_Opa)->entryImm(this, 0);
}
i_3DlineMat->mpNextLineMat = mp3DlineMat;
mp3DlineMat = i_3DlineMat;