[Opal-commits] opal/src/ODE ODESimulator.cpp,1.105,1.106

[tylerstreeter <tyl...@us...>]

Update of /cvsroot/opal/opal/src/ODE
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30485/src/ODE

Modified Files:
	ODESimulator.cpp 
Log Message:
Fixed bug in ODE function found by EarthquakeProof - a VolumeSensor using a volume Solid with an offset shape caused a segmentation fault when getting user data from its ODE geomID in ODESimulator::internal_queryVolume.

Index: ODESimulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ODESimulator.cpp	24 Jun 2005 18:46:29 -0000	1.105
--- ODESimulator.cpp	6 Aug 2005 05:58:24 -0000	1.106
***************
*** 1058,1062 ****
  		for (iter = geomList->begin(); iter != geomList->end(); ++iter)
  		{
! 			dSpaceCollide2((*iter)->geomID, (dGeomID)mRootSpaceID, this, 
  				&ode_hidden::internal_volumeCollisionCallback);
  		}
--- 1058,1069 ----
  		for (iter = geomList->begin(); iter != geomList->end(); ++iter)
  		{
! 			dGeomID geomID = (*iter)->geomID;
! 			if ((*iter)->transformID)
! 			{
! 				// Using geom transform.
! 				geomID = (*iter)->transformID;
! 			}
! 
! 			dSpaceCollide2(geomID, (dGeomID)mRootSpaceID, this, 
  				&ode_hidden::internal_volumeCollisionCallback);
  		}