diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-04-28 13:58:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-28 16:58:43 -0400 |
| commit | d91b1294bbe8bbe802bb49e0db9019ca26bbefbd (patch) | |
| tree | afa001295c4a119e68225e9d6a26fe9584dbf504 /libs/JSystem/J3DGraphBase/J3DTexture.cpp | |
| parent | 07c5152e5acff18c08a92b3c773583ae0114c5f4 (diff) | |
d_name / d_s_name (#194)
* d_name
* scnname
Diffstat (limited to 'libs/JSystem/J3DGraphBase/J3DTexture.cpp')
| -rw-r--r-- | libs/JSystem/J3DGraphBase/J3DTexture.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp index c82c307b8a..634f17fc5d 100644 --- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp @@ -14,23 +14,25 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const { if (!timg->palettesEnabled) { GXInitTexObj(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height, - (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, - (GXBool)timg->mipmapEnabled); + (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, + (GXBool)timg->mipmapEnabled); } else { GXTlutObj tlutObj; GXInitTexObjCI(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height, - (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, - (GXBool)timg->mipmapEnabled, (u32)texMapID); - GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->paletteFormat, timg->paletteCount); + (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS, + (GXTexWrapMode)timg->wrapT, (GXBool)timg->mipmapEnabled, (u32)texMapID); + GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->paletteFormat, + timg->paletteCount); GXLoadTlut(&tlutObj, texMapID); } const f32 kLODClampScale = 1.0f / 8.0f; const f32 kLODBiasScale = 1.0f / 100.0f; - GXInitTexObjLOD(&texObj, (GXTexFilter) timg->minFilter, (GXTexFilter) timg->magFilter, - timg->minLOD * kLODClampScale, timg->maxLOD * kLODClampScale, timg->LODBias * kLODBiasScale, - (GXBool) timg->biasClamp, (GXBool) timg->doEdgeLOD, (GXAnisotropy) timg->maxAnisotropy); + GXInitTexObjLOD(&texObj, (GXTexFilter)timg->minFilter, (GXTexFilter)timg->magFilter, + timg->minLOD * kLODClampScale, timg->maxLOD * kLODClampScale, + timg->LODBias * kLODBiasScale, (GXBool)timg->biasClamp, (GXBool)timg->doEdgeLOD, + (GXAnisotropy)timg->maxAnisotropy); GXLoadTexObj(&texObj, texMapID); } |