Skip to content

xParGroup: 100% match and cleanup #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SquareMan merged 1 commit into from
May 20, 2025
Merged

xParGroup: 100% match and cleanup #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def MatchingFor(*versions):
Object(NonMatching, "SB/Core/x/xPad.cpp"),
Object(NonMatching, "SB/Core/x/xPar.cpp"),
Object(NonMatching, "SB/Core/x/xParCmd.cpp"),
Object(NonMatching, "SB/Core/x/xParGroup.cpp"),
Object(Matching, "SB/Core/x/xParGroup.cpp"),
Object(Matching, "SB/Core/x/xParMgr.cpp"),
Object(NonMatching, "SB/Core/x/xPartition.cpp"),
Object(NonMatching, "SB/Core/x/xpkrsvc.cpp"),
Expand Down
24 changes: 10 additions & 14 deletions src/SB/Core/x/xParGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@

#define REG_TABLE_SIZE 255

S32 sParGroupRegTableInit = 0;
S32 sParGroupRegTableCount = 0;
extern xParGroup* sParGroupRegTable[REG_TABLE_SIZE]; // todo: move from bss.s

extern F32 _708;
extern F32 _709;
static S32 sParGroupRegTableInit = FALSE;
static S32 sParGroupRegTableCount = 0;
xParGroup* sParGroupRegTable[REG_TABLE_SIZE];

void xParGroupInit(xParGroup* ps)
{
Expand Down Expand Up @@ -38,7 +35,7 @@ static void xParGroupRegisterInit()
sParGroupRegTable[i] = NULL;
}

sParGroupRegTableInit = 1;
sParGroupRegTableInit = TRUE;
sParGroupRegTableCount = 0;
}

Expand Down Expand Up @@ -142,7 +139,7 @@ void xParGroupAnimate(xParGroup* ps, F32 dt)

if (ps->m_flags & XPARGROUP_NOAGING)
{
age = _708;
age = 0.0f;
}

if (!ps->m_root)
Expand All @@ -152,7 +149,7 @@ void xParGroupAnimate(xParGroup* ps, F32 dt)

while (i)
{
if (i->m_lifetime < _708)
if (i->m_lifetime < 0.0f)
{
tmp = i;

Expand All @@ -162,11 +159,10 @@ void xParGroupAnimate(xParGroup* ps, F32 dt)
}
else
{
// non-matching: stack isn't resizing for each float-to-U8 conversion
i->m_c[0] = i->m_cfl[0] = clamp(i->m_cvel[0] * dt + i->m_cfl[0], _708, _709);
i->m_c[1] = i->m_cfl[1] = clamp(i->m_cvel[1] * dt + i->m_cfl[1], _708, _709);
i->m_c[2] = i->m_cfl[2] = clamp(i->m_cvel[2] * dt + i->m_cfl[2], _708, _709);
i->m_c[3] = i->m_cfl[3] = clamp(i->m_cvel[3] * dt + i->m_cfl[3], _708, _709);
i->m_c[0] = i->m_cfl[0] = clamp(i->m_cvel[0] * dt + i->m_cfl[0], 0.0f, 255.0f);
i->m_c[1] = i->m_cfl[1] = clamp(i->m_cvel[1] * dt + i->m_cfl[1], 0.0f, 255.0f);
i->m_c[2] = i->m_cfl[2] = clamp(i->m_cvel[2] * dt + i->m_cfl[2], 0.0f, 255.0f);
i->m_c[3] = i->m_cfl[3] = clamp(i->m_cvel[3] * dt + i->m_cfl[3], 0.0f, 255.0f);
i->m_size += i->m_sizeVel * dt;
i->m_lifetime -= age;

Expand Down