Skip to content

xCollide and dependent xMath changes #567

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
JoshSanch merged 6 commits into from
May 23, 2025
Merged

xCollide and dependent xMath changes #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a495bd
xCollide and dependent xMath stuff
stravant May 22, 2025
0cb294b
Forgot to make some float -> F32
stravant May 22, 2025
e8548d0
Remove tempReferenceWeakDefinitions
stravant May 23, 2025
851f69d
Merge branch 'main' into xCollide
stravant May 23, 2025
6a30db4
Bad copy-paste
stravant May 23, 2025
45d93a9
Put cross back in xVec3.h
stravant May 23, 2025
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
18 changes: 18 additions & 0 deletions src/SB/Core/x/xClumpColl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ struct xClumpCollBSPTree
xClumpCollBSPTriangle* triangles;
};

struct xClumpCollV3dGradient
{
F32 dydx;
F32 dzdx;
F32 dxdy;
F32 dzdy;
F32 dxdz;
F32 dydz;
};

struct nodeInfo
{
U32 type;
Expand All @@ -61,5 +71,13 @@ struct TempAtomicList

void xClumpColl_InstancePointers(xClumpCollBSPTree* tree, RpClump* clump);
xClumpCollBSPTree* xClumpColl_StaticBufferInit(void* data, U32 param_2);
void xClumpColl_ForAllCapsuleLeafNodeIntersections(
xClumpCollBSPTree* tree,
RwLine* line,
F32 dist,
xClumpCollV3dGradient* grad,
int (*tri)(xClumpCollBSPTriangle*, void*),
void* data
);

#endif
Loading