diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-01-22 07:23:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 17:23:54 +0200 |
| commit | 697cd08979c12f2a1ebd32f12a1a306b730f14ec (patch) | |
| tree | cf87190adf687a837db8424dc00ffa21da99e837 /src | |
| parent | 5a735a495680b6b410a242cbe570a72b789d7016 (diff) | |
some various J2D/J3D work (#2043)
* most of J2DPicture done
* fix GXSetTexCoordGen
* some j3d work
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/d_drawlist.cpp | 4 | ||||
| -rw-r--r-- | src/f_op/f_op_msg_mng.cpp | 2 | ||||
| -rw-r--r-- | src/m_Do/m_Do_graphic.cpp | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 0c7cbbda02..6efa2a5801 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -187,10 +187,6 @@ public: /* 0x3c */ dDlst_shadowPoly_c* mPoly; }; -static inline void GXSetTexCoordGen(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx) { - GXSetTexCoordGen2(dst, type, src, mtx, GX_FALSE, GX_PTIDENTITY); -} - // // Forward References: // diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 5c955e7a62..67f287dd59 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -406,7 +406,7 @@ void J2DPicture::setBlendRatio(f32 param_0, f32 param_1) { /* 80020338-80020368 01AC78 0030+00 0/0 1/0 0/0 .text append__10J2DPictureFPCcf */ bool J2DPicture::append(char const* param_0, f32 param_1) { - return insert(param_0, mTextureCount, param_1); + return insert(param_0, mTextureNum, param_1); } /* 80020368-8002039C 01ACA8 0034+00 0/0 1/0 0/0 .text insert__10J2DPictureFPCcUcf */ diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 645a1d674f..734761deac 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -929,10 +929,6 @@ SECTION_SDATA2 static f64 lit_4595 = 4503599627370496.0 /* cast u32 to float */; /* 80456B60-80456B68 000000 0004+04 1/1 0/0 0/0 .sbss2 @4530 */ SECTION_SBSS2 static GXColor lit_4530; -static inline void GXSetTexCoordGen(GXTexCoordID param_1, GXTexGenType param_2, GXTexGenSrc param_3, u32 param_4){ - GXSetTexCoordGen2(param_1, param_2, param_3, param_4, GX_FALSE, 0x7d); -} - /* 80009650-8000A160 003F90 0B10+00 1/1 0/0 0/0 .text draw__Q213mDoGph_gInf_c7bloom_cFv */ // Matches with literals |