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

ASSERT instead of assert,

Browse Source 
removed unused padding in rigidbody (was it 4500 bytes, now 500 bytes)
This commit is contained in:
ejcoumans
2006-06-25 16:38:32 +00:00
parent 09aeefe029
commit 8376da46a6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BulletDynamics/ConstraintSolver/JacobianEntry.h
View File

@@ -50,7 +50,7 @@ public:
m_1MinvJt = inertiaInvB * m_bJ; m_1MinvJt = inertiaInvB * m_bJ;
m_Adiag = massInvA + m_0MinvJt.dot(m_aJ) + massInvB + m_1MinvJt.dot(m_bJ); m_Adiag = massInvA + m_0MinvJt.dot(m_aJ) + massInvB + m_1MinvJt.dot(m_bJ);
assert(m_Adiag > 0.0f); ASSERT(m_Adiag > 0.0f);
} }
//angular constraint between two different rigidbodies //angular constraint between two different rigidbodies
@@ -67,7 +67,7 @@ public:
m_1MinvJt = inertiaInvB * m_bJ; m_1MinvJt = inertiaInvB * m_bJ;
m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ); m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
assert(m_Adiag > 0.0f); ASSERT(m_Adiag > 0.0f);
} }
//angular constraint between two different rigidbodies //angular constraint between two different rigidbodies
@@ -83,7 +83,7 @@ public:
m_1MinvJt = inertiaInvB * m_bJ; m_1MinvJt = inertiaInvB * m_bJ;
m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ); m_Adiag = m_0MinvJt.dot(m_aJ) + m_1MinvJt.dot(m_bJ);
assert(m_Adiag > 0.0f); ASSERT(m_Adiag > 0.0f);
} }
//constraint on one rigidbody //constraint on one rigidbody
@@ -101,7 +101,7 @@ public:
m_1MinvJt = SimdVector3(0.f,0.f,0.f); m_1MinvJt = SimdVector3(0.f,0.f,0.f);
m_Adiag = massInvA + m_0MinvJt.dot(m_aJ); m_Adiag = massInvA + m_0MinvJt.dot(m_aJ);
assert(m_Adiag > 0.0f); ASSERT(m_Adiag > 0.0f);
} }
SimdScalar getDiagonal() const { return m_Adiag; } SimdScalar getDiagonal() const { return m_Adiag; }

6
BulletDynamics/Dynamics/RigidBody.h
View File

@@ -254,6 +254,7 @@ public:
m_broadphaseProxy = broadphaseProxy; m_broadphaseProxy = broadphaseProxy;
} }
/// for ode solver-binding /// for ode solver-binding
dMatrix3 m_R;//temp dMatrix3 m_R;//temp
@@ -261,10 +262,11 @@ public:
dMatrix3 m_invI; dMatrix3 m_invI;
int m_odeTag; int m_odeTag;
float m_padding[1024];
SimdVector3 m_tacc;//temp SimdVector3 m_tacc;//temp
SimdVector3 m_facc; SimdVector3 m_facc;
int m_debugBodyId; int m_debugBodyId;
}; };