Changeset 5779 in orxonox.OLD for trunk/src/lib/physics

Timestamp:

Nov 26, 2005, 2:20:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList is now in std::list style
ShellCommand is now in std::list style

Location:

trunk/src/lib/physics

Files:

• physics_engine.cc (modified) (3 diffs)
• physics_engine.h (modified) (1 diff)

trunk/src/lib/physics/physics_engine.cc

@@ -131 +131 @@
 PhysicsInterface* PhysicsEngine::getPhysicsInterfaceByName(const char* physicsInterfaceName) const
 {
-  tIterator<BaseObject>* tmpIt = ClassList::getList(CL_PHYSICS_INTERFACE)->getIterator();
-  BaseObject* tmpInt = tmpIt->firstElement();
-  while(tmpInt)
-  {
-    if (!strcmp(physicsInterfaceName, tmpInt->getName()))
-    {
-      delete tmpIt;
-      return dynamic_cast<PhysicsInterface*>(tmpInt);
-    }
-    tmpInt = tmpIt->nextElement();
-  }
-  delete tmpIt;
-  return NULL;
+  BaseObject* interface = ClassList::getObject(physicsInterfaceName, CL_PHYSICS_INTERFACE);
+  return (interface != NULL)?  dynamic_cast<PhysicsInterface*>(interface) : NULL;
 }
 
@@ -237 +226 @@
   if (this->interfaces != NULL || (this->interfaces = ClassList::getList(CL_PHYSICS_INTERFACE)) != NULL)
   {
-    tIterator<BaseObject>* itPI = this->interfaces->getIterator();
-    PhysicsInterface* enumPI = dynamic_cast<PhysicsInterface*>(itPI->firstElement());
-    while (enumPI)
-    {
-       enumPI->tickPhys(dt);
-
-      enumPI = dynamic_cast<PhysicsInterface*>(itPI->nextElement());
-    }
-   delete itPI;
+    list<BaseObject*>::const_iterator tickPhys;
+    for (tickPhys = this->interfaces->begin(); tickPhys != this->interfaces->end(); tickPhys++)
+      dynamic_cast<PhysicsInterface*>(*tickPhys)->tickPhys(dt);
   }
 }
@@ -261 +244 @@
   PRINT(0)(" reference: %p\n", this);
   if (this->interfaces != NULL)
-    PRINT(0)(" number of Interfaces: %d\n", this->interfaces->getSize());
+    PRINT(0)(" number of Interfaces: %d\n", this->interfaces->size());
   PRINT(0)(" number of Fields: %d\n", this->fields.size());
   PRINT(0)(" number of Connections: %d\n", this->connections.size());

trunk/src/lib/physics/physics_engine.h

@@ -54 +54 @@
   std::list<Field*>             fields;               //!< a list of physicsl fields.
   std::list<PhysicsConnection*> connections;          //!< a list of physical connections.
-  const tList<BaseObject>*      interfaces;           //!< The list of physical interfaces.
+  const std::list<BaseObject*>* interfaces;           //!< The list of physical interfaces.
 };