TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1642 from vitawrap/patch-1

Browse source 
ConvexFeature: Fix collision list object references
This commit is contained in:
Brian Roberts 2025-12-28 14:12:29 -06:00 committed by GitHub
parent e3df069570 f394db4b36
commit a10a5dedf9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/collision/convex.cpp
View file

@ -111,13 +111,14 @@ bool ConvexFeature::collide(ConvexFeature& cf,CollisionList* cList, F32 tol)
U32 storeCount = cList->getCount(); U32 storeCount = cList->getCount();
testVertex(*vert,cList,true, tol); 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. // 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.material = cf.material;
col.object = cf.mObject; col.object = cf.mObject;
++storeCount;
} }
vert++; vert++;
} }