Merge pull request #1642 from vitawrap/patch-1

ConvexFeature: Fix collision list object references
This commit is contained in:
Brian Roberts 2025-12-28 14:12:29 -06:00 committed by GitHub
commit a10a5dedf9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -111,13 +111,14 @@ bool ConvexFeature::collide(ConvexFeature& cf,CollisionList* cList, F32 tol)
U32 storeCount = cList->getCount();
testVertex(*vert,cList,true, tol);
// Fix up last reference. material and object are copied from this rather
// Fix up added references. material and object are copied from this rather
// than the object we're colliding against.
if (storeCount != cList->getCount())
while (storeCount < cList->getCount())
{
Collision &col = (*cList)[cList->getCount() - 1];
Collision &col = (*cList)[storeCount];
col.material = cf.material;
col.object = cf.mObject;
++storeCount;
}
vert++;
}