Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-27 07:10:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
intns 2023-12-30 15:02:29 +00:00
parent 6a5ad73614
commit 2f47fdaebe
2 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/LifeGaugeMgr.h
View File

@ -31,19 +31,20 @@ struct LifeGauge {
* @size{0x48}
*/
struct LifeGaugeList : public JKRDisposer {
inline LifeGaugeList()
inline LifeGaugeList(Game::Creature* obj = nullptr)
: mParam()
, _3C(0.0f)
, _45(32)
, mSegmentCount(32)
, mGameObject(nullptr)
, mNext(nullptr)
, mPrev(nullptr)
{
mParam.mIsGaugeShown = false;
_3C = 0.0f;
_45 = 32;
mSegmentCount = 32;
mGameObject = obj;
mNext = nullptr;
mPrev = nullptr;
mParam.mIsGaugeShown = false;
_3C = 0.0f;
_45 = 32;
mSegmentCount = 32;
}
virtual ~LifeGaugeList() { clearRelations(); } // _08 (weak)
@ -88,10 +89,14 @@ struct LifeGaugeMgr {
inline LifeGaugeList* search(Game::Creature* obj)
{
for (LifeGaugeList* list = mListA.mNext; list; list = list->mNext) {
if (list->mGameObject == obj) {
return list;
if (list->mGameObject != obj) {
continue;
}
return list;
}
return nullptr;
}
LifeGaugeList mListA; // _00

41
src/plugProjectYamashitaU/lifeGaugeMgr.cpp
View File

@ -220,24 +220,25 @@ void LifeGaugeList::draw(Graphics& gfx)
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 4);
f32 y = -x;
f32 z = 0.0f;
// Draw Top Left
GXPosition3f32(x, x, 0.0f);
GXPosition3f32(x, y, z);
GXColor4u8(255, 255, 255, 255);
GXTexCoord2s8(0, 0);
// Draw Top Right
GXPosition3f32(x, x, 0.0f);
GXPosition3f32(x, y, z);
GXColor4u8(255, 255, 255, 255);
GXTexCoord2s8(1, 0);
// Draw Bottom Left
GXPosition3f32(x, x, 0.0f);
GXPosition3f32(x, y, z);
GXColor4u8(255, 255, 255, 255);
GXTexCoord2s8(0, 1);
// Draw Bottom Right
GXPosition3f32(x, x, 0.0f);
GXPosition3f32(x, y, z);
GXColor4u8(255, 255, 255, 255);
GXTexCoord2s8(1, 1);
@ -255,11 +256,13 @@ void LifeGaugeList::draw(Graphics& gfx)
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_POS_XYZ, GX_RGBA8, 0);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET);
GXSetZMode(GX_FALSE, GX_LESS, GX_FALSE);
GXSetCurrentMtx(0);
Mtx mtx3;
PSMTXIdentity(mtx3);
GXLoadTexMtxImm(mtx3, 30, GX_MTX2x4);
for (int i = 0; i < mSegmentCount; i++) {
// TODO
GXBegin(GX_TRIANGLEFAN, GX_VTXFMT0, 3);
}
}
@ -277,17 +280,20 @@ LifeGaugeMgr::LifeGaugeMgr() { }
*/
LifeGaugeList* LifeGaugeMgr::createLifeGauge(Game::Creature* obj)
{
if (search(obj)) {
return nullptr;
}
if (!search(obj)) {
LifeGaugeList* list = new LifeGaugeList;
return mListB.mNext;
}
if (!search(obj)) {
LifeGaugeList* list = new LifeGaugeList(obj);
list->clearRelations();
list->mPrev = &mListB;
list->mNext = mListB.mNext;
mListA.mNext = list;
return list;
}
return mListA.mNext;
/*
stwu r1, -0x20(r1)
mflr r0
@ -406,15 +412,28 @@ lbl_8011AA78:
* @note Address: 0x8011AA94
* @note Size: 0xE4
*/
void LifeGaugeMgr::activeLifeGauge(Game::Creature* obj, f32)
void LifeGaugeMgr::activeLifeGauge(Game::Creature* obj, f32 x)
{
LifeGaugeList* list = search(obj);
if (list) {
f32 y = list->_45 * x;
if (x >= 0.0f) {
y = x + 0.5f;
} else {
y = x - 0.5f;
}
list->mSegmentCount = y;
list->clearRelations();
list->mPrev = &mListB;
list->mNext = mListB.mNext;
list->mPrev = &mListB;
list->mNext = mListB.mNext;
if (list->mNext) {
list->mNext->mNext = list;
}
mListA.mNext = list;
}
/*
stwu r1, -0x20(r1)
lwz r5, 0x64(r3)