mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-23 13:29:55 +00:00
Link J3DShapeMtx.cpp
This commit is contained in:
HeartPiece
parent
549ae0e04c
commit
0064dad58a
File diff suppressed because it is too large
Load Diff
@ -244,7 +244,7 @@ LIBS = [
|
||||
["JSystem/J3D/J3DModelData", True],
|
||||
["JSystem/J3D/J3DMaterialAttach", False],
|
||||
["JSystem/J3D/J3DMaterialFactory_v21", False],
|
||||
["JSystem/J3D/J3DShapeMtx", False],
|
||||
["JSystem/J3D/J3DShapeMtx", True],
|
||||
["JSystem/J3D/J3DModelLoaderCalcSize", False],
|
||||
["JSystem/J3D/J3DJointTree", False],
|
||||
["JSystem/J3D/J3DSkinDeform", True],
|
||||
|
||||
@ -32,35 +32,35 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAMath.cpp">JParticle/JPAMath.cpp</a> | 10306 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAEmitterManager.cpp">JParticle/JPAEmitterManager.cpp</a> | 10538 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIObject.cpp">JAudio//JAI/JAIObject.cpp</a> | 11254 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-light.cpp">JStudio_JStage/object-light.cpp</a> | 11420 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASDSPChannel.cpp">JAudio//JAS/JASDSPChannel.cpp</a> | 11462 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASWSParser.cpp">JAudio//JAS/JASWSParser.cpp</a> | 12435 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTaskThread.cpp">JAudio//JAS/JASTaskThread.cpp</a> | 12843 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAiCtrl.cpp">JAudio//JAS/JASAiCtrl.cpp</a> | 14267 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JGadget/std-vector.cpp">JGadget/std-vector.cpp</a> | 16058 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTransform.cpp">J3D/J3DTransform.cpp</a> | 16131 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JParticle/object-particle.cpp">JStudio_JParticle/object-particle.cpp</a> | 16743 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/stb.cpp">JStudio/stb.cpp</a> | 16978 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-camera.cpp">JStudio_JStage/object-camera.cpp</a> | 17767 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DCluster.cpp">J3D/J3DCluster.cpp</a> | 18124 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISystemInterface.cpp">JAudio//JAI/JAISystemInterface.cpp</a> | 19058 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JAudio/object-sound.cpp">JStudio_JAudio/object-sound.cpp</a> | 19344 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShape.cpp">J3D/J3DShape.cpp</a> | 19462 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 20100 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/resource.cpp">JMessage/resource.cpp</a> | 20331 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBNKParser.cpp">JAudio//JAS/JASBNKParser.cpp</a> | 20964 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoaderCalcSize.cpp">J3D/J3DModelLoaderCalcSize.cpp</a> | 21199 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterial.cpp">J3D/J3DMaterial.cpp</a> | 21468 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIAnimation.cpp">JAudio//JAI/JAIAnimation.cpp</a> | 21573 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindow.cpp">J2D/J2DWindow.cpp</a> | 22771 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DJoint.cpp">J3D/J3DJoint.cpp</a> | 23549 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 23607 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTaskThread.cpp">JAudio//JAS/JASTaskThread.cpp</a> | 12843 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DJoint.cpp">J3D/J3DJoint.cpp</a> | 13780 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAiCtrl.cpp">JAudio//JAS/JASAiCtrl.cpp</a> | 14267 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JGadget/std-vector.cpp">JGadget/std-vector.cpp</a> | 16058 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTransform.cpp">J3D/J3DTransform.cpp</a> | 16131 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JParticle/object-particle.cpp">JStudio_JParticle/object-particle.cpp</a> | 16743 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/stb.cpp">JStudio/stb.cpp</a> | 16978 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-camera.cpp">JStudio_JStage/object-camera.cpp</a> | 17767 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DCluster.cpp">J3D/J3DCluster.cpp</a> | 18124 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISystemInterface.cpp">JAudio//JAI/JAISystemInterface.cpp</a> | 19058 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JAudio/object-sound.cpp">JStudio_JAudio/object-sound.cpp</a> | 19344 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShape.cpp">J3D/J3DShape.cpp</a> | 19482 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 20100 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/resource.cpp">JMessage/resource.cpp</a> | 20331 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBNKParser.cpp">JAudio//JAS/JASBNKParser.cpp</a> | 20964 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoaderCalcSize.cpp">J3D/J3DModelLoaderCalcSize.cpp</a> | 21199 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterial.cpp">J3D/J3DMaterial.cpp</a> | 21468 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIAnimation.cpp">JAudio//JAI/JAIAnimation.cpp</a> | 21573 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindow.cpp">J2D/J2DWindow.cpp</a> | 22771 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 23607 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JKernel/JKRHeap.cpp">JKernel/JKRHeap.cpp</a> | 23801 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMtxBuffer.cpp">J3D/J3DMtxBuffer.cpp</a> | 23901 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPADynamicsBlock.cpp">JParticle/JPADynamicsBlock.cpp</a> | 24323 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTextBoxEx.cpp">J2D/J2DTextBoxEx.cpp</a> | 24399 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DGD.cpp">J3D/J3DGD.cpp</a> | 26174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModel.cpp">J3D/J3DModel.cpp</a> | 28914 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialAttach.cpp">J3D/J3DMaterialAttach.cpp</a> | 29963 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DScreen.cpp">J2D/J2DScreen.cpp</a> | 30643 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 30888 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 35158 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIBasic.cpp">JAudio//JAI/JAIBasic.cpp</a> | 30888 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 35148 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JStage/object-actor.cpp">JStudio_JStage/object-actor.cpp</a> | 35187 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASChannel.cpp">JAudio//JAS/JASChannel.cpp</a> | 35219 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAParticle.cpp">JParticle/JPAParticle.cpp</a> | 39432 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 39435 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40005 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeMtx.cpp">J3D/J3DShapeMtx.cpp</a> | 42377 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 44519 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 46687 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 47976 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 48203 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 49155 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 50053 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 55221 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 61174 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69401 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 76601 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 80652 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 83922 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85153 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105536 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 123297 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 165447 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASAramStream.cpp">JAudio//JAS/JASAramStream.cpp</a> | 40005 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 44519 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 46687 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 47976 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 48203 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 49155 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 50053 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 55221 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 61174 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69401 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 75520 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 80652 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 83922 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85153 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105536 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 123297 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 165716 | | |
|
||||
|
||||
### <section id="plugProjectEbisawaU">plugProjectEbisawaU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
|
||||
@ -81,7 +81,7 @@ static inline void __GDWriteF32(f32 data)
|
||||
}
|
||||
|
||||
// check if data we're about to add will take us outside data region
|
||||
inline void GDOverflowCheck(u32 len)
|
||||
static inline void GDOverflowCheck(u32 len)
|
||||
{
|
||||
if (__GDCurrentDL->data + len > __GDCurrentDL->end) {
|
||||
GDOverflowed();
|
||||
@ -89,16 +89,16 @@ inline void GDOverflowCheck(u32 len)
|
||||
}
|
||||
|
||||
// get current data pointer
|
||||
inline u8* GDGetCurrPointer() { return __GDCurrentDL->data; }
|
||||
static inline u8* GDGetCurrPointer() { return __GDCurrentDL->data; }
|
||||
|
||||
// how far from the start is the current data pointer?
|
||||
inline s32 GDGetCurrOffset() { return __GDCurrentDL->data - __GDCurrentDL->begin; }
|
||||
static inline s32 GDGetCurrOffset() { return __GDCurrentDL->data - __GDCurrentDL->begin; }
|
||||
|
||||
// track to set offset
|
||||
inline void GDSetCurrOffset(s32 offs) { __GDCurrentDL->data = __GDCurrentDL->begin + offs; }
|
||||
static inline void GDSetCurrOffset(s32 offs) { __GDCurrentDL->data = __GDCurrentDL->begin + offs; }
|
||||
|
||||
// forward a set distance
|
||||
inline void GDAdvCurrOffset(s32 distance) { __GDCurrentDL->data += distance; }
|
||||
static inline void GDAdvCurrOffset(s32 distance) { __GDCurrentDL->data += distance; }
|
||||
|
||||
////////////////////////////////////////////
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ struct J3DJointTree {
|
||||
u16 getJointNum() const { return mJointCnt; }
|
||||
u16 getDrawMtxNum() const { return mMtxData.mCount; }
|
||||
u8 getDrawMtxFlag(u16 idx) const { return mMtxData.mDrawMtxFlag[idx]; }
|
||||
u8 getDrawMtxIndex(u16 idx) const { return mMtxData.mDrawMtxIdx[idx]; }
|
||||
u16 getDrawMtxIndex(u16 idx) const { return mMtxData.mDrawMtxIdx[idx]; }
|
||||
JUTNameTab* getJointName() const { return mNametab; }
|
||||
J3DJoint* getRootNode() { return mRootNode; }
|
||||
J3DMtxCalc* getBasicMtxCalc() const { return mTransformCalc; }
|
||||
|
||||
@ -58,7 +58,7 @@ struct J3DCurrentMtx : public J3DCurrentMtxInfo {
|
||||
J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A
|
||||
J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B
|
||||
J3DFifoWriteXFCmd(0x1018, 2);
|
||||
GXWGFifo.u32 = getMtxIdxRegA();
|
||||
GXWGFifo.s32 = getMtxIdxRegA();
|
||||
GXWGFifo.u32 = getMtxIdxRegB();
|
||||
}
|
||||
|
||||
|
||||
@ -158,6 +158,10 @@ struct J3DModelData {
|
||||
u32 getVertexNum() const { return mVertexData.getVtxNum(); }
|
||||
u32 getVertexColorNum() const { return mVertexData.getColNum(); }
|
||||
|
||||
u8 getDrawMtxFlag(u16 idx) const { return mJointTree.getDrawMtxFlag(idx); }
|
||||
u16 getDrawMtxIndex(u16 idx) const { return mJointTree.getDrawMtxIndex(idx); }
|
||||
u16* getWEvlpImportantMtxIndex() const { return mJointTree.getWEvlpImportantMtxIndex(); }
|
||||
|
||||
bool checkFlag(u32 flag) const { return (mModelLoaderFlags & flag) ? true : false; }
|
||||
u32 getFlag() const { return mModelLoaderFlags; }
|
||||
u16 checkBumpFlag() const { return mBumpFlag; }
|
||||
@ -241,6 +245,7 @@ struct J3DModel {
|
||||
u32 getUserArea() const { return mUserArea; }
|
||||
void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); }
|
||||
MtxP getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }
|
||||
J3DMtxBuffer* getMtxBuffer() const { return mMtxBuffer; }
|
||||
|
||||
// void setBaseScale(const Vec& scale) { mModelScale = scale; }
|
||||
Vec* getBaseScale() { return &mModelScale; }
|
||||
|
||||
@ -26,7 +26,7 @@ struct J3DMtxBuffer {
|
||||
MtxP getAnmMtx(int idx) const { return mWorldMatrices[idx]; }
|
||||
void setAnmMtx(int i, Mtx m) { PSMTXCopy(m, (MtxP)mWorldMatrices[i]); }
|
||||
MtxP getWeightAnmMtx(int idx) const { return mWeightEnvelopeMatrices[idx]; }
|
||||
|
||||
MtxP getWorldMtx(int idx) { return mWorldMatrices[idx]; }
|
||||
inline Matrixf* getWorldMatrix(int i) { return (Matrixf*)mWorldMatrices[i]; }
|
||||
|
||||
void setScaleFlag(int idx, u8 flag) { mScaleFlags[idx] = flag; }
|
||||
|
||||
@ -46,14 +46,16 @@ struct J3DTexMtxObj {
|
||||
J3DTexMtxObj(u16 i)
|
||||
{
|
||||
mTexMtx = new Mtx[i];
|
||||
_04 = new Mtx44[i];
|
||||
mEffectMtx = new Mtx44[i];
|
||||
mTexGenNum = i;
|
||||
}
|
||||
Mtx& getMtx(u16 idx) { return mTexMtx[idx]; }
|
||||
Mtx44& getEffectMtx(u16 idx) { return mEffectMtx[idx]; }
|
||||
u16 getNumTexMtx() { return mTexGenNum; }
|
||||
|
||||
Mtx* mTexMtx; // _00, array of Mtxs
|
||||
Mtx44* _04; // _04
|
||||
u16 mTexGenNum; // _08
|
||||
Mtx* mTexMtx; // _00, array of Mtxs
|
||||
Mtx44* mEffectMtx; // _04
|
||||
u16 mTexGenNum; // _08
|
||||
};
|
||||
|
||||
// TODO: Could this use TLinkList?
|
||||
|
||||
@ -132,7 +132,7 @@ struct J3DShapeMtx {
|
||||
virtual int getUseMtxNum() const { return 1; } // _10 (weak)
|
||||
virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; } // _14 (weak)
|
||||
virtual void load() const; // _18
|
||||
virtual void calcNBTScale(const Vec&, Mtx33, Mtx33); // _1C
|
||||
virtual void calcNBTScale(const Vec&, Mtx33*, Mtx33*); // _1C
|
||||
|
||||
static void setLODFlag(u8 flag) { sLODFlag = flag; }
|
||||
static u8 getLODFlag() { return sLODFlag; }
|
||||
@ -205,7 +205,7 @@ struct J3DShapeMtxMulti : public J3DShapeMtx {
|
||||
virtual int getUseMtxNum() const { return mUseMtxNum; } // _10 (weak)
|
||||
virtual u16 getUseMtxIndex(u16 p1) const { return mUseMtxIndexTable[p1]; } // _14 (weak)
|
||||
virtual void load() const; // _18
|
||||
virtual void calcNBTScale(const Vec&, Mtx33, Mtx33); // _1C
|
||||
virtual void calcNBTScale(const Vec&, Mtx33*, Mtx33*); // _1C
|
||||
|
||||
u16 mUseMtxNum; // _08
|
||||
u16* mUseMtxIndexTable; // _0C
|
||||
@ -233,7 +233,7 @@ struct J3DShapeMtxConcatView : public J3DShapeMtx {
|
||||
|
||||
static LoadMtxConcatViewFunction sMtxLoadPipeline[4];
|
||||
static LoadMtxConcatViewFunction sMtxLoadLODPipeline[4];
|
||||
static Mtx* sMtxPtrTbl[2];
|
||||
static MtxP sMtxPtrTbl[2];
|
||||
};
|
||||
|
||||
struct J3DShapeMtxMultiConcatView : public J3DShapeMtxConcatView {
|
||||
|
||||
@ -61,6 +61,7 @@ struct J3DSys {
|
||||
J3DTexture* getTexture() { return mTexture; }
|
||||
|
||||
void setNBTScale(Vec* scale) { mNBTScale = scale; }
|
||||
Vec* getNBTScale() { return mNBTScale; }
|
||||
|
||||
void onFlag(u32 flag) { mFlags |= flag; }
|
||||
|
||||
|
||||
@ -89,6 +89,13 @@ namespace J3DDifferedTexMtx {
|
||||
void loadExecute(const Mtx);
|
||||
extern J3DTexGenBlock* sTexGenBlock;
|
||||
extern J3DTexMtxObj* sTexMtxObj;
|
||||
|
||||
inline void load(Mtx m)
|
||||
{
|
||||
if (sTexGenBlock != nullptr) {
|
||||
loadExecute(m);
|
||||
}
|
||||
}
|
||||
} // namespace J3DDifferedTexMtx
|
||||
|
||||
#endif
|
||||
|
||||
@ -42,4 +42,30 @@ inline void J3DPSMtx33Copy(const register Mtx33 src, register Mtx33 dst)
|
||||
#endif // clang-format on
|
||||
}
|
||||
|
||||
inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst)
|
||||
{
|
||||
register f32 x_y1;
|
||||
register f32 z1;
|
||||
register f32 x_y2;
|
||||
register f32 z2;
|
||||
register f32 x_y3;
|
||||
register f32 z3;
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
asm {
|
||||
psq_l x_y1, 0(src), 0, 0
|
||||
lfs z1, 8(src)
|
||||
psq_l x_y2, 16(src), 0, 0
|
||||
lfs z2, 0x18(src)
|
||||
psq_l x_y3, 32(src), 0, 0
|
||||
lfs z3, 0x28(src)
|
||||
psq_st x_y1, 0(dst), 0, 0
|
||||
stfs z1, 8(dst)
|
||||
psq_st x_y2, 12(dst), 0, 0
|
||||
stfs z2, 0x14(dst)
|
||||
psq_st x_y3, 24(dst), 0, 0
|
||||
stfs z3, 0x20(dst)
|
||||
}
|
||||
#endif // clang-format on
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -271,11 +271,7 @@ struct J3DColorChan {
|
||||
info.mAmbSrc == 0xFFFF ? 0 : info.mAmbSrc);
|
||||
}
|
||||
|
||||
GXAttnFn getAttnFn()
|
||||
{
|
||||
u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT };
|
||||
return GXAttnFn(attnFnTbl[mChanCtrl >> 9 & 0x03]);
|
||||
}
|
||||
GXAttnFn getAttnFn();
|
||||
GXDiffuseFn getDiffuseFn() { return GXDiffuseFn(mChanCtrl >> 7 & 3); }
|
||||
u8 getLightMask() { return ((mChanCtrl >> 2 & 0x0f) | (mChanCtrl >> 11 & 0x0f) << 4); }
|
||||
void setLightMask(u8 mask)
|
||||
|
||||
@ -1,128 +1,13 @@
|
||||
#include "JSystem/J3D/J3DJoint.h"
|
||||
#include "Dolphin/mtx.h"
|
||||
#include "JSystem/J3D/J3DAnmTransform.h"
|
||||
#include "JSystem/J3D/J3DMtxBuffer.h"
|
||||
#include "JSystem/J3D/J3DMtxCalc.h"
|
||||
#include "JSystem/J3D/J3DSys.h"
|
||||
#include "JSystem/J3D/J3DTransform.h"
|
||||
#include "JSystem/J3D/J3DModel.h"
|
||||
#include "JSystem/JGeometry.h"
|
||||
#include "JSystem/JMath.h"
|
||||
#include "types.h"
|
||||
|
||||
/*
|
||||
Generated from dpostproc
|
||||
|
||||
.section .rodata # 0x804732E0 - 0x8049E220
|
||||
.global lbl_804789B0
|
||||
lbl_804789B0:
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.global lbl_804789BC
|
||||
lbl_804789BC:
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.float 1.0
|
||||
.global lbl_804789C8
|
||||
lbl_804789C8:
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.global lbl_804789D4
|
||||
lbl_804789D4:
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
|
||||
.section .data, "wa" # 0x8049E220 - 0x804EFC20
|
||||
.global
|
||||
"__vt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>"
|
||||
"__vt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>":
|
||||
.4byte 0
|
||||
.4byte 0
|
||||
.4byte
|
||||
"__dt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>Fv"
|
||||
.4byte
|
||||
"setAnmTransform__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>FP15J3DAnmTransform"
|
||||
.4byte getAnmTransform__17J3DMtxCalcAnmBaseFv
|
||||
.4byte setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform
|
||||
.4byte getAnmTransform__10J3DMtxCalcFUc
|
||||
.4byte setWeight__10J3DMtxCalcFUcf
|
||||
.4byte getWeight__10J3DMtxCalcCFUc
|
||||
.4byte
|
||||
"init__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf"
|
||||
.4byte
|
||||
"calc__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>Fv"
|
||||
.global
|
||||
"__vt__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>"
|
||||
"__vt__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>":
|
||||
.4byte 0
|
||||
.4byte 0
|
||||
.4byte
|
||||
"__dt__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>Fv"
|
||||
.4byte
|
||||
"setAnmTransform__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>FP15J3DAnmTransform"
|
||||
.4byte getAnmTransform__17J3DMtxCalcAnmBaseFv
|
||||
.4byte setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform
|
||||
.4byte getAnmTransform__10J3DMtxCalcFUc
|
||||
.4byte setWeight__10J3DMtxCalcFUcf
|
||||
.4byte getWeight__10J3DMtxCalcCFUc
|
||||
.4byte
|
||||
"init__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf"
|
||||
.4byte
|
||||
"calc__124J3DMtxCalcAnimation<69J3DMtxCalcAnimationAdaptorDefault<32J3DMtxCalcCalcTransformSoftimage>,29J3DMtxCalcJ3DSysInitSoftimage>Fv"
|
||||
.global
|
||||
"__vt__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>"
|
||||
"__vt__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>":
|
||||
.4byte 0
|
||||
.4byte 0
|
||||
.4byte
|
||||
"__dt__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>Fv"
|
||||
.4byte
|
||||
"setAnmTransform__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>FP15J3DAnmTransform"
|
||||
.4byte getAnmTransform__17J3DMtxCalcAnmBaseFv
|
||||
.4byte setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform
|
||||
.4byte getAnmTransform__10J3DMtxCalcFUc
|
||||
.4byte setWeight__10J3DMtxCalcFUcf
|
||||
.4byte getWeight__10J3DMtxCalcCFUc
|
||||
.4byte
|
||||
"init__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf"
|
||||
.4byte
|
||||
"calc__116J3DMtxCalcAnimation<65J3DMtxCalcAnimationAdaptorDefault<28J3DMtxCalcCalcTransformBasic>,25J3DMtxCalcJ3DSysInitBasic>Fv"
|
||||
.global __vt__17J3DMtxCalcAnmBase
|
||||
__vt__17J3DMtxCalcAnmBase:
|
||||
.4byte 0
|
||||
.4byte 0
|
||||
.4byte __dt__17J3DMtxCalcAnmBaseFv
|
||||
.4byte setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform
|
||||
.4byte getAnmTransform__17J3DMtxCalcAnmBaseFv
|
||||
.4byte setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform
|
||||
.4byte getAnmTransform__10J3DMtxCalcFUc
|
||||
.4byte setWeight__10J3DMtxCalcFUcf
|
||||
.4byte getWeight__10J3DMtxCalcCFUc
|
||||
.4byte 0
|
||||
.4byte 0
|
||||
|
||||
.section .sbss # 0x80514D80 - 0x80516360
|
||||
.global mMtxBuffer__10J3DMtxCalc
|
||||
mMtxBuffer__10J3DMtxCalc:
|
||||
.skip 0x4
|
||||
.global mJoint__10J3DMtxCalc
|
||||
mJoint__10J3DMtxCalc:
|
||||
.skip 0x4
|
||||
.global mCurrentMtxCalc__8J3DJoint
|
||||
mCurrentMtxCalc__8J3DJoint:
|
||||
.skip 0x8
|
||||
|
||||
.section .sdata2, "a" # 0x80516360 - 0x80520E40
|
||||
.global lbl_80516A78
|
||||
lbl_80516A78:
|
||||
.float 1.0
|
||||
.global lbl_80516A7C
|
||||
lbl_80516A7C:
|
||||
.4byte 0x00000000
|
||||
*/
|
||||
J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
|
||||
J3DJoint* J3DMtxCalc::mJoint;
|
||||
J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
|
||||
|
||||
/**
|
||||
* @note Address: 0x8006B200
|
||||
@ -133,7 +18,7 @@ void J3DMtxCalcJ3DSysInitBasic::init(const Vec& scale, const Mtx& mtx)
|
||||
{
|
||||
J3DSys::mCurrentS = scale;
|
||||
J3DSys::mParentS = (Vec) { 1.0f, 1.0f, 1.0f };
|
||||
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, J3DSys::mCurrentS.x, J3DSys::mCurrentS.y, J3DSys::mCurrentS.z);
|
||||
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, scale.x, scale.y, scale.z);
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
@ -183,9 +68,9 @@ void J3DMtxCalcJ3DSysInitBasic::init(const Vec& scale, const Mtx& mtx)
|
||||
*/
|
||||
void J3DMtxCalcJ3DSysInitMaya::init(const Vec& scale, const Mtx& mtx)
|
||||
{
|
||||
J3DSys::mParentS = (Vec) { 1.0f, 1.0f, 1.0f };
|
||||
J3DSys::mCurrentS = scale;
|
||||
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, J3DSys::mCurrentS.x, J3DSys::mCurrentS.y, J3DSys::mCurrentS.z);
|
||||
J3DSys::mParentS = (Vec) { 1.0f, 1.0f, 1.0f };
|
||||
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, scale.x, scale.y, scale.z);
|
||||
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
@ -238,8 +123,6 @@ inline s32 checkScaleOne(const Vec& vec)
|
||||
}
|
||||
}
|
||||
|
||||
J3DJoint* J3DMtxCalc::mJoint;
|
||||
|
||||
/**
|
||||
* @note Address: 0x8006B330
|
||||
* @note Size: 0x118
|
||||
@ -266,86 +149,6 @@ void J3DMtxCalcCalcTransformBasic::calcTransform(const J3DTransformInfo& transIn
|
||||
|
||||
PSMTXConcat(J3DSys::mCurrentMtx, anmMtx, J3DSys::mCurrentMtx);
|
||||
PSMTXCopy(J3DSys::mCurrentMtx, anmMtx);
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
lis r4, mCurrentS__6J3DSys@ha
|
||||
lfs f0, 0(r3)
|
||||
stw r0, 0x24(r1)
|
||||
lfs f2, 4(r3)
|
||||
stmw r27, 0xc(r1)
|
||||
addi r31, r4, mCurrentS__6J3DSys@l
|
||||
mr r27, r3
|
||||
lwz r5, mJoint__10J3DMtxCalc@sda21(r13)
|
||||
lfs f1, 0(r31)
|
||||
lhz r28, 0x14(r5)
|
||||
fmuls f4, f1, f0
|
||||
lfs f3, 4(r31)
|
||||
lwz r29, mMtxBuffer__10J3DMtxCalc@sda21(r13)
|
||||
mulli r0, r28, 0x30
|
||||
lfs f1, 8(r31)
|
||||
fmuls f2, f3, f2
|
||||
lwz r4, 0xc(r29)
|
||||
lfs f0, 8(r3)
|
||||
add r30, r4, r0
|
||||
stfs f4, 0(r31)
|
||||
fmuls f0, f1, f0
|
||||
mr r4, r30
|
||||
stfs f2, 4(r31)
|
||||
stfs f0, 8(r31)
|
||||
bl J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f
|
||||
lis r3, mCurrentS__6J3DSys@ha
|
||||
lfs f1, lbl_80516A78@sda21(r2)
|
||||
lfs f0, mCurrentS__6J3DSys@l(r3)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B3D0
|
||||
lfs f0, 4(r31)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B3D0
|
||||
lfs f0, 8(r31)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B3D0
|
||||
li r0, 1
|
||||
b lbl_8006B3D4
|
||||
|
||||
lbl_8006B3D0:
|
||||
li r0, 0
|
||||
|
||||
lbl_8006B3D4:
|
||||
cmpwi r0, 0
|
||||
bne lbl_8006B404
|
||||
lwz r4, 4(r29)
|
||||
li r0, 0
|
||||
lfs f1, 0(r27)
|
||||
mr r3, r30
|
||||
stbx r0, r4, r28
|
||||
mr r4, r30
|
||||
lfs f2, 4(r27)
|
||||
lfs f3, 8(r27)
|
||||
bl JMAMTXApplyScale__FPA4_CfPA4_ffff
|
||||
b lbl_8006B410
|
||||
|
||||
lbl_8006B404:
|
||||
lwz r3, 4(r29)
|
||||
li r0, 1
|
||||
stbx r0, r3, r28
|
||||
|
||||
lbl_8006B410:
|
||||
lis r3, mCurrentMtx__6J3DSys@ha
|
||||
mr r4, r30
|
||||
addi r3, r3, mCurrentMtx__6J3DSys@l
|
||||
mr r5, r3
|
||||
bl PSMTXConcat
|
||||
lis r3, mCurrentMtx__6J3DSys@ha
|
||||
mr r4, r30
|
||||
addi r3, r3, mCurrentMtx__6J3DSys@l
|
||||
bl PSMTXCopy
|
||||
lmw r27, 0xc(r1)
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
@ -527,108 +330,6 @@ void J3DMtxCalcCalcTransformMaya::calcTransform(const J3DTransformInfo& transInf
|
||||
J3DSys::mParentS.x = transInfo.mScale.x;
|
||||
J3DSys::mParentS.y = transInfo.mScale.y;
|
||||
J3DSys::mParentS.z = transInfo.mScale.z;
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
stmw r27, 0xc(r1)
|
||||
mr r31, r3
|
||||
lwz r29, mJoint__10J3DMtxCalc@sda21(r13)
|
||||
lwz r28, mMtxBuffer__10J3DMtxCalc@sda21(r13)
|
||||
lhz r27, 0x14(r29)
|
||||
lwz r4, 0xc(r28)
|
||||
mulli r0, r27, 0x30
|
||||
add r30, r4, r0
|
||||
mr r4, r30
|
||||
bl J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f
|
||||
lfs f1, lbl_80516A78@sda21(r2)
|
||||
lfs f0, 0(r31)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B61C
|
||||
lfs f0, 4(r31)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B61C
|
||||
lfs f0, 8(r31)
|
||||
fcmpu cr0, f1, f0
|
||||
bne lbl_8006B61C
|
||||
lwz r3, 4(r28)
|
||||
li r0, 1
|
||||
stbx r0, r3, r27
|
||||
b lbl_8006B640
|
||||
|
||||
lbl_8006B61C:
|
||||
lwz r4, 4(r28)
|
||||
li r0, 0
|
||||
lfs f1, 0(r31)
|
||||
mr r3, r30
|
||||
stbx r0, r4, r27
|
||||
mr r4, r30
|
||||
lfs f2, 4(r31)
|
||||
lfs f3, 8(r31)
|
||||
bl JMAMTXApplyScale__FPA4_CfPA4_ffff
|
||||
|
||||
lbl_8006B640:
|
||||
lbz r0, 0x17(r29)
|
||||
cmplwi r0, 1
|
||||
bne lbl_8006B6D4
|
||||
lis r3, mParentS__6J3DSys@ha
|
||||
lfsu f1, mParentS__6J3DSys@l(r3)
|
||||
lfs f0, 0(r30)
|
||||
fres f3, f1
|
||||
lfs f2, 4(r3)
|
||||
lfs f1, 8(r3)
|
||||
fmuls f0, f0, f3
|
||||
fres f2, f2
|
||||
stfs f0, 0(r30)
|
||||
lfs f0, 4(r30)
|
||||
fmuls f0, f0, f3
|
||||
fres f1, f1
|
||||
stfs f0, 4(r30)
|
||||
lfs f0, 8(r30)
|
||||
fmuls f0, f0, f3
|
||||
stfs f0, 8(r30)
|
||||
lfs f0, 0x10(r30)
|
||||
fmuls f0, f0, f2
|
||||
stfs f0, 0x10(r30)
|
||||
lfs f0, 0x14(r30)
|
||||
fmuls f0, f0, f2
|
||||
stfs f0, 0x14(r30)
|
||||
lfs f0, 0x18(r30)
|
||||
fmuls f0, f0, f2
|
||||
stfs f0, 0x18(r30)
|
||||
lfs f0, 0x20(r30)
|
||||
fmuls f0, f0, f1
|
||||
stfs f0, 0x20(r30)
|
||||
lfs f0, 0x24(r30)
|
||||
fmuls f0, f0, f1
|
||||
stfs f0, 0x24(r30)
|
||||
lfs f0, 0x28(r30)
|
||||
fmuls f0, f0, f1
|
||||
stfs f0, 0x28(r30)
|
||||
|
||||
lbl_8006B6D4:
|
||||
lis r3, mCurrentMtx__6J3DSys@ha
|
||||
mr r4, r30
|
||||
addi r3, r3, mCurrentMtx__6J3DSys@l
|
||||
mr r5, r3
|
||||
bl PSMTXConcat
|
||||
lis r3, mCurrentMtx__6J3DSys@ha
|
||||
mr r4, r30
|
||||
addi r3, r3, mCurrentMtx__6J3DSys@l
|
||||
bl PSMTXCopy
|
||||
lfs f2, 0(r31)
|
||||
lis r3, mParentS__6J3DSys@ha
|
||||
lfs f1, 4(r31)
|
||||
stfsu f2, mParentS__6J3DSys@l(r3)
|
||||
lfs f0, 8(r31)
|
||||
stfs f1, 4(r3)
|
||||
stfs f0, 8(r3)
|
||||
lmw r27, 0xc(r1)
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
@ -744,8 +445,6 @@ void J3DJoint::entryIn()
|
||||
}
|
||||
}
|
||||
|
||||
J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
|
||||
|
||||
/**
|
||||
* @note Address: 0x8006BB54
|
||||
* @note Size: 0x1A8
|
||||
|
||||
@ -21,6 +21,12 @@ static size_t SizeOfLoadColorChans = 21;
|
||||
static size_t SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans;
|
||||
static size_t SizeOfJ3DColorBlockAmbientOnLoad = SizeOfLoadMatColors + SizeOfLoadAmbColors + SizeOfLoadColorChans;
|
||||
|
||||
// this has to get defined here to stop an sdata2 fragment going EVERYWHERE IN THE PROJECT smh
|
||||
inline GXAttnFn J3DColorChan::getAttnFn()
|
||||
{
|
||||
u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT };
|
||||
return GXAttnFn(attnFnTbl[mChanCtrl >> 9 & 0x03]);
|
||||
}
|
||||
/**
|
||||
* @note Address: 0x800771C0
|
||||
* @note Size: 0x48
|
||||
|
||||
@ -41,10 +41,10 @@ void J3DShape::initialize()
|
||||
* @note Address: 0x800608C0
|
||||
* @note Size: 0x78
|
||||
*/
|
||||
void J3DShape::calcNBTScale(const Vec& p1, Mtx33 p2[3], Mtx33 p3[3])
|
||||
void J3DShape::calcNBTScale(const Vec& scale, Mtx33* srcArray, Mtx33* dstArray)
|
||||
{
|
||||
for (u16 i = 0; i < getMtxGroupNum(); i++) {
|
||||
getShapeMtx(i)->calcNBTScale(p1, p2[0], p3[0]);
|
||||
getShapeMtx(i)->calcNBTScale(scale, srcArray, dstArray);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,7 @@ J3D_FILES:=\
|
||||
$(BUILD_DIR)/src/JSystem/J3D/J3DModelData.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J3D/J3DMaterialAttach.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J3D/J3DMaterialFactory_v21.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J3D/J3DShapeMtx.o\
|
||||
$(BUILD_DIR)/src/JSystem/J3D/J3DShapeMtx.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J3D/J3DModelLoaderCalcSize.o\
|
||||
$(BUILD_DIR)/asm/JSystem/J3D/J3DJointTree.o\
|
||||
$(BUILD_DIR)/src/JSystem/J3D/J3DSkinDeform.o\
|
||||
|
||||
@ -921,3 +921,5 @@ You have 4063 out of 10000 Pokos and 107 out of 201 treasures.",2024-01-26 03:32
|
||||
You have 4101 out of 10000 Pokos and 107 out of 201 treasures.",2024-03-27 18:47:46.415609
|
||||
4104,1909636,0.4104667918506596,107,381275,0.5348555669027125,"
|
||||
You have 4104 out of 10000 Pokos and 107 out of 201 treasures.",2024-03-28 17:38:46.263568
|
||||
4117,1915776,0.4117865544137675,107,382037,0.5359245064921948,"
|
||||
You have 4117 out of 10000 Pokos and 107 out of 201 treasures.",2024-04-03 21:52:26.765250
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user