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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/physics

Files:

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

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

@@ -22 +22 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
-using namespace std;
+
 
 /**

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

@@ -21 +21 @@
 #include "util/loading/factory.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);

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

@@ -18 +18 @@
 #include "point_gravity.h"
 
-using namespace std;
+
 
 

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

@@ -18 +18 @@
 #include "twirl.h"
 
-using namespace std;
+
 
 

trunk/src/lib/physics/physics_connection.cc

@@ -27 +27 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);
@@ -81 +81 @@
   }
   else
-    PRINTF(5)("subject::%s\n", this->subject->getName());
+    PRINTF(5)("subject::%s\n", this->subject->getCName());
 }
 
@@ -95 +95 @@
   }
   else
-    PRINTF(5)("field::%s\n", this->field->getName());
+    PRINTF(5)("field::%s\n", this->field->getCName());
 
 }

trunk/src/lib/physics/physics_engine.cc

@@ -23 +23 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 
@@ -162 +162 @@
 Field* PhysicsEngine::getFieldByName(const std::string& fieldName) const
 {
-  list<Field*>::const_iterator field;
+  std::list<Field*>::const_iterator field;
   for (field = this->fields.begin(); field != this->fields.end(); field++)
     if (fieldName == (*field)->getName())
@@ -199 +199 @@
 PhysicsConnection* PhysicsEngine::getPhysicsConnectionByName(const std::string& physicsConnectionName) const
 {
-  list<PhysicsConnection*>::const_iterator pc;
+  std::list<PhysicsConnection*>::const_iterator pc;
   for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
     if (physicsConnectionName == (*pc)->getName())
@@ -218 +218 @@
   /* go through all the PhysicsInterface(s) and tick them,
   meaning let the fields work */
-  list<PhysicsConnection*>::iterator pc;
+  std::list<PhysicsConnection*>::iterator pc;
   for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
     (*pc)->apply();
@@ -225 +225 @@
   if (this->interfaces != NULL || (this->interfaces = ClassList::getList(CL_PHYSICS_INTERFACE)) != NULL)
   {
-    list<BaseObject*>::const_iterator tickPhys;
+    std::list<BaseObject*>::const_iterator tickPhys;
     for (tickPhys = this->interfaces->begin(); tickPhys != this->interfaces->end(); tickPhys++)
       dynamic_cast<PhysicsInterface*>(*tickPhys)->tickPhys(dt);

trunk/src/lib/physics/physics_interface.cc

@@ -29 +29 @@
 #include "stdincl.h"
 
-using namespace std;
+
 
 
@@ -68 +68 @@
     {
     // todo: find out if children are PhysicsInterface in an efficient way
-    if (strcmp( pn->getClassName(), "PhysicsInterface")) {
+    if (strcmp( pn->getClassCName(), "PhysicsInterface")) {
     massSum += ((PhysicsInterface*)pn)->getTotalMass();
     }
@@ -77 +77 @@
     if (massSum != this->massChildren ) {
     this->massChildren = massSum;
-    if (strcmp( massCalcPNode->parent->getClassName(), "PhysicsInterface"))
+    if (strcmp( massCalcPNode->parent->getClassCName(), "PhysicsInterface"))
     ((PhysicsInterface*)massCalcPNode->parent)->recalcMass();
     } else {