Update of /cvsroot/opal/opal/src/ODE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10750/src/ODE
Modified Files:
ODESimulator.cpp
Log Message:
changed how friction is used (now sqrt(f1*f2) instead of just f1*f2); minor changes to sample apps
Index: ODESimulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ODESimulator.cpp 3 Mar 2005 04:39:57 -0000 1.82
--- ODESimulator.cpp 4 Mar 2005 05:09:24 -0000 1.83
***************
*** 415,420 ****
else
{
! tempContact.surface.mu = m0->friction *
! m1->friction * defaults::ode::maxFriction;
}
--- 415,421 ----
else
{
! tempContact.surface.mu =
! sqrt(m0->friction * m1->friction) *
! defaults::ode::maxFriction;
}
|
