Skip to content

xEntBoulder functions and iModel #688

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 5 commits into from
Nov 30, 2025
Merged

xEntBoulder functions and iModel #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1471c3d
Ported more stuff from:
LivewireCB Nov 30, 2025
a258558
Elegant code
LivewireCB Nov 30, 2025
e00a18a
Add remaining xEntBoulder functions, and a few iModel functions.
LivewireCB Nov 30, 2025
7f0df52
removed all decomp.me scratches from repo
LivewireCB Nov 30, 2025
4cae970
Merge branch 'main' into devops
LivewireCB Nov 30, 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
758 changes: 699 additions & 59 deletions src/SB/Core/gc/iModel.cpp
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/SB/Core/gc/iModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
void iModelInit();
static RpAtomic* FindAndInstanceAtomicCallback(RpAtomic* model, void* data);
static RpAtomic* iModelCacheAtomic(RpAtomic*);
RpMaterial* iModelResetMaterialCB(RpMaterial*, void*);
static RpMaterial* iModelResetMaterialCB(RpMaterial*, void*);
static void* GetHierarchy(RpAtomic* frame);
static RwFrame* GetChildFrameHierarchy(RwFrame* frame, void* data);
U32 iModelNumBones(RpAtomic* model);
Expand All @@ -29,7 +29,8 @@ void iModelTagEval(RpAtomic* model, const xModelTag* tag, RwMatrixTag* mat, xVec
U32 iModelTagSetup(xModelTag* tag, RpAtomic* model, F32 x, F32 y, F32 z);
void iModelSetMaterialAlpha(RpAtomic* model, U8 alpha);
U32 iModelVertCount(RpAtomic* model);
U32 iModelVertEval(RpAtomic* model, U32 index, U32 count, RwMatrixTag* mat, xVec3* vert, xVec3* dest);
U32 iModelVertEval(RpAtomic* model, U32 index, U32 count, RwMatrixTag* mat, xVec3* vert,
xVec3* dest);
void iModelMaterialMul(RpAtomic* model, F32 rm, F32 gm, F32 bm);
RpAtomic* iModelFileNew(void* buffer, U32 size);
void iModelRender(RpAtomic* model, RwMatrix* mat);
Expand Down
8 changes: 0 additions & 8 deletions src/SB/Core/x/xCollide.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ U32 xSphereHitsBox(const xSphere* a, const xBox* b, xCollis* coll)
}

U32 xSphereHitsOBB_nu(const xSphere* s, const xBox* b, const xMat4x3* m, xCollis* coll)
//NONMATCH("https://decomp.me/scratch/YoEeE")
{
xSphere xfs;
xVec3 scale;
Expand Down Expand Up @@ -325,7 +324,6 @@ static RpCollisionTriangle* sphereHitsModelCB(RpIntersection* isx, RpCollisionTr
}

U32 xSphereHitsModel(const xSphere* b, const xModelInstance* m, xCollis* coll)
// NONMATCH("https://decomp.me/scratch/XU6BL")
{
RpIntersection isx;

Expand Down Expand Up @@ -556,7 +554,6 @@ static S32 xParabolaEnvCB(xClumpCollBSPTriangle* triangles, void* data)
}

S32 xParabolaHitsEnv(xParabola* p, const xEnv* env, xCollis* colls)
//NONMATCH("https://decomp.me/scratch/Hli1c")
{
RwBBox xb;
F32 tmp;
Expand Down Expand Up @@ -1286,7 +1283,6 @@ RpCollBSPTree* _rpCollBSPTreeForAllCapsuleLeafNodeIntersections(
}

void xSweptSpherePrepare(xSweptSphere* sws, xVec3* start, xVec3* end, F32 radius)
//NONMATCH("https://decomp.me/scratch/5VJcM")
{
sws->start = *start;
sws->end = *end;
Expand Down Expand Up @@ -1393,7 +1389,6 @@ void xSweptSphereGetResults(xSweptSphere* sws)
}

S32 xSweptSphereToTriangle(xSweptSphere* sws, xVec3* v0, xVec3* v1, xVec3* v2)
//NONMATCH("https://decomp.me/scratch/MJ9KD")
{
S32 i;

Expand Down Expand Up @@ -1652,7 +1647,6 @@ S32 xSweptSphereToSphere(xSweptSphere* sws, xSphere* sph)
}

S32 xSweptSphereToBox(xSweptSphere* sws, xBox* box, xMat4x3* mat)
//NONMATCH("https://decomp.me/scratch/97pAl")
{
S32 i;
xMat4x3 tmpmat;
Expand Down Expand Up @@ -2036,7 +2030,6 @@ S32 xSweptSphereToEnv(xSweptSphere* sws, xEnv* env)
}

static S32 SweptSphereModelCB(S32 numTriangles, S32 triOffset, void* data)
// NONMATCH("https://decomp.me/scratch/XMJhx")
{
SweptSphereCollParam* isData = (SweptSphereCollParam*)data;
RpGeometry* geometry = isData->geometry;
Expand Down Expand Up @@ -2066,7 +2059,6 @@ static S32 SweptSphereModelCB(S32 numTriangles, S32 triOffset, void* data)
}

S32 xSweptSphereToModel(xSweptSphere* sws, RpAtomic* model, RwMatrix* mat)
//NONMATCH("https://decomp.me/scratch/3R1PB")
{
if (!sws->dist)
return 0;
Expand Down
Loading