Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4029
Modified Files:
Tag: WIN32
space.cpp
Log Message:
- reduce maximum contact points to 4
- exclude contact joints in connection tests
Index: space.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/space.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** space.cpp 5 Dec 2005 21:16:49 -0000 1.1
--- space.cpp 12 Feb 2007 19:32:54 -0000 1.1.2.1
***************
*** 77,81 ****
const dBodyID b2 = dGeomGetBody(obj2);
! if ((b1) && (b2) && (dAreConnected(b1,b2)))
{
return;
--- 77,81 ----
const dBodyID b2 = dGeomGetBody(obj2);
! if ((b1) && (b2) && (dAreConnectedExcluding(b1,b2,dJointTypeContact)))
{
return;
***************
*** 88,92 ****
// expect that dCollide() will return contacts for every pair
// passed to the callback.
! static const int nContacts = 6;
static dContact contacts[nContacts];
--- 88,92 ----
// expect that dCollide() will return contacts for every pair
// passed to the callback.
! static const int nContacts = 4;
static dContact contacts[nContacts];
|
