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

fix previous commit in BulletMultiThreaded.

Browse Source
This commit is contained in:
erwin.coumans
2010-02-18 05:55:39 +00:00
parent 2b7c0989a0
commit 820119a6df
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
View File

@@ -130,6 +130,10 @@ bool ManifoldResultAddContactPoint(const btVector3& normalOnBInWorld,
newPt.m_positionWorldOnA = pointA; newPt.m_positionWorldOnA = pointA;
newPt.m_positionWorldOnB = pointInWorld; newPt.m_positionWorldOnB = pointInWorld;
newPt.m_combinedFriction = combinedFriction;
newPt.m_combinedRestitution = combinedRestitution;
int insertIndex = manifoldPtr->getCacheEntry(newPt); int insertIndex = manifoldPtr->getCacheEntry(newPt);
if (insertIndex >= 0) if (insertIndex >= 0)
{ {
@@ -140,9 +144,6 @@ bool ManifoldResultAddContactPoint(const btVector3& normalOnBInWorld,
} else } else
{ {
newPt.m_combinedFriction = combinedFriction;
newPt.m_combinedRestitution = combinedRestitution;
/* /*
///@todo: SPU callbacks, either immediate (local on the SPU), or deferred ///@todo: SPU callbacks, either immediate (local on the SPU), or deferred
//User can override friction and/or restitution //User can override friction and/or restitution