Skip to content

Commit

Permalink
accidentally link particleManager.cpp
Browse files Browse the repository at this point in the history
i was just searching for inlines but tripped and fell
  • Loading branch information
HeartPiece44 committed Jan 2, 2025
1 parent 37c2361 commit 990daff
Show file tree
Hide file tree
Showing 11 changed files with 374 additions and 811 deletions.
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ def MatchingFor(*versions):
Object(NonMatching, "plugPikiYamashita/particleGenerator.cpp"),
Object(NonMatching, "plugPikiYamashita/particleLoader.cpp"),
Object(Matching, "plugPikiYamashita/solidField.cpp"),
Object(NonMatching, "plugPikiYamashita/particleManager.cpp"),
Object(Matching, "plugPikiYamashita/particleManager.cpp"),
Object(NonMatching, "plugPikiYamashita/particleMdlManager.cpp"),
Object(NonMatching, "plugPikiYamashita/bBoardColourAnim.cpp"),
Object(NonMatching, "plugPikiYamashita/simpleParticle.cpp"),
Expand Down
24 changes: 23 additions & 1 deletion include/GameCourseClearSection.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include "types.h"
#include "Section.h"
#include "Parameters.h"
#include "zen/particle.h"

struct Menu;
struct Font;
Expand All @@ -11,6 +13,24 @@ struct Font;
* @brief TODO
*/
struct GameCourseClearScreen : public Node {

/**
* @brief TODO
*
* @note Name according to the DLL list. Offsets relative to screen for convenience.
*/
struct Parms : public Parameters {
Parms()
: _24(this, 300.0f, 0.0f, 1000.0f, "p00", "floatテストだぴょ−ン") // 'float test'
, _34(this, 1, 0, 100, "i00", "intテストだぴょ−ン") // 'int test'
{
}

// _20-_24 = Parameters
Parm<f32> _24; // _24, p00
Parm<int> _34; // _34, i00
};

virtual void read(RandomAccessStream&); // _0C
virtual void update(); // _10
virtual void draw(Graphics&); // _14
Expand All @@ -19,7 +39,9 @@ struct GameCourseClearScreen : public Node {

// _00 = VTBL
// _00-_20 = Node
// TODO: members
Parms mCourseClearParms; // _20
u8 _44[0x10]; // _44, unknown
zen::particleManager mCourseClearPtclMgr; // _54
};

/**
Expand Down
14 changes: 7 additions & 7 deletions include/Mizu.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,25 @@ struct Mizu : public Boss {
* @brief TODO
*/
struct MizuGenSpringPuffCallBack : public zen::CallBack1<zen::particleGenerator*> {
virtual bool invoke(zen::particleGenerator* ptcl) // _08
virtual bool invoke(zen::particleGenerator* ptclGen) // _08
{
if (mPtcl) {
if (mPtcl->checkActive()) {
Vector3f pos(mPtcl->getGPos());
zen::zenListManager& mdlMgr = mPtcl->getPtclMdlListManager();

// these should be zenListManager inlines but that breaks stack. Maybe fix later.
zen::zenList* listStart = mdlMgr._00;
zen::zenList* list = listStart->mNext;
zen::zenList* listStart = mdlMgr.getOrigin();
zen::zenList* list = mdlMgr.getTopList();
while (list != listStart) {
zen::zenList* next = list->mNext;
f32 mdlY = static_cast<zen::particleMdlBase*>(list)->_0C.y + static_cast<zen::particleMdlBase*>(list)->_18.y;
zen::zenList* next = list->mNext;
zen::particleMdlBase* mdl = (zen::particleMdlBase*)list;
f32 mdlY = mdl->_0C.y + mdl->_18.y;
if (mdlY > pos.y) {
pos.y = mdlY;
}
list = next;
}
ptcl->setEmitPos(pos);
ptclGen->setEmitPos(pos);

} else {
mPtcl = nullptr;
Expand Down
1 change: 1 addition & 0 deletions include/Parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define _PARAMETERS_H

#include "types.h"
#include "Ayu.h"

struct Parameters;

Expand Down
25 changes: 20 additions & 5 deletions include/zen/bBoardColourAnim.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,29 @@ namespace zen {
* @brief TODO
*/
struct bBoardColourAnimData {
bBoardColourAnimData()
{
_00 = 0;
_01 = 0;
_02 = 0;
_03 = 0;
_04 = 0;
_08 = 0;
_0C = 0;
}

void set(u8*);

// unused/inlined:
~bBoardColourAnimData();

u8 _00; // _00
u8 _01; // _01
u8 _02; // _02
~bBoardColourAnimData() { }

u8 _00; // _00
u8 _01; // _01
u8 _02; // _02
u8 _03; // _03
u32 _04; // _04, unknown
u32 _08; // _08, unknown
u32 _0C; // _0C, unknown
};

/**
Expand Down
Loading

0 comments on commit 990daff

Please sign in to comment.