diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-10-03 15:26:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 18:26:26 -0400 |
| commit | 4913395dbd1a33d794028ceb82579b4baffe954d (patch) | |
| tree | fde72809184e4365eae205b26b14d5fee5698dcd /src/m_Do/m_Do_lib.cpp | |
| parent | 03094905214e54b97414be8e6049abe491f3ff16 (diff) | |
d_camera / m_Do_ext / d_particle + minor various wip (#210)
Diffstat (limited to 'src/m_Do/m_Do_lib.cpp')
| -rw-r--r-- | src/m_Do/m_Do_lib.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index dfb56d6ffe..6a313f6314 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -56,14 +56,14 @@ SECTION_SDATA2 static f64 lit_3638 = 4503601774854144.0 /* cast s32 to float */; #ifdef NONMATCHING bool mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 param_2, _GXTlutObj* o_tlutObj) { - if (res->palettesEnabled) { - GXInitTlutObj(o_tlutObj, (void*)(res + res->paletteOffset), (GXTlutFmt)res->paletteFormat, - res->paletteCount); - GXInitTexObjCI(o_texObj, (void*)(res + res->texDataOffset), res->width, res->height, + if (res->indexTexture) { + GXInitTlutObj(o_tlutObj, (void*)(res + res->paletteOffset), (GXTlutFmt)res->colorFormat, + res->numColors); + GXInitTexObjCI(o_texObj, (void*)(res + res->imageOffset), res->width, res->height, (GXCITexFmt)res->format, (GXTexWrapMode)res->wrapS, (GXTexWrapMode)res->wrapT, 1 - res->mipmapCount, param_2); } else { - GXInitTexObj(o_texObj, (void*)(res + res->texDataOffset), res->width, res->height, + GXInitTexObj(o_texObj, (void*)(res + res->imageOffset), res->width, res->height, (GXTexFmt)res->format, (GXTexWrapMode)res->wrapS, (GXTexWrapMode)res->wrapT, (s32)1 - res->mipmapCount); } @@ -71,7 +71,7 @@ bool mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 param_2, (f32)res->minLOD * 0.125f, (f32)res->maxLOD * 0.125f, (f32)res->LODBias * 0.01f, (s32)res->biasClamp, (s32)res->doEdgeLOD, (GXAnisotropy)res->maxAnisotropy); - return res->palettesEnabled; + return res->indexTexture; } #else #pragma push |