mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 20:59:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_sea (#659)

Browse Source 
* d_a_sea fixes

* daSea_ChkArea matching

* daSea_calcWave WIP

* daSea_GetPoly WIP

* d_a_sea Added Nonmatching comments

* daSea_calcWave matching

* daSea_calcWave fakematch

* daSea_packet_c::CalcFlatInterTarget matching

* daSea_GetPoly matching

* daSea_packet_c::SetCullStopFlag matching

* d_a_sea Misc fixes

* daSea_packet_c::execute matching

* daSea_packet_c::execute cleanup

* daSea_packet_c::create matching

* daSea_packet_c::CalcFlatInter matching

* daSea_packet_c::draw WIP

* daSea_packet_c::draw more WIP

* daSea_packet_c::draw work

* daSea_packet_c::draw even more WIP

* d_a_sea matching

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

* d_a_sea cleanup

* updated configure.py

* d_a_sea minor cleanup

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Daniel Hajjar
2024-06-22 02:31:43 +02:00
committed by GitHub
parent ee52d98f78
commit fda302008e
4 changed files with 831 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_m2d_g_box.h
+2
View File
@@ -7,6 +7,8 @@ class cM2dGBox {
public:
cXy mP0, mP1;
virtual ~cM2dGBox() {}
void Set(cXy& pA, cXy& pB);
f32 GetLen(const cXy& pXy) const;
};
include/d/actor/d_a_sea.h
+5 -5
View File
@@ -13,8 +13,8 @@ public:
public:
int Pos2Index(f32, f32*);
u32 GetHeight(f32, f32);
u32 GetHeight(int, int);
int GetHeight(f32, f32);
int GetHeight(int, int);
void GetArea(int, int, f32*, f32*, f32*, f32*);
void SetInf();
virtual ~daSea_WaterHeightInfo_Mng() {}
@@ -78,7 +78,7 @@ public:
GXTexObj* getYuraTexObj() { return &mTexYura; }
void ChkNowUse() {}
void GetSrcDataHeight(f32, f32) {}
void ChkCullStop() {}
bool ChkCullStop() { return mCullStopFlag == 1; }
void end() {}
void getPos() {}
void GetCenterP() {}
@@ -101,7 +101,7 @@ public:
/* 0x120 */ f32 mDrawMaxZ;
/* 0x124 */ f32* mpHeightTable;
/* 0x128 */ cXyz mCurPos;
/* 0x134 */ cXyz* mpDrawVtx;
/* 0x134 */ cXyz* m_draw_vtx;
/* 0x138 */ u8 mInitFlag;
/* 0x139 */ u8 mCullStopFlag;
/* 0x13A */ u8 m13A;
@@ -120,7 +120,7 @@ class sea_class : public fopAc_ac_c {
};
void daSea_Init();
void daSea_ChkAreaBeforePos(f32, f32);
bool daSea_ChkAreaBeforePos(f32, f32);
bool daSea_ChkArea(f32, f32);
f32 daSea_calcWave(f32, f32);
void daSea_GetPoly(void*, void (*)(void*, cXyz&, cXyz&, cXyz&), const cXyz&, const cXyz&);
include/dolphin/gx/GXBump.h
+1
View File
@@ -15,6 +15,7 @@ void GXSetIndTexCoordScale(GXIndTexStageID texStage, GXIndTexScale scaleS, GXInd
void GXSetIndTexOrder(GXIndTexStageID stage, GXTexCoordID coord, GXTexMapID map);
void GXSetNumIndStages(u8 num);
void GXSetTevDirect(GXTevStageID stage);
void GXSetTevIndWarp(GXTevStageID tevStage, GXIndTexStageID texStage, GXBool, GXBool, GXIndTexMtxID mtxID); // Might be incorrect
#ifdef __cplusplus
};