diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2023-09-04 16:17:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 17:17:51 -0600 |
| commit | 7f762353eaca2a6059d0d8512391936a210ebfb9 (patch) | |
| tree | 5992f0efc9748dee064bf4ba395a17fb6428ecaf /include/JSystem/J3DGraphAnimator | |
| parent | a8c261a943a946cfedef92af1d90631ad48a5836 (diff) | |
Fixes for other compilers (#1912)
* remove invalid virtual keywords
* remove duplicate inline
* remove leading 0 in character literals
* add missing public keywords
* fix some struct/class mismatches
Diffstat (limited to 'include/JSystem/J3DGraphAnimator')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 6 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DCluster.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DJointTree.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h | 12 |
4 files changed, 12 insertions, 10 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index dbfb745fae..00bd2b8655 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -338,6 +338,7 @@ private: }; // Size: 0x28 class J3DAnmTransformFull : public J3DAnmTransform { +public: /* 8032C2AC */ virtual ~J3DAnmTransformFull(); /* 8032C318 */ virtual s32 getKind() const; /* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const; @@ -347,14 +348,15 @@ private: }; // Size: 0x24 class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull { +public: /* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp(); /* 8032C2A4 */ virtual s32 getKind() const; /* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const; }; // Size: 0x24 struct J3DTextureSRTInfo; -struct J3DModelData; -struct J3DMaterialTable; +class J3DModelData; +class J3DMaterialTable; class J3DAnmTextureSRTKey : public J3DAnmBase { public: diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h index 3cf06bebd9..511c17eed2 100644 --- a/include/JSystem/J3DGraphAnimator/J3DCluster.h +++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h @@ -3,7 +3,7 @@ #include "dolphin/types.h" -struct J3DDeformer; +class J3DDeformer; struct J3DCluster { /* 0x00 */ f32 field_0x0; diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h index d792683606..2dd47be9f8 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h +++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h @@ -11,7 +11,7 @@ struct J3DModelHierarchy { /* 0x2 */ u16 mValue; }; -struct J3DMaterialTable; +class J3DMaterialTable; struct J3DDrawMtxData { /* 803115E0 */ J3DDrawMtxData(); diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 343006df80..1891eedb96 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -3,12 +3,12 @@ #include "dolphin/types.h" -struct J3DMaterial; -struct J3DTexture; -struct J3DAnmColor; -struct J3DAnmTexPattern; -struct J3DAnmTextureSRTKey; -struct J3DAnmTevRegKey; +class J3DMaterial; +class J3DTexture; +class J3DAnmColor; +class J3DAnmTexPattern; +class J3DAnmTextureSRTKey; +class J3DAnmTevRegKey; class JUTNameTab; class J3DMaterialTable { |
