From 851e4cf3dd38304e56ef41b6ee7ba47b03bae8fe Mon Sep 17 00:00:00 2001 From: Dylan Ascencio Date: Wed, 4 Oct 2023 00:46:20 -0400 Subject: [PATCH] Fixes from merge --- include/JSystem/J3DGraphAnimator/J3DModel.h | 4 ---- include/JSystem/J3DGraphBase/J3DMatBlock.h | 14 ++++++-------- include/JSystem/J3DGraphBase/J3DMaterial.h | 1 - include/JSystem/JParticle/JPAEmitter.h | 1 - include/d/d_drawlist.h | 4 ++-- include/d/d_particle.h | 2 -- src/d/actor/d_a_obj_mknjd.cpp | 2 +- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index 691bd4c87..dc2bf02ae 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -134,10 +134,6 @@ public: Vec* getBaseScale() { return &mBaseScale; } void setVisibilityManager(J3DVisibilityManager* manager) { mpVisibilityManager = manager; } - void setAnmMtx(int jntNo, Mtx mtx) { - MTXCopy(mtx, mpNodeMtx[jntNo]); - } - /* 0x004 */ J3DModelData* mModelData; /* 0x008 */ u32 mFlags; /* 0x00C */ u32 mDiffFlag; diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index d99cf2e52..64497f830 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -541,16 +541,14 @@ inline u16 calcZModeID(u8 param_0, u8 param_1, u8 param_2) { return (param_1 * 2) + (param_0 * 0x10) + param_2; } -extern u8 j3dZModeTable[96]; - extern J3DZModeInfo j3dZModeTable[2]; struct J3DZMode { J3DZMode() { mZModeID = j3dDefaultZModeID; } - u8 getCompareEnaable() const { return j3dZModeTable[mZModeID * 3]; } - u8 getFunc() const { return j3dZModeTable[mZModeID * 3 + 1]; } - u8 getUpdateEnable() const { return j3dZModeTable[mZModeID * 3 + 2]; } + u8 getCompareEnaable() const { return j3dZModeTable[mZModeID].mCompareEnable; } + u8 getFunc() const { return j3dZModeTable[mZModeID].mFunc; } + u8 getUpdateEnable() const { return j3dZModeTable[mZModeID].mUpdateEnable; } void setZModeInfo(const J3DZModeInfo& info) { mZModeID = calcZModeID(info.mCompareEnable, info.mFunc, info.mUpdateEnable); @@ -561,11 +559,11 @@ struct J3DZMode { } void setCompareEnable(u8 i_compare) { - mZModeID = calcZModeID(i_compare, j3dZModeTable[mZModeID].field_0x1, j3dZModeTable[mZModeID].field_0x2); + mZModeID = calcZModeID(i_compare, j3dZModeTable[mZModeID].mFunc, j3dZModeTable[mZModeID].mUpdateEnable); } void setUpdateEnable(u8 i_enable) { - mZModeID = calcZModeID(j3dZModeTable[mZModeID].field_0x0, j3dZModeTable[mZModeID].field_0x1, i_enable); + mZModeID = calcZModeID(j3dZModeTable[mZModeID].mCompareEnable, j3dZModeTable[mZModeID].mFunc, i_enable); } /* 0x0 */ u16 mZModeID; @@ -584,7 +582,7 @@ struct J3DBlend : public J3DBlendInfo { } void setType(u8 i_type) { - mType = i_type; + mBlendMode = i_type; } void setSrcFactor(u8 i_src) { diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 239936e89..7bc64fce2 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -76,7 +76,6 @@ public: void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); } void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; } void setCullMode(u8 i_mode) { mColorBlock->setCullMode(i_mode); } - void setMaterialMode(u32 i_mode) { mMaterialMode = i_mode; } public: /* 0x04 */ J3DMaterial* mNext; diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 6e94f97ba..e68b4e077 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -94,7 +94,6 @@ public: void setVolumeSweep(float i_volSweep) { mVolumeSweep = i_volSweep; } void setLifeTime(s16 i_lifeTime) { mLifeTime = i_lifeTime; } void setRate(float i_rate) { mRate = i_rate; } - void setMaxFrame(s32 i_maxFrame) { mMaxFrame = i_maxFrame; } void setGlobalDynamicsScale(JGeometry::TVec3& i_vec) { mGlobalScale.x = i_vec.x; diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 8fad0ccf0..c35468b62 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -214,8 +214,8 @@ public: void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); } void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); } - void setOpaList() { setOpaDrawList(mpBufInvisibleModelOpa); } - void setXluList() { setXluDrawList(mpBufInvisibleModelXlu); } + void setOpaList() { setOpaDrawList(mpBufWorldOpa); } + void setXluList() { setXluDrawList(mpBufWorldXlu); } void setOpaListInvisible() { setOpaDrawList(field_0x00030); } void setXluListInvisible() { setXluDrawList(field_0x00034); } void setOpaListMaskOff() { setOpaDrawList(mpBufInvisibleModelMaskOffOpa); } diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 143dc2991..49b76f16d 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -46,8 +46,6 @@ public: virtual void draw(JPABaseEmitter*); virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); virtual void end(); - - void setRateOff(u8 i_rate) { field_0x11 = i_rate; } JPABaseEmitter* getEmitter() { return mpEmitter; } void setRateOff(u8 param_0) { field_0x11 = param_0; } diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index aed616049..41c706929 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -1058,7 +1058,7 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) { i_mat->getPEBlock()->getBlend()->setDstFactor(5); } - i_mat->getTevKColor(3)->a = i_alpha; + i_mat->getTevKColor(3)->mColor.a = i_alpha; } } }