summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/J3DGraphAnimator/J3DAnimation.h2
-rw-r--r--include/JSystem/J3DGraphBase/J3DMaterial.h2
-rw-r--r--include/JSystem/J3DGraphBase/J3DShape.h2
-rw-r--r--include/JSystem/J3DGraphBase/J3DTevs.h6
-rw-r--r--include/JSystem/J3DGraphBase/J3DTexture.h2
-rw-r--r--include/JSystem/J3DGraphLoader/J3DModelLoader.h3
-rw-r--r--include/JSystem/JKernel/JKRArchive.h4
-rw-r--r--include/JSystem/JKernel/JKRHeap.h4
-rw-r--r--include/d/d_com_inf_game.h3
-rw-r--r--include/d/d_particle.h1
-rw-r--r--include/d/d_resorce.h22
-rw-r--r--include/d/dolzel_base.pch2
12 files changed, 33 insertions, 20 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index f38c79ef9a..596e5a36e7 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -536,7 +536,7 @@ public:
virtual ~J3DAnmTransformKey() {}
virtual s32 getKind() const { return 8; }
virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
- calcTransform(mFrame, jointNo, pTransform);
+ calcTransform(getFrame(), jointNo, pTransform);
}
/* 0x20 */ int mDecShift;
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 92ca58ef6b..8103a83087 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -75,7 +75,7 @@ public:
J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
J3DZMode* getZMode() { return mPEBlock->getZMode(); }
J3DBlend* getBlend() { return mPEBlock->getBlend(); }
- J3DColorChan* getColorChan(u32 idx) { return getColorBlock()->getColorChan(idx); }
+ J3DColorChan* getColorChan(u32 idx) { return mColorBlock->getColorChan(idx); }
J3DGXColor* getMatColor(u32 i) { return mColorBlock->getMatColor(i); }
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 151f4235ab..ed26d73694 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -180,7 +180,7 @@ public:
void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
- void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
+ void setTexMtxLoadType(u32 type) { mFlags = type | (mFlags & ~0xF000); }
bool getNBTFlag() const { return mHasNBT; }
u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
void setBumpMtxOffset(u32 offset) { mBumpMtxOffset = offset; }
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index a13b54e4a4..3d70245220 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -201,10 +201,12 @@ struct J3DTevOrder : public J3DTevOrderInfo {
J3DTevOrder() {
J3DTevOrderInfo::operator=(j3dDefaultTevOrderInfoNull);
}
- J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
+ J3DTevOrder(const J3DTevOrderInfo& info) {
+ J3DTevOrderInfo::operator=(info);
+ }
J3DTevOrderInfo& getTevOrderInfo() { return *this; }
- u8 getTexMap() { return mTexMap; }
+ u8 getTexMap() const { return mTexMap; }
};
extern u8 j3dTevSwapTableTable[1024];
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 8c95729d66..da8276e767 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -90,7 +90,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
mTexMtxReg = mTexGenMtx;
}
void setTexCoordInfo(const J3DTexCoordInfo& info) {
- __memcpy(this, &info, sizeof(J3DTexCoordInfo));
+ J3DTexCoordInfo::operator=(info);
}
u8 getTexGenType() const { return mTexGenType; }
diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
index 5fff37ecad..a06260f3dc 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
@@ -26,7 +26,8 @@ struct J3DModelFileData {
/* 0x04 */ u32 mMagic2;
/* 0x08 */ u8 field_0x08[4];
/* 0x0C */ u32 mBlockNum;
- /* 0x10 */ u8 field_0x10[0x10];
+ /* 0x10 */ u8 field_0x10[0x1C - 0x10];
+ /* 0x1C */ int field_0x1c;
/* 0x20 */ J3DModelBlock mBlocks[1];
};
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index cf4b3ef045..7402f50b13 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -137,7 +137,7 @@ public:
u32 readIdxResource(void*, u32, u32);
u32 readResource(void*, u32, u16);
u32 countResource(void) const;
- u32 getFileAttribute(u32) const;
+ u8 getFileAttribute(u32) const;
SDIFileEntry* findNameResource(const char*) const;
bool isSameName(CArcName&, u32, u16) const;
@@ -171,7 +171,7 @@ public:
u32 countFile() const { return mArcInfoBlock->num_file_entries; }
s32 countDirectory() const { return mArcInfoBlock->num_nodes; }
u8 getMountMode() const { return mMountMode; }
- bool isFileEntry(u32 param_0) {
+ bool isFileEntry(u32 param_0) const {
return getFileAttribute(param_0) & 1;
}
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index c23b72180f..b6675f41b7 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -259,6 +259,10 @@ inline s32 JKRResizeMemBlock(JKRHeap* heap, void* ptr, u32 size) {
return JKRHeap::resize(ptr, size, heap);
}
+inline JKRHeap* JKRFindHeap(void* ptr) {
+ return JKRHeap::findFromRoot(ptr);
+}
+
inline JKRHeap* JKRGetRootHeap() {
return JKRHeap::getRootHeap();
}
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 91cd452131..25f48c5fd6 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -4285,7 +4285,8 @@ inline int dComIfG_setObjectRes(const char* i_arcName, u8 i_mountDirection, JKRH
return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_mountDirection, i_heap);
}
-inline int dComIfG_setObjectRes(const char* i_arcName, void* i_archiveRes, u32 i_bufferSize) {
+inline int dComIfG_setObjectRes(const char* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap) {
+ UNUSED(i_heap);
return g_dComIfG_gameInfo.mResControl.setObjectRes(i_arcName, i_archiveRes, i_bufferSize, NULL);
}
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index 893ac49ca0..fc52a637ea 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -425,6 +425,7 @@ public:
JKRSolidHeap* getHeap() { return mHeap; }
JKRExpHeap* getResHeap() { return m_resHeap; }
JKRSolidHeap* getSceneHeap() { return mSceneHeap; }
+ void* getSceneRes() { return m_sceneRes; }
void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }
diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h
index 8666f369cd..000146822b 100644
--- a/include/d/d_resorce.h
+++ b/include/d/d_resorce.h
@@ -25,6 +25,8 @@ public:
static J3DModelData* loaderBasicBmd(u32 i_tag, void* i_data);
static void dump_long(dRes_info_c* i_resInfo, int i_infoNum);
static void dump(dRes_info_c* i_resInfo, int i_infoNum);
+ static void dumpTag(dRes_info_c*, int, int, int);
+ static void dump(char*, dRes_info_c*, int);
void* getRes(s32 i_index) {
JUT_ASSERT(25, i_index >= 0 && i_index < getResNum());
@@ -37,10 +39,12 @@ public:
char* getArchiveName() { return mArchiveName; }
mDoDvdThd_mountArchive_c* getDMCommand() { return mDMCommand; }
JKRArchive* getArchive() { return mArchive; }
- void incCount() { mCount++; }
- u16 decCount() {
- return --mCount;
- }
+ u32 incCount() { return ++mCount; }
+ u32 decCount() { return --mCount; }
+
+#if DEBUG
+ int getSize() { return mSize; }
+#endif
#ifdef __MWERKS__
static const int NAME_MAX = 9;
@@ -55,7 +59,7 @@ private:
/* 0x1C */ JKRSolidHeap* mDataHeap;
/* 0x20 */ void** mRes;
#if DEBUG
- /* 0x24 */ void* unk_0x24;
+ /* 0x24 */ int mSize;
#endif
}; // Size: 0x24
@@ -66,9 +70,13 @@ public:
dRes_control_c() {}
~dRes_control_c();
+ int getSize(const char*, dRes_info_c*, int);
+ int getStageAllSize();
+ int getObjectAllSize();
int setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap);
int setStageRes(char const* i_arcName, JKRHeap* i_heap);
void dump();
+ void dumpTag();
void dump(char*);
int getObjectResName2Index(char const* i_arcName, char const* i_resName);
@@ -129,10 +137,6 @@ public:
dRes_info_c* getStageResInfo(const char* i_arcName) {
return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
-
- void dumpTag() {
- // TODO
- }
/* 0x0000 */ dRes_info_c mObjectInfo[128];
/* 0x1200 */ dRes_info_c mStageInfo[64];
diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch
index 87dcd80f6b..6da4ed7986 100644
--- a/include/d/dolzel_base.pch
+++ b/include/d/dolzel_base.pch
@@ -18,10 +18,10 @@
#include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export
#include "JSystem/JGadget/linklist.h" // IWYU pragma: export
#include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export
-#include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export
#include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export
#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export
+#include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export
#include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export
#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export
#include "JSystem/J3DGraphBase/J3DSys.h" // IWYU pragma: export
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 14:16:39 +0000