diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-08-16 18:05:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-16 18:05:17 -0400 |
| commit | e389a9b814baaabdbf497cd32edcdd2c30d3ff3f (patch) | |
| tree | 56ad6749c02048448a4f5ce90688efdc7dab1dbe /src/JSystem | |
| parent | 2d094c263e6145e69e254ec8ad4e71e3ea95a72b (diff) | |
demo work (#1172)
* Some d_message demo matches
* More demo matches
* fix jpn
Diffstat (limited to 'src/JSystem')
| -rw-r--r-- | src/JSystem/J3DGraphAnimator/J3DJoint.cpp | 2 | ||||
| -rw-r--r-- | src/JSystem/J3DGraphAnimator/J3DModel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp index 5ea7d2cc..28616176 100644 --- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -245,7 +245,7 @@ void J3DJoint::entryIn() { mesh->calc(anmMtx); } mesh->setCurrentMtx(); - matPacket->setMaterialAnmID(mesh->getMaterialAnm()); + matPacket->setMaterialAnmID((u32)mesh->getMaterialAnm()); matPacket->setShapePacket(shapePacket); J3DDrawBuffer* drawBuffer = j3dSys.getDrawBuffer(mesh->isDrawModeOpaTexEdge()); if ((u8)matPacket->entry(drawBuffer)) { diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp index 1bd00a12..bb6fb8ee 100644 --- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -256,7 +256,7 @@ s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 flag) { mpMatPacket[i].setInitShapePacket(shapePacket); mpMatPacket[i].addShapePacket(shapePacket); mpMatPacket[i].setTexture(pModelData->getTexture()); - mpMatPacket[i].mDiffFlag = pModelData->getMaterialNodePointer(i)->mDiffFlag; + mpMatPacket[i].setMaterialID(pModelData->getMaterialNodePointer(i)->mDiffFlag); if (pModelData->getModelDataType() == 1) mpMatPacket[i].mFlags |= 0x01; |