Skip to content

Commit 693a5be

Browse files
committed
Fixed a case where collision suppression did not work as expected
1 parent 3e5894f commit 693a5be

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

kk_bullet_constraints_builder.zip

65 Bytes
Binary file not shown.

kk_bullet_constraints_builder/builder_prep.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,8 @@ def createConnectionData(objs, objsEGrp, connectsPair, connectsLoc, connectsGeo)
15341534

15351535
elif elemGrp == None:
15361536
constCnt = 0
1537-
disColPerm = 0
1537+
if (elemGrps[elemGrpA][EGSidxDClP] or elemGrps[elemGrpB][EGSidxDClP]) and Prio_A == Prio_B: disColPerm = 1
1538+
else: disColPerm = 0
15381539

15391540
### If invalid contact area
15401541
if geoContactArea == 0:

kk_bullet_constraints_builder/builder_setc.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,9 @@ def setConstraintSettings(objs, objsEGrp, emptyObjs, objsID, connectsPair, conne
563563
solvIter = elemGrps_elemGrp[EGSidxIter]
564564

565565
elif elemGrp == None:
566-
disColPerm = 0
567-
if props.disableCollisionPerm: CT = -2
566+
if (elemGrps[elemGrpA][EGSidxDClP] or elemGrps[elemGrpB][EGSidxDClP]) and Prio_A == Prio_B: disColPerm = 1
567+
else: disColPerm = 0
568+
if props.disableCollisionPerm or disColPerm: CT = -2
568569

569570
### If invalid contact area
570571
if geoContactArea == 0:

0 commit comments

Comments
 (0)