mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-04 02:16:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc. J3D improvements (#2570)

Browse Source
This commit is contained in:
Max Roncace
2025-08-08 05:56:18 -04:00
committed by GitHub
parent b150337f7c
commit dc8cd6d42a
10 changed files with 1742 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphBase/J3DTexture.cpp
+12 -7
View File
@@ -4,10 +4,14 @@
//
#include "JSystem/J3DGraphBase/J3DTexture.h"
#include "dolphin/gx.h"
#include "global.h"
/* 8031204C-803121A4 30C98C 0158+00 0/0 1/1 0/0 .text loadGX__10J3DTextureCFUs11_GXTexMapID */
void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
J3D_ASSERT(0, idx < mNum, "Error : range over.");
ResTIMG* timg = getResTIMG(idx);
GXTexObj texObj;
@@ -37,8 +41,11 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
/* 803121A4-8031221C 30CAE4 0078+00 1/1 0/0 0/0 .text entryNum__10J3DTextureFUs */
void J3DTexture::entryNum(u16 num) {
J3D_ASSERT(79, num != 0, "Error : non-zero argument is specified 0.");
mNum = num;
mpRes = new ResTIMG[num]();
J3D_ASSERT(83, mpRes != 0, "Error : allocate memory.");
for (s32 i = 0; i < mNum; i++) {
mpRes[i].paletteOffset = 0;
@@ -51,20 +58,18 @@ void J3DTexture::addResTIMG(u16 newNum, ResTIMG const* newRes) {
if (newNum == 0)
return;
J3D_ASSERT(105, newRes != 0, "Error : null pointer.");
u16 oldNum = mNum;
ResTIMG* oldRes = mpRes;
entryNum(mNum + newNum);
for (u16 i = 0; i < oldNum; i++) {
mpRes[i] = oldRes[i];
mpRes[i].imageOffset = (u32)(&oldRes[i]) + mpRes[i].imageOffset - (u32)(&mpRes[i]);
mpRes[i].paletteOffset = (u32)(&oldRes[i]) + mpRes[i].paletteOffset - (u32)(&mpRes[i]);
setResTIMG(i, oldRes[i]);
}
for (u16 i = oldNum; i < mNum; i++) {
mpRes[i] = newRes[i];
mpRes[i].imageOffset = (u32)(&newRes[i]) + mpRes[i].imageOffset - (u32)(&mpRes[i]);
mpRes[i].paletteOffset = (u32)(&newRes[i]) + mpRes[i].paletteOffset - (u32)(&mpRes[i]);
setResTIMG(i, newRes[i]);
}
}
}