mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-12 03:47:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_Do_ext

Browse Source
This commit is contained in:
LagoLunatic
2024-03-21 17:53:48 -04:00
parent 069135a316
commit b6d0373644
9 changed files with 313 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JAZelAudio/JAIZelAnime.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
void setAnimSound(Vec*, f32, f32, u32, s8);
void setAnimSound(Vec* pos, f32 frame, f32 rate, u32 mtrlSndId, s8 reverb);
void setPlayPosition(f32);
};
include/d/actor/d_a_obj_leaves.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
void chk_appear();
void init_mtx();
void birthEffect(int, cXyz*, csXyz*, _GXColor*);
void birthEffect(int, cXyz*, csXyz*, GXColor*);
void solidHeapCB(fopAc_ac_c*);
void create_heap();
void tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
include/d/d_demo.h
+2 -2
View File
@@ -169,8 +169,8 @@ public:
void JSGSetLightType(JStage::TELight);
void JSGSetPosition(const Vec&);
void JSGSetColor(_GXColor);
void JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn);
void JSGSetAngleAttenuation(f32, _GXSpotFn);
void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn);
void JSGSetAngleAttenuation(f32, GXSpotFn);
void JSGSetDirection(const Vec&);
private:
include/d/d_drawlist.h
+1 -1
View File
@@ -551,7 +551,7 @@ public:
void drawOpaList2D() { drawOpaDrawList(mpOpaList2D); }
int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4,
f32 param_5, _GXTexObj* param_6) {
f32 param_5, GXTexObj* param_6) {
return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5,
param_6);
}
include/d/d_map.h
+4 -4
View File
@@ -13,7 +13,7 @@ class dMap_2DMtMapSpcl_tex_c {
public:
dMap_2DMtMapSpcl_tex_c();
~dMap_2DMtMapSpcl_tex_c();
void init(ResTIMG*, u32, const _GXColor&);
void init(ResTIMG*, u32, const GXColor&);
void setScroll(f32, f32, f32, f32);
/* 0x00 */ u8 field_0x0[4];
@@ -114,7 +114,7 @@ public:
class dMap_2DTri_c : public dDlst_base_c {
public:
~dMap_2DTri_c();
void init(s16, s16, const _GXColor&, f32, f32, s16);
void init(s16, s16, const GXColor&, f32, f32, s16);
void draw();
void setPos(s16, s16);
};
@@ -123,14 +123,14 @@ class dMap_2DPoint_c : public dDlst_base_c {
public:
dMap_2DPoint_c();
~dMap_2DPoint_c();
void init(s16, s16, const _GXColor&, u8);
void init(s16, s16, const GXColor&, u8);
void draw();
};
class dMap_2DAGBCursor_c : public dDlst_base_c {
public:
~dMap_2DAGBCursor_c();
void init(s16, s16, const _GXColor&, u8);
void init(s16, s16, const GXColor&, u8);
void draw();
};
include/d/d_ovlp_fade4.h
+1 -1
View File
@@ -18,7 +18,7 @@ class dDlst_2Dt_Sp_c : public dDlst_base_c {
public:
~dDlst_2Dt_Sp_c() {}
void draw();
void init(ResTIMG*, f32, f32, f32, f32, _GXColor);
void init(ResTIMG*, f32, f32, f32, f32, GXColor);
/* 0x04 */ GXTexObj field_0x4;
/* 0x24 */ ResTIMG* field_0x24;
include/m_Do/m_Do_ext.h
+12 -12
View File
@@ -331,7 +331,7 @@ public:
void entry();
void entryDL();
void entryDL(J3DMaterialTable*);
bool play(Vec *, u32, s8);
BOOL play(Vec*, u32, s8);
void stopZelAnime();
J3DModel* getModel() { return mpModel; }
@@ -385,7 +385,7 @@ public:
void calc(u16);
void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32, void*);
void setMorf(f32);
void play(Vec*, u32, s8);
BOOL play(Vec*, u32, s8);
void entryDL();
void calc();
void stopZelAnime();
@@ -409,7 +409,7 @@ public:
BOOL checkFrame(f32 frame) {
return mFrameCtrl.checkPass(frame);
}
BOOL isMorf() { return field_0x78 < 1.0f; }
BOOL isMorf() { return mCurMorf < 1.0f; }
void setAnmRate(f32) {} // TODO
/* 0x50 */ J3DModel* mpModel;
@@ -418,9 +418,9 @@ public:
/* 0x5C */ J3DTransformInfo* mpTransformInfo;
/* 0x60 */ Quaternion* mpQuat;
/* 0x64 */ J3DFrameCtrl mFrameCtrl;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x78 */ f32 mCurMorf;
/* 0x7C */ f32 mPrevMorf;
/* 0x80 */ f32 mMorfStep;
/* 0x84 */ f32 field_0x84;
/* 0x88 */ mDoExt_zelAnime* mpSound;
/* 0x8C */ mDoExt_McaMorfCallBack1_c * mpCallback1;
@@ -435,7 +435,7 @@ public:
public:
/* 0x0 */ /* vtable */
/* 0x4 */ mDoExt_3DlineMat_c* field_0x4;
/* 0x4 */ mDoExt_3DlineMat_c* mpNextLineMat;
};
class mDoExt_3DlineMatSortPacket : public J3DPacket {
@@ -511,13 +511,13 @@ public:
void draw();
void setJoint(J3DModel* i_model, u16 param_1) {
void setJoint(J3DModel* i_model, u16 i_jntNum) {
mModel = i_model;
field_0x14 = param_1;
mJntNum = i_jntNum;
}
J3DModel* mModel;
u16 field_0x14;
/* 0x10 */ J3DModel* mModel;
/* 0x14 */ u16 mJntNum;
};
class mDoExt_invisibleModel {
@@ -577,7 +577,7 @@ public:
public:
/* 0x08 */ GXColor mColor;
/* 0x0C */ dKy_tevstr_c* m0C;
/* 0x0C */ dKy_tevstr_c* mpTevStr;
/* 0x10 */ s16 mNumLines;
/* 0x12 */ s16 mNumSegmentsPerLine;
/* 0x14 */ u16 m14;