From 987b5cbfb1871734f38421a10307e02e5fea09c1 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 19 Jan 2009 07:45:01 +0000 Subject: [PATCH] fix in friction in the ODE constraint solver testing code. Thanks to Martijn Reuvers: http://code.google.com/p/bullet/issues/detail?id=169 --- Extras/quickstep/btOdeContactJoint.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Extras/quickstep/btOdeContactJoint.cpp b/Extras/quickstep/btOdeContactJoint.cpp index d38db8a1b..6073e94d7 100644 --- a/Extras/quickstep/btOdeContactJoint.cpp +++ b/Extras/quickstep/btOdeContactJoint.cpp @@ -177,7 +177,12 @@ void btOdeContactJoint::GetInfo2(Info2 *info) c2[2] = relativePositionB.z(); //combined friction is available in the contact point - float friction = 0.25;//FRICTION_CONSTANT ;//* m_body0->m_friction * m_body1->m_friction; + //float friction = 0.25;//FRICTION_CONSTANT ;//* m_body0->m_friction * m_body1->m_friction; + float friction = 1.0f; + if (m_body0 != 0) + friction *= m_body0->m_friction; + if (m_body1 != 0) + friction *= m_body1->m_friction; // first friction direction if (m_numRows >= 2)