Skip to content

Fix processLineAgainstMesh crashes when checking for colored meshes #4662

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
FileEX merged 2 commits into from
Jan 22, 2026
Merged

Fix processLineAgainstMesh crashes when checking for colored meshes #4662

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ea24b
Improve UV calculation and fallback handling in ProcessLineAgainstMesh
Xenius97 Jan 22, 2026
6f73768
Return nullptr instead of "unknown"
Xenius97 Jan 22, 2026
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
37 changes: 27 additions & 10 deletions Client/game_sa/CWorldSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,22 +402,39 @@ auto CWorldSA::ProcessLineAgainstMesh(CEntitySAInterface* targetEntity, CVector
// Now, calculate texture UV, etc based on the hit [if we've hit anything at all]
// Since we have the barycentric coords of the hit, calculating it is easy
ret.uv = {};
for (int i = 0; i < 3; i++)
{
// UV set index - Usually models only use level 0 indices, so let's stick with that
const int uvSetIdx = 0;

// Vertex's UV position
RwTextureCoordinates* const vtxUV = &c.hitGeo->texcoords[uvSetIdx][c.hitTri->verts[i]];
// Index of the UV set to use
const int uvSetIdx = 0;

// Check if texcoords exist (some models only have colored mesh without textures)
if (c.hitGeo->texcoords[uvSetIdx])
{
for (int i = 0; i < 3; i++)
{
// Vertex's UV position
RwTextureCoordinates* const vtxUV = &c.hitGeo->texcoords[uvSetIdx][c.hitTri->verts[i]];

// Now, just interpolate
ret.uv += CVector2D{vtxUV->u, vtxUV->v} * c.hitBary[i];
// Now, just interpolate
ret.uv += CVector2D{vtxUV->u, vtxUV->v} * c.hitBary[i];
}
}
else
{
// No texture coords available, use barycentric coords as UV fallback
ret.uv = CVector2D{c.hitBary.fX, c.hitBary.fY};
}

// Find out material texture name
// For some reason this is sometimes null
RwTexture* const tex = c.hitGeo->materials.materials[c.hitTri->materialId]->texture;
ret.textureName = tex ? tex->name : nullptr;
if (c.hitGeo->materials.materials && c.hitGeo->materials.materials[c.hitTri->materialId])
{
RwTexture* const tex = c.hitGeo->materials.materials[c.hitTri->materialId]->texture;
ret.textureName = tex ? tex->name : nullptr;
}
else
{
ret.textureName = nullptr;
}

RwFrame* const hitFrame = RpAtomicGetFrame(c.hitAtomic);
ret.frameName = hitFrame ? hitFrame->szName : nullptr;
Expand Down
Loading