mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-07 10:16:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_kytag06 fully done / d_msg_class/object work (#300)

Browse Source 
* d_a_kytag06 OK and d_msg_class/object wip

* add some GXDraw functions

* cleanup kytag6

* remove asm
This commit is contained in:
TakaRikka
2023-02-25 18:23:13 -08:00
committed by GitHub
parent 4df6e8edea
commit bf663a0e3d
112 changed files with 5132 additions and 7404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_ext.h
+39
View File
@@ -8,6 +8,7 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "global.h"
#include "m_Do/m_Do_audio.h"
#include "m_Do/m_Do_mtx.h"
class mDoExt_baseAnm {
public:
@@ -481,6 +482,44 @@ private:
/* 0x18 */ mDoExt_3Dline_c* field_0x18;
};
class mDoExt_cubePacket : public J3DPacket {
public:
mDoExt_cubePacket(cXyz& i_position, cXyz& i_size, csXyz& i_angle, const GXColor& i_color) {
mPosition = i_position;
mSize = i_size;
mAngle = i_angle;
mColor = i_color;
}
virtual void draw();
virtual ~mDoExt_cubePacket() {}
/* 0x10 */ cXyz mPosition;
/* 0x1C */ cXyz mSize;
/* 0x28 */ csXyz mAngle;
/* 0x2E */ GXColor mColor;
};
class mDoExt_cylinderPacket : public J3DPacket {
public:
mDoExt_cylinderPacket(cXyz& i_position, f32 i_radius, f32 i_height, const GXColor& i_color, u8 param_4) {
mPosition = i_position;
mRadius = i_radius;
mHeight = i_height;
mColor = i_color;
field_0x28 = param_4;
}
virtual void draw();
virtual ~mDoExt_cylinderPacket() {}
/* 0x10 */ cXyz mPosition;
/* 0x1C */ f32 mRadius;
/* 0x20 */ f32 mHeight;
/* 0x24 */ GXColor mColor;
/* 0x28 */ u8 field_0x28;
};
JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment);
void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap);
u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap);
include/m_Do/m_Do_mtx.h
+2
View File
@@ -24,6 +24,7 @@ void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Ve
s16 param_4);
void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]);
void mDoMtx_ZrotM(Mtx mtx, s16 z);
void mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]);
inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVecSR(m, src, dst);
@@ -98,6 +99,7 @@ public:
static void XrotM(s16 x) { mDoMtx_XrotM(now, x); }
static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); }
static void inverse() { PSMTXInverse(now, now); }
static void inverseTranspose() { mDoMtx_inverseTranspose(now, now); }
static void concat(const Mtx m) { PSMTXConcat(now, m, now); }
static void revConcat(const Mtx m) { PSMTXConcat(m, now, now); }
static void copy(const Mtx m) { PSMTXCopy(m, now); }