[Opal-commits] opal/src/ODE ODESimulator.cpp,1.83,1.84 ODESolid.cpp,1.74,1.75

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

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

Modified Files:
	ODESimulator.cpp ODESolid.cpp 
Log Message:
removed the Ray Shape; it should only be used for raycasting, not as an actual Shape attached to Solids

Index: ODESimulator.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ODESimulator.cpp	4 Mar 2005 05:09:24 -0000	1.83
--- ODESimulator.cpp	5 Mar 2005 21:26:24 -0000	1.84
***************
*** 337,344 ****
  				if (solid0->getEventHandler() || solid1->getEventHandler())
  				{
! 					// Call the event handlers - they will return true if 
! 					// they want contacts generated.  Note: we only want up to 
! 					// two events per object/object collision; just use the 
! 					// first contact to pass data to the event handlers.
  
  					CollisionEvent e;
--- 337,346 ----
  				if (solid0->getEventHandler() || solid1->getEventHandler())
  				{
! 					// Call the event handlers.  Note: we only use one 
! 					// contact point per collision; just use the first one 
! 					// in the contact array.  The order of the Solids 
! 					// passed to the event handlers is important: the first 
! 					// one should be the one whose event handler is 
! 					// getting called.
  
  					CollisionEvent e;
***************
*** 762,766 ****
  		result.distance = mRaycastResult.distance;
  
! 		// finished with ray, so destroy it
  		dGeomDestroy(rayGeomID);
  
--- 764,768 ----
  		result.distance = mRaycastResult.distance;
  
! 		// Finished with ODE ray, so destroy it.
  		dGeomDestroy(rayGeomID);
  

Index: ODESolid.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/ODE/ODESolid.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** ODESolid.cpp	4 Mar 2005 23:26:54 -0000	1.74
--- ODESolid.cpp	5 Mar 2005 21:26:24 -0000	1.75
***************
*** 32,36 ****
  #include "../CapsuleShapeData.h"
  #include "../PlaneShapeData.h"
- #include "../RayShapeData.h"
  #include "../MeshShapeData.h"
  
--- 32,35 ----
***************
*** 337,343 ****
  							// Planes have no mass.
  							break;
! 						case RAY_SHAPE:
! 							// Rays have no mass.
! 							break;
  						case MESH_SHAPE:
  							// Not implemented.
--- 336,342 ----
  							// Planes have no mass.
  							break;
! 						//case RAY_SHAPE:
! 						//	// Rays have no mass.
! 						//	break;
  						case MESH_SHAPE:
  							// Not implemented.
***************
*** 580,596 ****
  				break;
  			}
! 			case RAY_SHAPE:
! 			{
! 				RayShapeData& rayData = (RayShapeData&)data;
! 				newGeomID = dCreateRay(spaceID, 
! 					(dReal)rayData.ray.getLength());
! 				Point3r origin = rayData.ray.getOrigin();
! 				Vec3r dir = rayData.ray.getDir();
! 				dGeomRaySet(newGeomID, (dReal)origin[0], (dReal)origin[1], 
! 					(dReal)origin[2], (dReal)dir[0], (dReal)dir[1], 
! 					(dReal)dir[2]);
! 				// Note: rays don't have mass.
! 				break;
! 			}
  #ifdef OPAL_USE_MESH
  			case MESH_SHAPE:
--- 579,595 ----
  				break;
  			}
! 			//case RAY_SHAPE:
! 			//{
! 			//	RayShapeData& rayData = (RayShapeData&)data;
! 			//	newGeomID = dCreateRay(spaceID, 
! 			//		(dReal)rayData.ray.getLength());
! 			//	Point3r origin = rayData.ray.getOrigin();
! 			//	Vec3r dir = rayData.ray.getDir();
! 			//	dGeomRaySet(newGeomID, (dReal)origin[0], (dReal)origin[1], 
! 			//		(dReal)origin[2], (dReal)dir[0], (dReal)dir[1], 
! 			//		(dReal)dir[2]);
! 			//	// Note: rays don't have mass.
! 			//	break;
! 			//}
  #ifdef OPAL_USE_MESH
  			case MESH_SHAPE: