added initial support for per-triangle material properties in a non-convex mesh. needs testing.

2006-08-10 08:18:05 +00:00
parent 3a27e8b1bf
commit 16781831dc
22 changed files with 206 additions and 55 deletions
--- a/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
+++ b/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
@@ -35,7 +35,11 @@ m_penetrationDepthSolver(penetrationDepthSolver),
 m_simplexSolver(simplexSolver),
 m_minkowskiA(objectA),
 m_minkowskiB(objectB),
-m_ignoreMargin(false)
+m_ignoreMargin(false),
+m_partId0(-1),
+m_index0(-1),
+m_partId1(-1),
+m_index1(-1)
 {
 }

@@ -207,6 +211,8 @@ int curIter = 0;

 	if (isValid)
 	{
+		output.SetShapeIdentifiers(m_partId0,m_index0,m_partId1,m_index1);
+
 		output.AddContactPoint(
 			normalInB,
 			pointOnB,