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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/physics

Files:

• fields/field.cc (modified) (4 diffs)
• fields/field.h (modified) (2 diffs)
• fields/gravity.cc (modified) (1 diff)
• fields/gravity.h (modified) (1 diff)
• fields/point_gravity.cc (modified) (2 diffs)
• fields/point_gravity.h (modified) (2 diffs)
• fields/twirl.cc (modified) (2 diffs)
• fields/twirl.h (modified) (2 diffs)
• physics_connection.cc (modified) (4 diffs)
• physics_connection.h (modified) (1 diff)
• physics_engine.cc (modified) (3 diffs)
• physics_engine.h (modified) (3 diffs)
• physics_interface.cc (modified) (2 diffs)
• physics_interface.h (modified) (1 diff)

trunk/src/lib/physics/fields/field.cc

@@ -23 +23 @@
 #include "util/loading/load_param.h"
 
+ObjectListDefinition(Field);
 
 /**
- *  standard constructor
+ * @brief standard constructor
 */
 Field::Field ()
@@ -33 +34 @@
 
 /**
- *  standard deconstructor
-
-*/
+ * @brief standard deconstructor
+ */
 Field::~Field ()
 {
@@ -42 +42 @@
 
 /**
-  \brief initializes a Field
-*/
+  * @brief initializes a Field
+ */
 void Field::init()
 {
-  this->setClassID(CL_FIELD, "Field");
+  this->registerObject(this, Field::_objectList);
   this->setMagnitude(1);
   this->setAttenuation(0);
@@ -54 +54 @@
 
 /**
-* @param root The XML-element to load settings from
+ * @param root The XML-element to load settings from
  */
 void Field::loadParams(const TiXmlElement* root)

trunk/src/lib/physics/fields/field.h

@@ -16 +16 @@
 /*!
  * @file field.h
-  *  abstract definition of a Physical Field
-
-    This is a totally abstract class, that only enables different Physical Fields to
-    exist on a common Level.
-*/
+ * abstract definition of a Physical Field
+ *
+ * This is a totally abstract class, that only enables different Physical Fields to
+ * exist on a common Level.
+ */
 
 #ifndef _FIELD_H
@@ -34 +34 @@
 class Field : public PNode
 {
+  ObjectListDeclaration(Field);
  public:
   Field();

trunk/src/lib/physics/fields/gravity.cc

@@ -21 +21 @@
 #include "util/loading/factory.h"
 
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
 
-
-CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);
+CREATE_FACTORY(Gravity);
 
 Gravity::Gravity(const TiXmlElement* root)
 {
-  this->setClassID(CL_FIELD_GRAVITY, "Gravity");
+  this->registerObject(this, Gravity::_objectList);
 
   if (root != NULL)

trunk/src/lib/physics/fields/gravity.h

@@ -16 +16 @@
 //! A class for ...
 class Gravity : public Field {
+  ObjectListDeclaration(Gravity);
 
  public:

trunk/src/lib/physics/fields/point_gravity.cc

@@ -20 +20 @@
 
 
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
+
 
 /**
@@ -27 +30 @@
 PointGravity::PointGravity ()
 {
-   this->setClassID(CL_FIELD_POINT_GRAVITY, "PointGravity");
+  this->registerObject(this, PointGravity::_objectList);
 }
 

trunk/src/lib/physics/fields/point_gravity.h

@@ -1 @@
-/*! 
+/*!
  * @file point_gravity.h
   *  Definition of ...
@@ -16 +16 @@
 //! A class for ...
 class PointGravity : public Field {
+  ObjectListDeclaration(PointGravity);
 
  public:

trunk/src/lib/physics/fields/twirl.cc

@@ -20 +20 @@
 
 
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
+
 
 /**
@@ -27 +30 @@
 Twirl::Twirl ()
 {
-   this->setClassID(CL_FIELD_TWIRL, "Twirl");
+  this->registerObject(this, Twirl::_objectList);
 }
 

trunk/src/lib/physics/fields/twirl.h

@@ -1 @@
-/*! 
+/*!
  * @file twirl.h
   *  Definition of ...
@@ -16 +16 @@
 //! A class for ...
 class Twirl : public Field {
+  ObjectListDeclaration(Twirl);
 
  public:

trunk/src/lib/physics/physics_connection.cc

@@ -19 +19 @@
 
 #include "physics_engine.h"
+#include "debug.h"
 
-#include "field.h"
-#include "particle_system.h"
+#include "fields/field.h"
+#include "particles/particle_system.h"
 #include "physics_interface.h"
 
@@ -27 +28 @@
 #include "util/loading/load_param.h"
 
-
-
-CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinition(PhysicsConnection);
+CREATE_FACTORY(PhysicsConnection);
 /**
  *  creates a PhysicsConnection
@@ -36 +36 @@
 PhysicsConnection::PhysicsConnection(PhysicsInterface* subject, Field* field)
 {
-  this->setClassID(CL_PHYSICS_CONNECTION, "PhysicsConnection");
+  this->registerObject(this, PhysicsConnection::_objectList);
   this->type = PCON_PhysIField;
 
@@ -47 +47 @@
 PhysicsConnection::PhysicsConnection(const TiXmlElement* root)
 {
-  this->setClassID(CL_PHYSICS_CONNECTION, "PhysicsConnection");
+  this->registerObject(this, PhysicsConnection::_objectList);
   this->type = PCON_PhysIField;
 

trunk/src/lib/physics/physics_connection.h

@@ -27 +27 @@
 class PhysicsConnection : public BaseObject
 {
-
+  ObjectListDeclaration(PhysicsConnection);
  public:
   PhysicsConnection(PhysicsInterface* subject, Field* field);

trunk/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"
-#include "util/loading/load_param.h"
-
-
-
-
-/**
- *  standard constructor
-*/
+#include "util/loading/load_param_xml.h"
+
+
+
+ObjectListDefinition(PhysicsEngine);
+/**
+ * @brief standard constructor
+ */
 PhysicsEngine::PhysicsEngine()
 {
-  this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine");
+  this->registerObject(this, PhysicsEngine::_objectList);
   this->setName("PhysicsEngine");
   this->interfaces = NULL;
@@ -130 +128 @@
 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 +220 @@
 
   /* 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);
-  }
+
+  ObjectList<PhysicsInterface>::const_iterator it;
+  for (it = PhysicsInterface::objectList().begin();
+       it != PhysicsInterface::objectList().end();
+       ++it)
+      (*it)->tickPhys(dt);
 }
 

trunk/src/lib/physics/physics_engine.h

@@ -12 +12 @@
 #include "physics_connection.h"
 #include "physics_interface.h"
-#include "field.h"
+#include "fields/field.h"
 #include <list>
 
@@ -20 +20 @@
 
 //! A class, that brings things into motion through Physics.
-class PhysicsEngine : public BaseObject {
-
- public:
+class PhysicsEngine : public BaseObject
+{
+  ObjectListDeclaration(PhysicsEngine);
+public:
   virtual ~PhysicsEngine();
   /** @returns a Pointer to the only object of this Class */
@@ -46 +47 @@
   void                   debug() const;
 
- private:
+private:
   PhysicsEngine();
 
- private:
+private:
   static PhysicsEngine*         singletonRef;         //!< the singleton reference of the PhysicsEngine
 

trunk/src/lib/physics/physics_interface.cc

@@ -23 +23 @@
 #include "physics_engine.h"
 
-#include "field.h"
+#include "fields/field.h"
 #include "p_node.h"
 
@@ -31 +31 @@
 
 
-
+ObjectListDefinition(PhysicsInterface);
 /**
- *  standard constructor
+ * @brief standard constructor
  */
 PhysicsInterface::PhysicsInterface ()
 {
-  this->setClassID(CL_PHYSICS_INTERFACE, "PhysicsInterface");
+  this->registerObject(this, PhysicsInterface::_objectList);
 
   this->mass = 1;

trunk/src/lib/physics/physics_interface.h

@@ -29 +29 @@
 class PhysicsInterface : virtual public BaseObject
 {
+  ObjectListDeclaration(PhysicsInterface);
  public:
   PhysicsInterface();