ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing collision callbacks for e.g. soccer balls.

Browse Source
This commit is contained in:
hiker
2016-06-10 09:31:12 +10:00
parent 315ea69020
commit 9de6def4cf
1 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/physics/physics.cpp
View File

@@ -559,15 +559,24 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
}
else if(upB->is(UserPointer::UP_PHYSICAL_OBJECT))
{
int n = contact_manifold->getContactPoint(0).m_index1;
const Material *m
= n>=0 ? upA->getPointerTriangleMesh()->getMaterial(n)
: NULL;
const btVector3 &normal = contact_manifold->getContactPoint(0)
.m_normalWorldOnB;
upB->getPointerPhysicalObject()->hit(m, normal);
}
}
std::vector<int> used;
for(unsigned int i=0; i< contact_manifold->getNumContacts(); i++)
{
int n = contact_manifold->getContactPoint(i).m_index0;
// Make sure to call the callback function only once
// per triangle.
if(std::find(used.begin(), used.end(), n)!=used.end())
continue;
used.push_back(n);
const Material *m
= n >= 0 ? upB->getPointerTriangleMesh()->getMaterial(n)
: NULL;
const btVector3 &normal = contact_manifold->getContactPoint(i)
.m_normalWorldOnB;
upA->getPointerPhysicalObject()->hit(m, normal);
} // for i in getNumContacts()
} // upB is physical object
} // upA is track
// 2) object a is a kart
// =====================
else if(upA->is(UserPointer::UP_KART))
@@ -646,15 +655,24 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
upB, contact_manifold->getContactPoint(0).m_localPointB);
else if(upB->is(UserPointer::UP_TRACK))
{
int n = contact_manifold->getContactPoint(0).m_index1;
const Material *m
= n>=0 ? upB->getPointerTriangleMesh()->getMaterial(n)
: NULL;
const btVector3 &normal = contact_manifold->getContactPoint(0)
.m_normalWorldOnB;
upA->getPointerPhysicalObject()->hit(m, normal);
}
}
std::vector<int> used;
for(unsigned int i=0; i< contact_manifold->getNumContacts(); i++)
{
int n = contact_manifold->getContactPoint(i).m_index1;
// Make sure to call the callback function only once
// per triangle.
if(std::find(used.begin(), used.end(), n)!=used.end())
continue;
used.push_back(n);
const Material *m
= n >= 0 ? upB->getPointerTriangleMesh()->getMaterial(n)
: NULL;
const btVector3 &normal = contact_manifold->getContactPoint(i)
.m_normalWorldOnB;
upA->getPointerPhysicalObject()->hit(m, normal);
} // for i in getNumContacts()
} // upB is track
} // upA is physical object
else if (upA->is(UserPointer::UP_ANIMATION))
{
if(upB->is(UserPointer::UP_KART))