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

fixes to make VC6 compiler (and its users) happy

Browse Source
This commit is contained in:
erwin.coumans
2009-12-22 21:27:27 +00:00
parent ac3d52d81b
commit 63bb1bab94
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
View File

@@ -64,11 +64,13 @@ void btGeneric6DofSpringConstraint::setDamping(int index, btScalar damping)
void btGeneric6DofSpringConstraint::setEquilibriumPoint() void btGeneric6DofSpringConstraint::setEquilibriumPoint()
{ {
calculateTransforms(); calculateTransforms();
for(int i = 0; i < 3; i++) int i;
for( i = 0; i < 3; i++)
{ {
m_equilibriumPoint[i] = m_calculatedLinearDiff[i]; m_equilibriumPoint[i] = m_calculatedLinearDiff[i];
} }
for(int i = 0; i < 3; i++) for(i = 0; i < 3; i++)
{ {
m_equilibriumPoint[i + 3] = m_calculatedAxisAngleDiff[i]; m_equilibriumPoint[i + 3] = m_calculatedAxisAngleDiff[i];
} }

8
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -523,11 +523,13 @@ void btSoftBody::setVolumeMass(btScalar mass)
{ {
btAlignedObjectArray<btScalar> ranks; btAlignedObjectArray<btScalar> ranks;
ranks.resize(m_nodes.size(),0); ranks.resize(m_nodes.size(),0);
for(int i=0;i<m_nodes.size();++i) int i;
for(i=0;i<m_nodes.size();++i)
{ {
m_nodes[i].m_im=0; m_nodes[i].m_im=0;
} }
for(int i=0;i<m_tetras.size();++i) for(i=0;i<m_tetras.size();++i)
{ {
const Tetra& t=m_tetras[i]; const Tetra& t=m_tetras[i];
for(int j=0;j<4;++j) for(int j=0;j<4;++j)
@@ -536,7 +538,7 @@ for(int i=0;i<m_tetras.size();++i)
ranks[int(t.m_n[j]-&m_nodes[0])]+=1; ranks[int(t.m_n[j]-&m_nodes[0])]+=1;
} }
} }
for(int i=0;i<m_nodes.size();++i) for( i=0;i<m_nodes.size();++i)
{ {
if(m_nodes[i].m_im>0) if(m_nodes[i].m_im>0)
{ {