mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor matches

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-01-23 01:04:32 -08:00
parent 357aae5e37
commit a2b9822e5c
8 changed files with 93 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPicture.h
+2 -2
View File
@@ -56,9 +56,9 @@ public:
const ResTIMG * changeTexture(const char*, u8);
void drawFullSet(f32, f32, f32, f32, J2DBinding, J2DMirror, bool, Mtx*);
void draw(f32, f32, f32, f32, bool, bool, bool);
void draw(f32 x, f32 y, bool, bool, bool) {
void draw(f32 x, f32 y, bool mirrorX, bool mirrorY, bool tumble) {
if (mNumTexture > 0)
draw(x, y, mpTexture[0]->getWidth(), mpTexture[0]->getHeight(), false, false, false);
draw(x, y, mpTexture[0]->getWidth(), mpTexture[0]->getHeight(), mirrorX, mirrorY, tumble);
}
void drawOut(const JGeometry::TBox2<f32>&, const JGeometry::TBox2<f32>&);
void drawTexCoord(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, Mtx*);
include/d/actor/d_a_mozo.h
+6 -4
View File
@@ -21,7 +21,7 @@ public:
BOOL CreateHeap();
s32 CreateInit();
void event_move();
void getBeamActor(u32);
fopAc_ac_c* getBeamActor(unsigned int);
void search_beam_proc_init();
void search_beam_proc();
void search_fire_proc_init();
@@ -43,9 +43,11 @@ public:
/* 0x2D8 */ J3DAnmTextureSRTKey* m_btk;
/* 0x2DC */ u8 m2DC[0x35C - 0x2DC];
/* 0x35C */ Quaternion mQuatRotation;
/* 0x36C */ u8 m36C[0x380 - 0x36C];
/* 0x380 */ dCcD_Stts mColStatus;
/* 0x3BC */ dCcD_Cps mCapsuleCol;
/* 0x36C */ u8 m36C[0x376 - 0x36C];
/* 0x376 */ u8 field_0x376;
/* 0x377 */ u8 field_0x377[7];
/* 0x380 */ dCcD_Stts mStts;
/* 0x3BC */ dCcD_Cps mCps;
};
class daMozo_HIO_c {
include/d/actor/d_a_sea.h
+24 -3
View File
@@ -21,7 +21,7 @@ public:
};
STATIC_ASSERT(sizeof(daSea_WaterHeightInfo_Mng) == 0x58);
struct daSea_WaveInfo__Table {
struct daSea_WaveInfoDat {
/* 0x00 */ f32 mHeight;
/* 0x04 */ f32 mKm;
/* 0x08 */ s16 mPhase;
@@ -32,7 +32,7 @@ struct daSea_WaveInfo__Table {
class daSea_WaveInfo {
public:
/* 0x00 */ daSea_WaveInfo__Table* mWaveInfoTable;
/* 0x00 */ daSea_WaveInfoDat* mWaveInfoTable;
/* 0x04 */ f32 m04[4];
/* 0x14 */ int mCounters[4];
/* 0x24 */ f32 mCurScale;
@@ -45,6 +45,13 @@ public:
f32 GetRatio(int);
f32 GetKm(int);
f32 GetScale(f32);
void SetDat(daSea_WaveInfoDat* dat) { mWaveInfoTable = dat; }
f32 GetBaseHeight(int no) { return mWaveInfoTable[no].mHeight; }
s16 GetPhai(int no) { return mWaveInfoTable[no].mPhase; }
f32 GetVx(int no) { return mWaveInfoTable[no].mScaleX; }
f32 GetVz(int no) { return mWaveInfoTable[no].mScaleZ; }
void GetRamdaRecp(int no) {}
};
class daSea_packet_c : public J3DPacket {
@@ -62,6 +69,20 @@ public:
void draw();
~daSea_packet_c() {}
f32 getMinX() {}
f32 getMinZ() {}
f32 getMaxX() {}
f32 getMaxZ() {}
GXTexObj* getSea0TexObj() { return &mTexSea0; }
GXTexObj* getSea1TexObj() { return &mTexSea1; }
GXTexObj* getYuraTexObj() { return &mTexYura; }
void ChkNowUse() {}
void GetSrcDataHeight(f32, f32) {}
void ChkCullStop() {}
void end() {}
void getPos() {}
void GetCenterP() {}
public:
/* 0x010 */ daSea_WaterHeightInfo_Mng mWaterHeightMgr;
/* 0x068 */ daSea_WaveInfo mWaveInfo;
@@ -73,7 +94,7 @@ public:
/* 0x0B0 */ f32 mFlatInterCounter;
/* 0x0B4 */ GXTexObj mTexSea0;
/* 0x0D4 */ GXTexObj mTexSea1;
/* 0x0F4 */ GXTexObj mpTexWyurayura;
/* 0x0F4 */ GXTexObj mTexYura;
/* 0x114 */ f32 mDrawMinX;
/* 0x118 */ f32 mDrawMinZ;
/* 0x11C */ f32 mDrawMaxX;