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

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

Location:

trunk/src/lib/physics

Files:

• fields/gravity.cc (modified) (1 diff)
• physics_connection.cc (modified) (1 diff)

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

@@ -23 +23 @@
 using namespace std;
 
-CREATE_FACTORY(Gravity);
+CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);
 
 Gravity::Gravity(const TiXmlElement* root)

trunk/src/lib/physics/physics_connection.cc

@@ -29 +29 @@
 using namespace std;
 
-CREATE_FACTORY(PhysicsConnection);
+CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);
 
 /**