diff options
| author | Pheenoh <pheenoh@gmail.com> | 2023-03-17 21:05:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 21:05:06 -0600 |
| commit | 3cdef97cb8648cf5a5f2151938c5fa8d66056751 (patch) | |
| tree | e96e03eb21c61f9aa4cd2868724b55b4872a190b /include/JSystem/J2DGraph | |
| parent | a01d65b0b99400f62d93eee28475872b641cfd50 (diff) | |
d_file_select, JASResArcLoader, d_a_obj_stone, d_a_obj_stone_mark (#309)
* setup TU
* JASResArcLoader OK
* d_a_obj_stoneMark work
* some funcs in d_a_obj_stoneMark
* many changes
* quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile
* d_file_select functions + pr cleanup
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DAnimation.h | 4 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPane.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 5974961dac..1cb44c0f04 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -124,7 +124,11 @@ public: mTranslateValues = pTranslateValues; mKind = KIND_TRANSFORM; } + #ifdef __dt__15J2DAnmTransformFv_DEFINED + /* 80184370 */ virtual ~J2DAnmTransform(); + #else /* 80184370 */ virtual ~J2DAnmTransform() {} + #endif /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; /* 0x10 */ f32* mScaleValues; diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index fe6649981b..7d4832d8eb 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -94,8 +94,7 @@ public: /* vt 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {} /* vt 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {} /* vt 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {} - /* vt 0x7C */ virtual const J2DAnmTransform* - animationTransform(const J2DAnmTransform* transform); + /* vt 0x7C */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform); /* vt 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility); /* vt 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility); /* vt 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color); |