[Opal-commits] opal/src/ODE ODESolid.cpp,1.79,1.80
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-04-03 00:11:51
|
Update of /cvsroot/opal/opal/src/ODE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12604/src/ODE Modified Files: ODESolid.cpp Log Message: minor changes to opal src; added more to playpen sample app Index: ODESolid.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/ODE/ODESolid.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** ODESolid.cpp 31 Mar 2005 08:47:02 -0000 1.79 --- ODESolid.cpp 3 Apr 2005 00:11:42 -0000 1.80 *************** *** 81,85 **** dGeomDestroy(mGeomDataList[i]->transformID); } ! #ifdef OPAL_USE_MESH if (0 != mGeomDataList[i]->trimeshDataID) --- 81,85 ---- dGeomDestroy(mGeomDataList[i]->transformID); } ! #ifdef OPAL_USE_MESH if (0 != mGeomDataList[i]->trimeshDataID) *************** *** 91,94 **** --- 91,95 ---- } #endif + // Destroy the ODE geom. dGeomDestroy(mGeomDataList[i]->geomID); *************** *** 247,252 **** if (0 != (*iter)->transformID) { ! // this geom uses a transform, so apply the new space only ! // to the transform geom dSpaceRemove((*iter)->spaceID, (*iter)->transformID); dSpaceAdd(mSpaceID, (*iter)->transformID); --- 248,253 ---- if (0 != (*iter)->transformID) { ! // This geom uses a transform, so apply the new space only ! // to the transform geom. dSpaceRemove((*iter)->spaceID, (*iter)->transformID); dSpaceAdd(mSpaceID, (*iter)->transformID); *************** *** 254,258 **** else { ! // normal geom with no transform dSpaceRemove((*iter)->spaceID, (*iter)->geomID); dSpaceAdd(mSpaceID, (*iter)->geomID); --- 255,259 ---- else { ! // Normal geom with no transform. dSpaceRemove((*iter)->spaceID, (*iter)->geomID); dSpaceAdd(mSpaceID, (*iter)->geomID); |