[Opal-commits] opal/src/ODE ODESimulator.cpp,1.91,1.92
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-03-21 04:29:14
|
Update of /cvsroot/opal/opal/src/ODE In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15060/src/ODE Modified Files: ODESimulator.cpp Log Message: added a PostStepEventHandler that gets notified at the end of every simulation step Index: ODESimulator.cpp =================================================================== RCS file: /cvsroot/opal/opal/src/ODE/ODESimulator.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** ODESimulator.cpp 14 Mar 2005 01:20:55 -0000 1.91 --- ODESimulator.cpp 21 Mar 2005 04:29:05 -0000 1.92 *************** *** 395,400 **** // If at least one of the Solids has a CollisionEventHandler, // send it a CollisionEvent. ! CollisionEventHandler* handler0 = solid0->getEventHandler(); ! CollisionEventHandler* handler1 = solid1->getEventHandler(); if (handler0 || handler1) --- 395,402 ---- // If at least one of the Solids has a CollisionEventHandler, // send it a CollisionEvent. ! CollisionEventHandler* handler0 = ! solid0->getCollisionEventHandler(); ! CollisionEventHandler* handler1 = ! solid1->getCollisionEventHandler(); if (handler0 || handler1) *************** *** 436,440 **** // Old version... //// Early check to save some time. ! //if (solid0->getEventHandler() || solid1->getEventHandler()) //{ // // Call the event handlers. Note: we only use one --- 438,443 ---- // Old version... //// Early check to save some time. ! //if (solid0->getCollisionEventHandler() ! // || solid1->getCollisionEventHandler()) //{ // // Call the event handlers. Note: we only use one *************** *** 456,460 **** // e.depth = contactArray[0].depth; ! // EventHandler* eventHandler = solid0->getEventHandler(); // if (eventHandler) // { --- 459,464 ---- // e.depth = contactArray[0].depth; ! // EventHandler* eventHandler = ! // solid0->getCollisionEventHandler(); // if (eventHandler) // { *************** *** 467,471 **** // e.solid1 = solid0; ! // eventHandler = solid1->getEventHandler(); // if (eventHandler) // { --- 471,475 ---- // e.solid1 = solid0; ! // eventHandler = solid1->getCollisionEventHandler(); // if (eventHandler) // { |