Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- support both 32bit and 16bit indices in ColladaConverter

Browse Source 
- added triangle part/index into btManifoldPoint
This commit is contained in:
ejcoumans
2008-02-09 03:34:53 +00:00
parent 6b3587a505
commit fe4e81ebff
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
View File

@@ -87,6 +87,11 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
newPt.m_combinedFriction = calculateCombinedFriction(m_body0,m_body1);
newPt.m_combinedRestitution = calculateCombinedRestitution(m_body0,m_body1);
//BP mod, store contact triangles.
newPt.m_partId0 = m_partId0;
newPt.m_partId1 = m_partId1;
newPt.m_index0 = m_index0;
newPt.m_index1 = m_index1;
///todo, check this for any side effects
if (insertIndex >= 0)

5
src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
View File

@@ -65,6 +65,11 @@ class btManifoldPoint
btScalar m_combinedFriction;
btScalar m_combinedRestitution;
//BP mod, store contact triangles.
int m_partId0;
int m_partId1;
int m_index0;
int m_index1;
mutable void* m_userPersistentData;
btScalar m_appliedImpulse;