diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2026-02-13 15:06:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-13 15:06:14 -0800 |
| commit | 68f3531c2d3ee6cc90efe90a358cff1656ba275e (patch) | |
| tree | 40f85cff455bebdd3521813e206513df3aa7e5ff /include | |
| parent | 0e58f214e58a47e6012014109bcba19694666716 (diff) | |
d_bg_parts debug (#3097)
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 6 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h | 5 | ||||
| -rw-r--r-- | include/d/dolzel_base.pch | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 041ce31875..f38c79ef9a 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -1,11 +1,13 @@ #ifndef J3DANIMATION_H #define J3DANIMATION_H -#include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTNameTab.h" +#include <dolphin/mtx.h> #include "global.h" +class J3DTransformInfo; + struct JUTDataBlockHeader { /* 0x0 */ u32 mType; /* 0x4 */ u32 mSize; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index 2403c8384a..ff41bc4f01 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -93,7 +93,10 @@ public: J3D_ASSERT_NULLPTR(214, pAnmTexPattern != NULL); } - virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); } + virtual void calc(u16* param_0) const { + J3D_ASSERT_NULLPTR(532, param_0); + mAnmTexPattern->getTexNo(field_0x4, param_0); + } void operator=(J3DTexNoAnm const& other) { mAnmTexPattern = other.mAnmTexPattern; diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index d430859ca2..87dcd80f6b 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -18,15 +18,13 @@ #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export #include "JSystem/JGadget/linklist.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export -#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export -#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DSys.h" // IWYU pragma: export -#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export -#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/JHostIO/JHICommonMem.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export #include "SSystem/SComponent/c_m3d_g_sph.h" // IWYU pragma: export |