mirror of
https://github.com/zeldaret/tp
synced 2026-07-07 22:22:05 -04:00
d_file_select, JASResArcLoader, d_a_obj_stone, d_a_obj_stone_mark (#309)
* setup TU * JASResArcLoader OK * d_a_obj_stoneMark work * some funcs in d_a_obj_stoneMark * many changes * quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile * d_file_select functions + pr cleanup
This commit is contained in:
@@ -124,7 +124,11 @@ public:
|
||||
mTranslateValues = pTranslateValues;
|
||||
mKind = KIND_TRANSFORM;
|
||||
}
|
||||
#ifdef __dt__15J2DAnmTransformFv_DEFINED
|
||||
/* 80184370 */ virtual ~J2DAnmTransform();
|
||||
#else
|
||||
/* 80184370 */ virtual ~J2DAnmTransform() {}
|
||||
#endif
|
||||
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
|
||||
|
||||
/* 0x10 */ f32* mScaleValues;
|
||||
|
||||
@@ -94,8 +94,7 @@ public:
|
||||
/* vt 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {}
|
||||
/* vt 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {}
|
||||
/* vt 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {}
|
||||
/* vt 0x7C */ virtual const J2DAnmTransform*
|
||||
animationTransform(const J2DAnmTransform* transform);
|
||||
/* vt 0x7C */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform);
|
||||
/* vt 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility);
|
||||
/* vt 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility);
|
||||
/* vt 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color);
|
||||
|
||||
@@ -11,8 +11,14 @@
|
||||
#include "dolphin/types.h"
|
||||
|
||||
enum J3DMdlFlag {
|
||||
/* 0x4 */ J3DMdlFlag_SkinPosCpu = 0x4,
|
||||
/* 0x8 */ J3DMdlFlag_SkinNrmCpu = 0x8,
|
||||
/* 0x00001 */ J3DMdlFlag_Unk00001 = 0x1,
|
||||
/* 0x00002 */ J3DMdlFlag_Unk00002 = 0x2,
|
||||
/* 0x00004 */ J3DMdlFlag_SkinPosCpu = 0x4,
|
||||
/* 0x00008 */ J3DMdlFlag_SkinNrmCpu = 0x8,
|
||||
/* 0x00010 */ J3DMdlFlag_Unk00010 = 0x10,
|
||||
/* 0x20000 */ J3DMdlFlag_Unk20000 = 0x20000,
|
||||
/* 0x40000 */ J3DMdlFlag_Unk40000 = 0x40000,
|
||||
/* 0x80000 */ J3DMdlFlag_Unk80000 = 0x80000,
|
||||
};
|
||||
|
||||
struct J3DUnkCalc1 {
|
||||
|
||||
@@ -1,6 +1,44 @@
|
||||
#ifndef JASRESARCLOADER_H
|
||||
#define JASRESARCLOADER_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "JSystem/JKernel/JKRArchive.h"
|
||||
|
||||
namespace JASResArcLoader {
|
||||
/* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
|
||||
/* 80290C04 */ size_t getResMaxSize(JKRArchive const*);
|
||||
/* 80290C7C */ static void loadResourceCallback(void*);
|
||||
/* 80290D18 */ int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
|
||||
};
|
||||
|
||||
|
||||
|
||||
// from pikmin2
|
||||
typedef void (*LoadCallback)(u32, u32);
|
||||
|
||||
enum ResArcMessage {
|
||||
RESARCMSG_Error = -1,
|
||||
RESARCMSG_Success = 0,
|
||||
};
|
||||
|
||||
struct CallbackArgs {
|
||||
inline CallbackArgs(u16 id, u8* buf, u32 size, JKRArchive* archive)
|
||||
: mArchive(archive)
|
||||
, mID(id)
|
||||
, mBuffer(buf)
|
||||
, mBufferSize(size)
|
||||
, mCallback(0)
|
||||
, mCallbackArg(0)
|
||||
, mQueue(0)
|
||||
{
|
||||
}
|
||||
|
||||
JKRArchive* mArchive; // _00
|
||||
u16 mID; // _04
|
||||
u8* mBuffer; // _08
|
||||
u32 mBufferSize; // _0C
|
||||
LoadCallback mCallback; // _10
|
||||
u32 mCallbackArg; // _14, arg to pass to mCallback along with readResource result
|
||||
OSMessageQueue* mQueue; // _18
|
||||
};
|
||||
|
||||
#endif /* JASRESARCLOADER_H */
|
||||
|
||||
@@ -84,6 +84,7 @@ public:
|
||||
// was needed for open__14JKRAramArchiveFl
|
||||
u8 getCompressFlag() const { return (getFlags() & 0x04); }
|
||||
bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; }
|
||||
u32 getSize() const { return data_size; }
|
||||
};
|
||||
|
||||
enum EMountMode {
|
||||
|
||||
@@ -236,4 +236,8 @@ inline s32 JKRResizeMemBlock(JKRHeap* heap, void* ptr, u32 size) {
|
||||
return JKRHeap::resize(ptr, size, heap);
|
||||
}
|
||||
|
||||
inline JKRHeap* JKRGetRootHeap() {
|
||||
return JKRHeap::getRootHeap();
|
||||
}
|
||||
|
||||
#endif /* JKRHEAP_H */
|
||||
|
||||
@@ -98,6 +98,10 @@ public:
|
||||
mGamePadPort = JUTGamePad::Port_Unknown;
|
||||
}
|
||||
|
||||
static void setMapFile(const char* map) {
|
||||
appendMapFile(map);
|
||||
}
|
||||
|
||||
private:
|
||||
static OSMessageQueue sMessageQueue;
|
||||
static const char* sCpuExpName[17];
|
||||
|
||||
@@ -20,7 +20,7 @@ class JUTNameTab {
|
||||
public:
|
||||
JUTNameTab();
|
||||
JUTNameTab(const ResNTAB* pNameTable);
|
||||
virtual ~JUTNameTab() {}
|
||||
virtual ~JUTNameTab() {};
|
||||
|
||||
void setResource(const ResNTAB* pNameTable);
|
||||
s32 getIndex(char const*) const;
|
||||
|
||||
Reference in New Issue
Block a user