Changeset 9686 in orxonox.OLD for branches/new_class_id/src/lib/physics/physics_engine.cc

Timestamp:

Aug 22, 2006, 2:36:54 PM (18 years ago)

Author:

bensch

Message:

new_class_id: many more classes done

File:

• branches/new_class_id/src/lib/physics/physics_engine.cc (modified) (4 diffs)

branches/new_class_id/src/lib/physics/physics_engine.cc

@@ -18 +18 @@
 #include "physics_engine.h"
 
-#include "class_list.h"
 #include "parser/tinyxml/tinyxml.h"
 #include "util/loading/factory.h"
@@ -25 +24 @@
 
 
-
-/**
- *  standard constructor
-*/
+NewObjectListDefinition(PhysicsEngine);
+/**
+ * @brief standard constructor
+ */
 PhysicsEngine::PhysicsEngine()
 {
-  this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine");
+  this->registerObject(this, PhysicsEngine::_objectList);
   this->setName("PhysicsEngine");
   this->interfaces = NULL;
@@ -130 +129 @@
 PhysicsInterface* PhysicsEngine::getPhysicsInterfaceByName(const std::string& physicsInterfaceName) const
 {
-  BaseObject* interface = ClassList::getObject(physicsInterfaceName, CL_PHYSICS_INTERFACE);
-  return (interface != NULL)?  dynamic_cast<PhysicsInterface*>(interface) : NULL;
+  return PhysicsInterface::objectList().getObject(physicsInterfaceName);
 }
 
@@ -223 +221 @@
 
   /* actually tick all the PhysicsInterfaces. Move the objects around */
-  if (this->interfaces != NULL || (this->interfaces = ClassList::getList(CL_PHYSICS_INTERFACE)) != NULL)
-  {
-    std::list<BaseObject*>::const_iterator tickPhys;
-    for (tickPhys = this->interfaces->begin(); tickPhys != this->interfaces->end(); tickPhys++)
-      dynamic_cast<PhysicsInterface*>(*tickPhys)->tickPhys(dt);
-  }
+
+  NewObjectList<PhysicsInterface>::const_iterator it;
+  for (it = PhysicsInterface::objectList().begin();
+       it != PhysicsInterface::objectList().end();
+       ++it)
+      (*it)->tickPhys(dt);
 }