summaryrefslogtreecommitdiff
path: root/src/JSystem/J3DGraphBase
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-04-10 19:30:51 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2025-04-10 19:30:51 -0400
commit309158e274a0613594ffabddec48765cbd4f9c83 (patch)
treefb0842e690420611ee8079f09d4eaeb75a9fb57d /src/JSystem/J3DGraphBase
parent0bb7ff4051ee84083f16d534b0670bcc0e507551 (diff)
J3DModel inlines cleanup, procBottleSwing_init match, etc
Diffstat (limited to 'src/JSystem/J3DGraphBase')
-rw-r--r--src/JSystem/J3DGraphBase/J3DPacket.cpp4
-rw-r--r--src/JSystem/J3DGraphBase/J3DShapeMtx.cpp8
2 files changed, 4 insertions, 8 deletions
diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp
index 9db6d317..2a12432d 100644
--- a/src/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -375,7 +375,3 @@ bool J3DMatPacket::isSame(J3DMatPacket* pOther) const {
}
return isSame;
}
-
-/* 802DB978-802DB97C .text draw__9J3DPacketFv */
-void J3DPacket::draw() {
-}
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index a15c01be..2cc29a0f 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -141,8 +141,8 @@ Mtx * J3DShapeMtxConcatView::sMtxPtrTbl[2];
/* 802DBFBC-802DC08C .text load__21J3DShapeMtxConcatViewCFv */
void J3DShapeMtxConcatView::load() const {
- sMtxPtrTbl[0] = j3dSys.getModel()->mpNodeMtx;
- sMtxPtrTbl[1] = j3dSys.getModel()->mpWeightEnvMtx;
+ sMtxPtrTbl[0] = (Mtx*)j3dSys.getModel()->getAnmMtx(0);
+ sMtxPtrTbl[1] = (Mtx*)j3dSys.getModel()->getWeightAnmMtx(0);
MtxLoadConcatView f = sMtxLoadPipeline[sCurrentPipeline];
j3dSys.setModelDrawMtx(sMtxPtrTbl[j3dSys.getModel()->getModelData()->getDrawMtxFlag(mUseMtxIndex)]);
@@ -234,8 +234,8 @@ void J3DShapeMtxMultiImm::load() const {
/* 802DC428-802DC524 .text load__26J3DShapeMtxMultiConcatViewCFv */
void J3DShapeMtxMultiConcatView::load() const {
- sMtxPtrTbl[0] = j3dSys.getModel()->mpNodeMtx;
- sMtxPtrTbl[1] = j3dSys.getModel()->mpWeightEnvMtx;
+ sMtxPtrTbl[0] = (Mtx*)j3dSys.getModel()->getAnmMtx(0);
+ sMtxPtrTbl[1] = (Mtx*)j3dSys.getModel()->getWeightAnmMtx(0);
MtxLoadConcatView f = sMtxLoadPipeline[sCurrentPipeline];