work on J3DModelLoader (#1982)

This commit is contained in:
Caroline Madsen
2023-11-08 22:56:00 -05:00
committed by GitHub
parent 7d0a02de52
commit 014d13f4dc
35 changed files with 1092 additions and 1608 deletions
+10 -10
View File
@@ -28,16 +28,16 @@ extern "C" u16* func_8033677C(const void*, const void*); // JSUConvertOffsetToP
/* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
// mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, block.mShapeInitData);
mShapeInitData = func_80336764(&block, block.mShapeInitData);
// mIndexTable = JSUConvertOffsetToPtr<u16>(&block, block.mIndexTable);
mIndexTable = func_8033677C(&block, block.mIndexTable);
mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, block.mVtxDescList);
// mMtxTable = JSUConvertOffsetToPtr<u16>(&block, block.mMtxTable);
mMtxTable = func_8033677C(&block, block.mMtxTable);
mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, block.mDisplayListData);
mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, block.mMtxInitData);
mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, block.mDrawInitData);
// mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, block.mpShapeInitData);
mShapeInitData = func_80336764(&block, block.mpShapeInitData);
// mIndexTable = JSUConvertOffsetToPtr<u16>(&block, block.mpIndexTable);
mIndexTable = func_8033677C(&block, block.mpIndexTable);
mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, block.mpVtxDescList);
// mMtxTable = JSUConvertOffsetToPtr<u16>(&block, block.mpMtxTable);
mMtxTable = func_8033677C(&block, block.mpMtxTable);
mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, block.mpDisplayListData);
mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, block.mpMtxInitData);
mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, block.mpDrawInitData);
mVcdVatCmdBuffer = NULL;
}