diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-31 09:45:22 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-31 09:45:40 -0800 |
| commit | d7480d5d8bf998c2ece5cbd76374deb8e279e77c (patch) | |
| tree | 03519576acc56f7fa3c065a60a85f9a2cea06f59 /libs/JSystem/J3DGraphBase | |
| parent | 2e2e08e78341a6a7f7a2847dd89235db07d72530 (diff) | |
Couple more J3DModel matches, d_kyeff/d_kyeff2 cleanups
Diffstat (limited to 'libs/JSystem/J3DGraphBase')
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DPacket.cpp | 8 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index bf734f1710..adbaad7917 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -348,7 +348,7 @@ J3DError J3DShapePacket::newDifferedDisplayList(u32 flag) { } /* 80312E08-80312F24 30D748 011C+00 2/2 0/0 0/0 .text prepareDraw__14J3DShapePacketCFv */ -#ifdef NONMATCHING +#if defined NONMATCHING void J3DShapePacket::prepareDraw() const { mpModel->getVertexBuffer()->setArray(); j3dSys.setModel(mpModel); @@ -376,7 +376,7 @@ void J3DShapePacket::prepareDraw() const { if (!mpShape->getNBTFlag()) { mpShape->setNrmMtx(mpMtxBuffer->getNrmMtxPtrPtr()); } else { - mpShape->setNrmMtx(mpMtxBuffer->getBumpMtxPtrPtr() + mpShape->getBumpMtxOffset()); + mpShape->setNrmMtx(mpMtxBuffer->getBumpMtxPtrPtr()[mpShape->getBumpMtxOffset()]); } mpModel->getModelData()->syncJ3DSysFlags(); @@ -397,7 +397,7 @@ void J3DShapePacket::draw() { if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) { prepareDraw(); - if (mpTexMtx != NULL) { + if (mpTexMtxObj != NULL) { J3DMaterial* material = mpShape->getMaterial(); J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock(); J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj(); @@ -418,7 +418,7 @@ void J3DShapePacket::drawFast() { if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) { prepareDraw(); - if (mpTexMtx != NULL) { + if (mpTexMtxObj != NULL) { J3DMaterial* material = mpShape->getMaterial(); J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock(); J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj(); diff --git a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 86d52ff500..dd9d77b10c 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -370,7 +370,7 @@ u8 J3DShapeMtxConcatView::sMtxPtrTbl[8]; J3DTexGenBlock* J3DDifferedTexMtx::sTexGenBlock; /* 804515C4-804515C8 000AC4 0004+00 1/1 2/2 0/0 .sbss sTexMtxObj__17J3DDifferedTexMtx */ -J3DTexMtx* J3DDifferedTexMtx::sTexMtxObj; +J3DTexMtxObj* J3DDifferedTexMtx::sTexMtxObj; /* 80456398-8045639C 004998 0004+00 2/2 0/0 0/0 .sdata2 @1032 */ SECTION_SDATA2 static u8 lit_1032[4] = { |