[Opal-commits] opal/src/ODE ODESolid.cpp,1.87,1.88 ODESolid.h,1.69,1.70
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-06-24 19:04:32
|
Update of /cvsroot/opal/opal/src/ODE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29465/src/ODE Modified Files: ODESolid.cpp ODESolid.h Log Message: Removed the OPAL_USE_MESH compile-time flag because it isn't needed. (It was originally intended for IRIX usage because ODE's trimesh support doesn't compile on IRIX with certain versions of the MipsPro compiler. However, the ODE trimesh function calls can still be used without trimeshes compiled into ODE; they just don't do anything.) Index: ODESolid.h =================================================================== RCS file: /cvsroot/opal/opal/src/ODE/ODESolid.h,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ODESolid.h 12 Apr 2005 06:46:45 -0000 1.69 --- ODESolid.h 24 Jun 2005 19:04:22 -0000 1.70 *************** *** 47,53 **** spaceID = 0; transformID = 0; - #ifdef OPAL_USE_MESH trimeshDataID = 0; - #endif } --- 47,51 ---- *************** *** 57,63 **** dSpaceID spaceID; dGeomID transformID; - #ifdef OPAL_USE_MESH dTriMeshDataID trimeshDataID; // only used for Solids with trimeshes - #endif }; --- 55,59 ---- Index: ODESolid.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/ODE/ODESolid.cpp,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** ODESolid.cpp 4 Jun 2005 17:16:27 -0000 1.87 --- ODESolid.cpp 24 Jun 2005 19:04:22 -0000 1.88 *************** *** 85,89 **** } - #ifdef OPAL_USE_MESH if (0 != mGeomDataList[i]->trimeshDataID) { --- 85,88 ---- *************** *** 93,97 **** dGeomTriMeshDataDestroy(mGeomDataList[i]->trimeshDataID); } - #endif // Destroy the ODE geom. --- 92,95 ---- *************** *** 506,512 **** dGeomID newTransformID = NULL; - #ifdef OPAL_USE_MESH dTriMeshDataID newTrimeshDataID = NULL; - #endif dSpaceID spaceID = NULL; --- 504,508 ---- *************** *** 613,617 **** // break; //} - #ifdef OPAL_USE_MESH case MESH_SHAPE: { --- 609,612 ---- *************** *** 656,660 **** break; } - #endif default: assert(false); --- 651,654 ---- *************** *** 673,680 **** newGeomData->transformID = newTransformID; newGeomData->spaceID = mSpaceID; - - #ifdef OPAL_USE_MESH newGeomData->trimeshDataID = newTrimeshDataID; - #endif // Setup the geom. --- 667,671 ---- |