Changeset 5776 in orxonox.OLD for trunk

Timestamp:

Nov 25, 2005, 2:14:02 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: stl::list in PhysicsEngine

Location:

trunk/src/lib

Files:

• event/event_handler.h (modified) (1 diff)
• graphics/render2D/render_2d.h (modified) (1 diff)
• physics/physics_engine.cc (modified) (11 diffs)
• physics/physics_engine.h (modified) (2 diffs)

trunk/src/lib/event/event_handler.h

@@ -14 +14 @@
 // FORWARD DECLARATION
 class EventListener;
-template<class T> class tList;
 template<class T> class tStack;
 class IniParser;

trunk/src/lib/graphics/render2D/render_2d.h

@@ -10 +10 @@
 #include "element_2d.h"
 // FORWARD DECLARATION
-template <class T> class tList;
 
 //! A default singleton class.

trunk/src/lib/physics/physics_engine.cc

@@ -34 +34 @@
   this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine");
   this->setName("PhysicsEngine");
-  this->connections = new tList<PhysicsConnection>;
-  this->fields = new tList<Field>;
   this->interfaces = NULL;
 }
@@ -51 +49 @@
 {
   // delete all PhysicsConnections that are still in existence
-  tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
-  PhysicsConnection* enumPC = itPC->firstElement();
-  while (enumPC)
-  {
-    delete enumPC;
-    enumPC = itPC->nextElement();
-  }
-  delete itPC;
-  delete this->connections;
+  list<PhysicsConnection*>::iterator pc;
+  for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
+    delete (*pc);
 //
 //   // delete all PhysicsInterfaces, still in existence (this could be dangerous)
@@ -82 +74 @@
 //   }
 //   delete itF;
-   delete this->fields;
-
 
   PhysicsEngine::singletonRef = NULL;
@@ -161 +151 @@
 void PhysicsEngine::addField(Field* field)
 {
-  this->fields->add(field);
+  this->fields.push_back(field);
 }
 
@@ -172 +162 @@
 void PhysicsEngine::removeField(Field* field)
 {
-  this->fields->remove(field);
+  this->fields.remove(field);
 }
 
@@ -181 +171 @@
 Field* PhysicsEngine::getFieldByName(const char* FieldName) const
 {
-  tIterator<Field>* tmpIt = fields->getIterator();
-  Field* tmpField = tmpIt->firstElement();
-  while(tmpField)
-  {
-    if (!strcmp(FieldName, tmpField->getName()))
-    {
-      delete tmpIt;
-      return tmpField;
-    }
-    tmpField = tmpIt->nextElement();
-  }
-  delete tmpIt;
+  list<Field*>::const_iterator field;
+  for (field = this->fields.begin(); field != this->fields.end(); field++)
+    if (!strcmp(FieldName, (*field)->getName()))
+      return (*field);
   return NULL;
 }
@@ -206 +188 @@
 void PhysicsEngine::addConnection(PhysicsConnection* connection)
 {
-  this->connections->add(connection);
+  this->connections.push_back(connection);
 }
 
@@ -217 +199 @@
 void PhysicsEngine::removeConnection(PhysicsConnection* connection)
 {
-  this->connections->remove(connection);
+  this->connections.remove(connection);
 }
 
@@ -226 +208 @@
 PhysicsConnection* PhysicsEngine::getPhysicsConnectionByName(const char* physicsConnectionName) const
 {
-  tIterator<PhysicsConnection>* tmpIt = connections->getIterator();
-  PhysicsConnection* tmpConn = tmpIt->firstElement();
-  while(tmpConn)
-  {
-    if (!strcmp(physicsConnectionName, tmpConn->getName()))
-    {
-      delete tmpIt;
-      return tmpConn;
-    }
-    tmpConn = tmpIt->nextElement();
-  }
-  delete tmpIt;
+  list<PhysicsConnection*>::const_iterator pc;
+  for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
+    if (!strcmp(physicsConnectionName, (*pc)->getName()))
+      delete (*pc);
   return NULL;
 }
@@ -253 +227 @@
   /* go through all the PhysicsInterface(s) and tick them,
   meaning let the fields work */
-  tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
-  PhysicsConnection* enumPC = itPC->firstElement();
-  while (enumPC)
-    {
-      enumPC->apply();
-
-      enumPC = itPC->nextElement();
-    }
-  delete itPC;
+  list<PhysicsConnection*>::iterator pc;
+  for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
+    (*pc)->apply();
 
   /* actually tick all the PhysicsInterfaces. Move the objects around */
@@ -291 +259 @@
   if (this->interfaces != NULL)
     PRINT(0)(" number of Interfaces: %d\n", this->interfaces->getSize());
-  PRINT(0)(" number of Fields: %d\n", this->fields->getSize());
-  PRINT(0)(" number of Connections: %d\n", this->connections->getSize());
+  PRINT(0)(" number of Fields: %d\n", this->fields.size());
+  PRINT(0)(" number of Connections: %d\n", this->connections.size());
 
   PRINT(0)("==============================PHYS==\n");

trunk/src/lib/physics/physics_engine.h

@@ -13 +13 @@
 #include "physics_interface.h"
 #include "field.h"
+#include <list>
+
 
 // Forward Declaration
@@ -51 +53 @@
   static PhysicsEngine*         singletonRef;         //!< the singleton reference of the PhysicsEngine
 
-  tList<Field>*                 fields;               //!< a list of physicsl fields.
-  tList<PhysicsConnection>*     connections;          //!< a list of physical connections.
+  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.
 };