Update of /cvsroot/opal/opal/src/ODE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13249/src/ODE
Modified Files:
ODESimulator.cpp ODESolid.cpp
Log Message:
Added unit tests for VolumeSensor and Joint. Found a bug with CCylinder+VolumeSensor+MeshSolid. Extra asserts in ODESimulator.
Index: ODESimulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ODESimulator.cpp 12 Dec 2005 06:13:25 -0000 1.110
--- ODESimulator.cpp 15 Dec 2005 05:08:59 -0000 1.111
***************
*** 855,860 ****
// Get pointers to the two geoms' GeomData structure. Both
// of these should always be non-NULL.
! GeomData* geomData0 = ( ( GeomData* ) dGeomGetData( o0 ) );
! GeomData* geomData1 = ( ( GeomData* ) dGeomGetData( o1 ) );
// Get pointers to the geoms' ShapeData structures.
--- 855,862 ----
// Get pointers to the two geoms' GeomData structure. Both
// of these should always be non-NULL.
! const GeomData* geomData0 = ( ( GeomData* ) dGeomGetData( o0 ) );
! const GeomData* geomData1 = ( ( GeomData* ) dGeomGetData( o1 ) );
! assert( geomData0 != NULL );
! assert( geomData1 != NULL );
// Get pointers to the geoms' ShapeData structures.
Index: ODESolid.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESolid.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** ODESolid.cpp 1 Dec 2005 02:04:54 -0000 1.93
--- ODESolid.cpp 15 Dec 2005 05:08:59 -0000 1.94
***************
*** 80,83 ****
--- 80,84 ----
destroyGeoms();
resetAABB();
+ mData.destroyShapes();
}
|
