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

make GIMPACT compile under MSVC 6

Browse Source
This commit is contained in:
ejcoumans
2007-09-30 03:40:44 +00:00
parent 150f7f704b
commit 9a427a4ad9
6 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Extras/GIMPACT/src/Bullet/btContactProcessing.cpp
View File

@@ -70,6 +70,7 @@ void btContactArray::merge_contacts(
{
clear();
int i;
if(contacts.size()==0) return;
@@ -85,7 +86,7 @@ void btContactArray::merge_contacts(
//fill key contacts
for (int i = 0;i<contacts.size() ;i++ )
for ( i = 0;i<contacts.size() ;i++ )
{
keycontacts.push_back(CONTACT_KEY_TOKEN(contacts[i].calc_key_contact(),i));
}
@@ -104,7 +105,7 @@ void btContactArray::merge_contacts(
BT_CONTACT * pcontact = &(*this)[0];
for(int i=1;i<keycontacts.size();i++)
for( i=1;i<keycontacts.size();i++)
{
key = keycontacts[i].m_key;
const BT_CONTACT * scontact = &contacts[keycontacts[i].m_value];

6
Extras/GIMPACT/src/Bullet/btGImpactCollisionAlgorithm.cpp
View File

@@ -865,12 +865,14 @@ btGImpactCollisionAlgorithm::CreateFunc g_gimpact_cf;
void btGImpactCollisionAlgorithm::registerAlgorithm(btCollisionDispatcher * dispatcher)
{
for (int i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ )
int i;
for ( i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ )
{
dispatcher->registerCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE,i ,&g_gimpact_cf);
}
for (int i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ )
for ( i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ )
{
dispatcher->registerCollisionCreateFunc(i,GIMPACT_SHAPE_PROXYTYPE ,&g_gimpact_cf);
}

6
Extras/GIMPACT/src/Bullet/btTriangleShapeEx.cpp
View File

@@ -33,7 +33,9 @@ void BT_TRIANGLE_CONTACT::merge_points(const btVector4 & plane,
int point_indices[MAX_TRI_CLIPPING];
for (int _k=0;_k<point_count;_k++)
int _k;
for ( _k=0;_k<point_count;_k++)
{
btScalar _dist = - bt_distance_point_plane(plane,points[_k]) + margin;
@@ -53,7 +55,7 @@ void BT_TRIANGLE_CONTACT::merge_points(const btVector4 & plane,
}
}
for (int _k=0;_k<m_point_count;_k++)
for ( _k=0;_k<m_point_count;_k++)
{
m_points[_k] = points[point_indices[_k]];
}