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

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..

File:

• trunk/src/lib/physics/physics_connection.cc (modified) (4 diffs)

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;