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

don't introduce int i in the for-loop, some compilers give errors

Browse Source
This commit is contained in:
ejcoumans
2006-06-21 05:39:34 +00:00
parent 94e94e995f
commit 3b602a4f02
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BulletDynamics/ConstraintSolver/Generic6DofConstraint.cpp
View File

@@ -43,8 +43,9 @@ void Generic6DofConstraint::BuildJacobian()
const SimdVector3& pivotInA = m_frameInA.getOrigin(); const SimdVector3& pivotInA = m_frameInA.getOrigin();
const SimdVector3& pivotInB = m_frameInB.getOrigin(); const SimdVector3& pivotInB = m_frameInB.getOrigin();
int i;
//linear part //linear part
for (int i=0;i<3;i++) for (i=0;i<3;i++)
{ {
normal[i] = 1; normal[i] = 1;
@@ -63,7 +64,7 @@ void Generic6DofConstraint::BuildJacobian()
} }
// angular part // angular part
for (int i=0;i<3;i++) for (i=0;i<3;i++)
{ {
#if 0 #if 0
@@ -105,9 +106,10 @@ void Generic6DofConstraint::SolveConstraint(SimdScalar timeStep)
SimdVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition(); SimdVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
SimdVector3 normal(0,0,0); SimdVector3 normal(0,0,0);
int i;
// linear // linear
for (int i=0;i<3;i++) for (i=0;i<3;i++)
{ {
SimdVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity(); SimdVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
SimdVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity(); SimdVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();
@@ -133,7 +135,7 @@ void Generic6DofConstraint::SolveConstraint(SimdScalar timeStep)
} }
// angular // angular
for (int i=0;i<3;i++) for (i=0;i<3;i++)
{ {
SimdVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity(); SimdVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
SimdVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity(); SimdVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();