Skip to content
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

xParMgr: enable match #386

Merged
merged 1 commit into from
Oct 9, 2024
Merged

xParMgr: enable match #386

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 @@ -317,7 +317,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
Object(NonMatching, "SB/Core/x/xPar.cpp"),
Object(NonMatching, "SB/Core/x/xParCmd.cpp"),
Object(NonMatching, "SB/Core/x/xParGroup.cpp"),
Object(NonMatching, "SB/Core/x/xParMgr.cpp"),
Object(Matching, "SB/Core/x/xParMgr.cpp"),
Object(NonMatching, "SB/Core/x/xPartition.cpp"),
Object(NonMatching, "SB/Core/x/xpkrsvc.cpp"),
Object(NonMatching, "SB/Core/x/xQuickCull.cpp"),
Expand Down
21 changes: 10 additions & 11 deletions src/SB/Core/x/xParMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <types.h>

U32 sFrameCount;
S32 sParMgrInit;
volatile static U32 sFrameCount;
static S32 sParMgrInit;

void xParMgrInit()
{
Expand All @@ -27,22 +27,21 @@ void xParMgrKillAllParticles()
{
}

#if 0
// If statement and statement above are wrong.
void xParMgrUpdate(F32 elapsedTime)
{
iParMgrUpdate(elapsedTime);
sFrameCount = (S32)sFrameCount;
if (++sFrameCount > 10)

sFrameCount++;

if (sFrameCount > 10)
{
sFrameCount = 1;
}
while (sFrameCount >= 1)
{
sFrameCount--;
}

U32 i;
for (i = sFrameCount; i >= 1; i--);
sFrameCount = i;
}
#endif

void xParMgrRender()
{
Expand Down