diff options
| author | robojumper <robojumper@gmail.com> | 2025-04-27 07:59:03 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-04-27 07:59:03 +0200 |
| commit | 73ebfb9faec8572df4ab9bdd2d7053211c367d24 (patch) | |
| tree | 88b5bf1cd3bdcff039de2ba4b2111f26d30e8d83 /include/JSystem/JParticle | |
| parent | 6468fc663c304663afa949fd73f4f627bad0e6b3 (diff) | |
JPAResourceManager OK
Diffstat (limited to 'include/JSystem/JParticle')
| -rw-r--r-- | include/JSystem/JParticle/JPAResourceManager.h | 3 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPATexture.h | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/include/JSystem/JParticle/JPAResourceManager.h index 51eae363..16ea8ef9 100644 --- a/include/JSystem/JParticle/JPAResourceManager.h +++ b/include/JSystem/JParticle/JPAResourceManager.h @@ -7,7 +7,6 @@ #include "JSystem/JParticle/JPATexture.h" class JPAResource; -struct ResTIMG; /** * @ingroup jsystem-jparticle @@ -18,7 +17,7 @@ public: /* 80273E10 */ JPAResourceManager(void const*, EGG::Heap*); /* 80273E68 */ JPAResource* getResource(u16) const; /* 80273EA8 */ bool checkUserIndexDuplication(u16) const; - /* 80273EEC */ const ResTIMG* swapTexture(ResTIMG const*, char const*); + /* 80273EEC */ const EGG::ResTIMG* swapTexture(EGG::ResTIMG const*, char const*); /* 80273F8C */ void registRes(JPAResource*); /* 80273FAC */ void registTex(JPATexture*); /* 80273FCC */ u32 getResUserWork(u16) const; diff --git a/include/JSystem/JParticle/JPATexture.h b/include/JSystem/JParticle/JPATexture.h index 193bd5b6..0088eb5c 100644 --- a/include/JSystem/JParticle/JPATexture.h +++ b/include/JSystem/JParticle/JPATexture.h @@ -3,7 +3,7 @@ #include "common.h" #include "rvl/GX.h" -#include "JSystem/JUtility/JUTTexture.h" +#include "egg/gfx/eggTexture.h" /** * @ingroup jsystem-jparticle @@ -13,7 +13,7 @@ struct JPATextureData { // Probably magic / size / flags up top here, but they're unused. /* 0x00 */ char field_0x00[0x0C]; /* 0x0C */ char mName[0x14]; - /* 0x20 */ ResTIMG mResTIMG; + /* 0x20 */ EGG::ResTIMG mResTIMG; }; /** @@ -27,11 +27,11 @@ public: void load(GXTexMapID texMapID) { mTexture.load(texMapID); } - JUTTexture* getJUTTexture() { return &mTexture; } + EGG::Texture* getJUTTexture() { return &mTexture; } const char* getName() const { return mpData->mName; } public: - JUTTexture mTexture; + EGG::Texture mTexture; const JPATextureData* mpData; }; |