diff options
Diffstat (limited to 'libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp')
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 1a8c67ab36..60edda683f 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -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.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); + //mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (u32)block.mpShapeInitData); + mShapeInitData = func_80336764(&block, block.mpShapeInitData), + //mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpIndexTable); + mIndexTable = func_8033677C(&block, block.mpIndexTable), + mVtxDescList = JSUConvertOffsetToPtr<GXVtxDescList>(&block, (u32)block.mpVtxDescList), + //mMtxTable = JSUConvertOffsetToPtr<u16>(&block, (u32)block.mpMtxTable); + mMtxTable = func_8033677C(&block, block.mpMtxTable), + mDisplayListData = JSUConvertOffsetToPtr<u8>(&block, (u32)block.mpDisplayListData), + mMtxInitData = JSUConvertOffsetToPtr<J3DShapeMtxInitData>(&block, (u32)block.mpMtxInitData), + mDrawInitData = JSUConvertOffsetToPtr<J3DShapeDrawInitData>(&block, (u32)block.mpDrawInitData), mVcdVatCmdBuffer = NULL; } |